Subversion Repositories gelsvn

Rev

Go to most recent revision | Show changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
615 4595 d 5 h jab /trunk/ better structure  
614 4596 d 6 h jab /trunk/ Fixed a problem with global variables in harmonics.cpp causing meshedit to crash on exit.  
613 4596 d 9 h jab /trunk/ Trashed ancient readmes and added new.  
612 4596 d 9 h jrf /trunk/src/Geometry/ correcting bug in last commit  
611 4596 d 9 h jab /trunk/ CmakeLists updated. I simply removed the shared keyword. Now, perhaps the library is static, but a lib file is created.  
610 4596 d 9 h jrf /trunk/src/Geometry/ removing VS warnings  
609 4596 d 9 h jab /trunk/ I have added some patches to make cmake work for Unix Makefiles on Mac.
The old Makefile system has been removed.
Slight change to XCode project
Minor changes
 
608 4598 d 18 h jrf /trunk/src/GLGraphics/ ensuring compatibility with code based on pre-merge trunk version  
607 4598 d 18 h jrf /trunk/ removing Visual Studio warnings and some CMake problems  
606 4598 d 18 h jrf /trunk/src/Geometry/ ensuring compatibility with code based on pre-merge trunk version  
605 4602 d 5 h jab /trunk/  
604 4602 d 23 h jab /trunk/GEL.xcodeproj/ The GEL XCode project has been made more streamlined.  
603 4603 d 3 h jab /trunk/ Made it work with cmake  
602 4603 d 9 h jab /trunk/ Removed the stale app rangescanviewer. Several changes to the XCode project which now compiles a proper framework for GEL and also compiles all test apps.  
601 4604 d 20 h jab /trunk/ The include statements for header files have been changed. Instead of including, like say

#include <CGLA/Vec3f.h>

we now use

#include "../CGLA/Vec3f.h"

for all files in the GEL library source tree (i.e. apps and test are not altered).

The point is that if GEL is used as an OSX framework and I include a GEL header, I have to do it like this:

#include <GEL/HMesh/myheader.h>

Now, inside myheader.h I may include CGLA/Vec3f.h, but how should this file be found? If I just add the GEL
framework as a framework, the path to the GEL headers is not added to the header search path because the
framework name (in this case GEL) is part of the header path. If all headers had been in one directory that
would not have mattered, since Vec3f.h would be in the same directory as myheader.h. But it is not. So, I
have made things more relative and it works well.
 
600 4607 d 4 h jab / Build system. I have both edited the bespoke Xcode project file, played with a premake4 build generator and our cmake system. Nothing works perfectly, but cmake might end up as the best solution. The cmake file now automatically finds the GEL files, but this entails that cmake is run when a new file is added.

Functions were added to Manifold: remove_face, remove_edge, remove_vertex. These do as advertised. I also added an add_face function (not tested but very simple ... hmmm famous last words)
the cpp/h file pairs close_holes and caps_and_needles were merged into "cleanup". To cleanup I added some functions that stitch meshes together, i.e. edges which share geometric end points are stitched.
 
599 4607 d 21 h jab /trunk/src/ adding glew and a change for compatibility to ItemVector  
598 4608 d 8 h jrf /trunk/src/ Bug: CMake unable to generate project. Fix: Removing deleted source files from CMake lists.  
597 4608 d 9 h jab / Some console stuff was not up to the right version  
596 4608 d 9 h jab /trunk/ merging  
595 4608 d 9 h jab /trunk/src/ Merged version  
594 4608 d 9 h jab /trunk/src/GLGraphics/ Resolved conflicts  
570 4711 d 21 h jrf /trunk/src/CGLA/ Keeping new onb code, but pointing the resulting basis vectors in the same directions as the old function did.  
569 4757 d 20 h jrf /trunk/src/CGLA/ updating orthogonal function and introducing onb function (the new version of orthogonal is significantly faster than the previous one)  
567 4863 d 17 h jrf /trunk/src/Geometry/ adding area information to TriMesh  
563 4904 d 5 h awk /trunk/  
561 4921 d 0 h awk /trunk/ Added GLGraphics::Console, a Quake-style console.

Added test application for console (test/GLGraphics-console).

Fixed Vec3f operator>>. The following now works:

CGLA::Vec3f in(0,1,2);
std::stringstream ss;
ss << in;
CGLA::Vec3f out;
ss >> out;
assert(in == out);

Didn't test any other VecXX types or Matrix types.. They might be broken.

Misc:
Fixed CMake Policy CMP0005 error.
Missing #include <iterator> in Manifold.cpp.
Disable ExportBuildSettings (deprecated in CMake)
 
555 5005 d 6 h jrf /trunk/ Update of the stb image library used by SOIL such that it can now also write png. I haven't yet extended the SOIL API, so call stbi_write_png(...) to use the new functionality.  
554 5099 d 9 h jrf /trunk/src/Geometry/ Ray::reset() has been updated to include reset of more recently added ray properties.  
541 5290 d 20 h jrf /trunk/src/Geometry/ Using references instead of copying vectors when not necessary. And fixing some iterator code in the BSPTree that doesn't work in VS2010.  
540 5295 d 19 h jrf /trunk/src/Util/ Undoing an unnecessary part of the previous bug fix.  
539 5300 d 19 h jrf /trunk/src/Util/ Bug fix: Inserting a check for empty string in XmlParser.  
521 5385 d 1 h s042372 /trunk/src/HMesh/ minor bugfixes  
510 5476 d 22 h jrf /trunk/src/ Enabling load of wavefront .mtl files without an associated object, and correcting the Material class slightly (ior instead of ior_in and ior_out).  
503 5566 d 7 h jrf /trunk/src/GLGraphics/ correction in comment  
502 5566 d 7 h jrf /trunk/src/GLGraphics/ GLSL shader update: Deleting shaders before returning 0 and printing filenames of loaded shaders when there is a compiler problem.  
501 5577 d 19 h jrf /trunk/src/CGLA/ Adding .0 to doubles and .0f to floats.  
492 5603 d 6 h jrf /trunk/ Repairing and cleaning the OBJ Viewer app:
- load.h and load.cpp were missing in the cmake list of the Geometry package (causing the viewer not to compile in VS).
- It was previously illegal to include draw.h after including gel_glut.h (the problem was inclusion of glew.h in header files included by draw.h. This is undesirable as an application does not necessarily need glew.h when using draw.h).
- A lot of unnecessary header files were included here and there.
 
488 5631 d 7 h awk /trunk/ Changed EOL to native  
487 5631 d 16 h awk /trunk/ Primal scream!

This is a python script for automatically downloading GEL dependencies on
windows, which can be annoying to do. So far it downloads and installs
lapack, glut and glew.