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
612 4639 d 13 h jrf /trunk/src/Geometry/ correcting bug in last commit  
610 4639 d 13 h jrf /trunk/src/Geometry/ removing VS warnings  
609 4639 d 14 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 4641 d 22 h jrf /trunk/src/GLGraphics/ ensuring compatibility with code based on pre-merge trunk version  
607 4641 d 22 h jrf /trunk/ removing Visual Studio warnings and some CMake problems  
606 4641 d 22 h jrf /trunk/src/Geometry/ ensuring compatibility with code based on pre-merge trunk version  
605 4645 d 9 h jab /trunk/  
603 4646 d 7 h jab /trunk/ Made it work with cmake  
601 4648 d 1 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 4650 d 8 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 4651 d 2 h jab /trunk/src/ adding glew and a change for compatibility to ItemVector  
598 4651 d 12 h jrf /trunk/src/ Bug: CMake unable to generate project. Fix: Removing deleted source files from CMake lists.  
597 4651 d 13 h jab / Some console stuff was not up to the right version  
595 4651 d 14 h jab /trunk/src/ Merged version  
594 4651 d 14 h jab /trunk/src/GLGraphics/ Resolved conflicts  
570 4755 d 2 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 4801 d 0 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 4906 d 21 h jrf /trunk/src/Geometry/ adding area information to TriMesh  
563 4947 d 10 h awk /trunk/  
561 4964 d 4 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)
 

Show All