Subversion Repositories gelsvn

Rev

Hide changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
692 2866 d 22 h jerf /trunk/src/CGLA/ better 3x3 inverse and float constants  
/trunk/src/CGLA/ArithSqMat3x3Float.cpp
/trunk/src/CGLA/CGLA.h
624 4509 d 23 h mono /trunk/src/CGLA/ Added helper functions for Mat4x4f: perspective, frustum, lookat, ortho (usefull when working OpenGL 3.0+)  
/trunk/src/CGLA/CGLA.h
/trunk/src/CGLA/Mat4x4f.cpp
/trunk/src/CGLA/Mat4x4f.h
609 4596 d 0 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
 
/trunk/Makefile
/trunk/apps/MeshDistance/Makefile
/trunk/apps/OBJViewer/Makefile
/trunk/apps/Pathtracer/Makefile
/trunk/apps/Raytracer/Makefile
/trunk/makefiles
/trunk/src/CGLA/Makefile
/trunk/src/GLGraphics/Makefile
/trunk/src/Geometry/Makefile
/trunk/src/HMesh/Makefile
/trunk/src/LinAlg/Makefile
/trunk/src/Util/Makefile
/trunk/test/CGLA-covariance/Makefile
/trunk/test/CGLA-mat/Makefile
/trunk/test/CGLA-ogl/Makefile
/trunk/test/CGLA-simple/Makefile
/trunk/test/CGLA-vec/Makefile
/trunk/test/Geometry-kdtree/Makefile
/trunk/test/LinAlg-eigensolver/Makefile
/trunk/test/LinAlg-leastsq/Makefile
/trunk/test/Util-resman/Makefile
/trunk/CMakeLists.txt
/trunk/GEL.xcodeproj/project.pbxproj
/trunk/src/GLGraphics/QuatTrackBall.cpp
/trunk/src/Geometry/AABox.cpp
/trunk/src/Geometry/Polygonizer.cpp
/trunk/src/Geometry/Polygonizer.h
/trunk/src/Geometry/Ray.h
/trunk/src/Geometry/rply.c
/trunk/src/Util/HashKey.cpp
/trunk/src/Util/XmlParser.cpp
/trunk/src/Util/XmlParser.h
605 4601 d 20 h jab /trunk/  
/trunk/CMakeLists.txt
/trunk/README_MSVC
/trunk/src/CGLA/eigensolution.cpp
/trunk/src/Geometry/obj_load.cpp
/trunk/src/HMesh/Manifold.cpp
/trunk/src/LinAlg/LapackFunc.h
600 4606 d 18 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.
 
/trunk/premake4.lua
/trunk/src/HMesh/cleanup.cpp
/trunk/src/HMesh/cleanup.h
/trunk/src/CGLA/CMakeLists.txt
/trunk/src/GLGraphics/CMakeLists.txt
/trunk/src/Geometry/CMakeLists.txt
/trunk/src/HMesh/CMakeLists.txt
/trunk/src/HMesh/caps_and_needles.cpp
/trunk/src/HMesh/caps_and_needles.h
/trunk/src/HMesh/close_holes.cpp
/trunk/src/HMesh/close_holes.h
/trunk/src/LinAlg/CMakeLists.txt
/trunk/src/Util/CMakeLists.txt
/branches/ctl/hmesh_vector/GEL.xcodeproj/project.pbxproj
/trunk/CMakeLists.txt
/trunk/apps/MeshDistance/CMakeLists.txt
/trunk/apps/MeshEdit/CMakeLists.txt
/trunk/apps/MeshEdit/meshedit.cpp
/trunk/apps/OBJViewer/CMakeLists.txt
/trunk/apps/OBJViewer/objview.cpp
/trunk/apps/Pathtracer/CMakeLists.txt
/trunk/apps/RangeScanViewer/CMakeLists.txt
/trunk/apps/Raytracer/CMakeLists.txt
/trunk/src/HMesh/Manifold.cpp
/trunk/src/HMesh/Manifold.h
/trunk/test/CGLA-covariance/CMakeLists.txt
/trunk/test/CGLA-mat/CMakeLists.txt
/trunk/test/CGLA-ogl/CMakeLists.txt
/trunk/test/CGLA-simple/CMakeLists.txt
/trunk/test/CGLA-vec/CMakeLists.txt
/trunk/test/GLGraphics-console/CMakeLists.txt
/trunk/test/Geometry-kdtree/CMakeLists.txt
/trunk/test/LinAlg-eigensolver/CMakeLists.txt
/trunk/test/LinAlg-leastsq/CMakeLists.txt
/trunk/test/Util-resman/CMakeLists.txt
595 4608 d 0 h jab /trunk/src/ Merged version  
/trunk/src/HMesh/AttributeVector.h
/trunk/src/HMesh/ConnectivityKernel.cpp
/trunk/src/HMesh/ConnectivityKernel.h
/trunk/src/HMesh/ItemID.h
/trunk/src/HMesh/ItemVector.h
/trunk/src/HMesh/Iterators.h
/trunk/src/HMesh/Walker.h
/trunk/src/HMesh/curvature.cpp
/trunk/src/HMesh/curvature.h
/trunk/src/HMesh/dual.cpp
/trunk/src/HMesh/dual.h
/trunk/src/HMesh/flatten.cpp
/trunk/src/HMesh/flatten.h
/trunk/src/HMesh/Face.cpp
/trunk/src/HMesh/Face.h
/trunk/src/HMesh/FaceCirculator.h
/trunk/src/HMesh/HalfEdge.cpp
/trunk/src/HMesh/HalfEdge.h
/trunk/src/HMesh/Vertex.cpp
/trunk/src/HMesh/Vertex.h
/trunk/src/HMesh/VertexCirculator.h
/trunk/src/HMesh/build_manifold.cpp
/trunk/src/HMesh/build_manifold.h
/trunk/src/HMesh/templates.h
/trunk/src/HMesh/triangulate_face_order.cpp
/trunk/src/HMesh/volume_polygonize.cpp
/trunk/src/HMesh/volume_polygonize.h
/trunk/src/CGLA/ArithMatFloat.h
/trunk/src/CGLA/ArithQuat.h
/trunk/src/CGLA/ArithSqMat2x2Float.h
/trunk/src/CGLA/ArithSqMat3x3Float.cpp
/trunk/src/CGLA/ArithSqMat3x3Float.h
/trunk/src/CGLA/ArithSqMat4x4Float.cpp
/trunk/src/CGLA/ArithSqMat4x4Float.h
/trunk/src/CGLA/ArithSqMatFloat.h
/trunk/src/CGLA/ArithVec.h
/trunk/src/CGLA/ArithVec2Float.cpp
/trunk/src/CGLA/ArithVec2Float.h
/trunk/src/CGLA/ArithVec3Float.cpp
/trunk/src/CGLA/ArithVec3Float.h
/trunk/src/CGLA/ArithVec3Int.h
/trunk/src/CGLA/ArithVec4Float.h
/trunk/src/CGLA/ArithVec4Int.h
/trunk/src/CGLA/ArithVecFloat.h
/trunk/src/CGLA/ArithVecInt.h
/trunk/src/CGLA/BitMask.h
/trunk/src/CGLA/CGLA.h
/trunk/src/CGLA/CMakeLists.txt
/trunk/src/CGLA/ExceptionStandard.h
/trunk/src/CGLA/Mat2x2d.h
/trunk/src/CGLA/Mat2x2f.h
/trunk/src/CGLA/Mat2x3d.h
/trunk/src/CGLA/Mat2x3f.h
/trunk/src/CGLA/Mat3x3d.cpp
/trunk/src/CGLA/Mat3x3d.h
/trunk/src/CGLA/Mat3x3f.cpp
/trunk/src/CGLA/Mat3x3f.h
/trunk/src/CGLA/Mat4x4d.cpp
/trunk/src/CGLA/Mat4x4d.h
/trunk/src/CGLA/Mat4x4f.cpp
/trunk/src/CGLA/Mat4x4f.h
/trunk/src/CGLA/Quatd.h
/trunk/src/CGLA/Quaternion.h
/trunk/src/CGLA/Quatf.h
/trunk/src/CGLA/TableTrigonometry.cpp
/trunk/src/CGLA/TableTrigonometry.h
/trunk/src/CGLA/UnitVector.h
/trunk/src/CGLA/Vec2d.h
/trunk/src/CGLA/Vec2f.h
/trunk/src/CGLA/Vec2i.cpp
/trunk/src/CGLA/Vec2i.h
/trunk/src/CGLA/Vec2ui.h
/trunk/src/CGLA/Vec3Hf.h
/trunk/src/CGLA/Vec3d.h
/trunk/src/CGLA/Vec3f.cpp
/trunk/src/CGLA/Vec3f.h
/trunk/src/CGLA/Vec3i.cpp
/trunk/src/CGLA/Vec3i.h
/trunk/src/CGLA/Vec3uc.h
/trunk/src/CGLA/Vec3usi.h
/trunk/src/CGLA/Vec4d.h
/trunk/src/CGLA/Vec4f.h
/trunk/src/CGLA/Vec4i.h
/trunk/src/CGLA/Vec4uc.h
/trunk/src/CGLA/eigensolution.cpp
/trunk/src/CGLA/eigensolution.h
/trunk/src/CGLA/gel_rand.cpp
/trunk/src/CGLA/statistics.cpp
/trunk/src/CGLA/statistics.h
/trunk/src/Geometry/AABox.cpp
/trunk/src/Geometry/AABox.h
/trunk/src/Geometry/AncestorGrid.h
/trunk/src/Geometry/BBox.cpp
/trunk/src/Geometry/BBox.h
/trunk/src/Geometry/BSPTree.cpp
/trunk/src/Geometry/BSPTree.h
/trunk/src/Geometry/BoundingINode.cpp
/trunk/src/Geometry/BoundingINode.h
/trunk/src/Geometry/BoundingLNode.cpp
/trunk/src/Geometry/BoundingLNode.h
/trunk/src/Geometry/BoundingNode.cpp
/trunk/src/Geometry/BoundingNode.h
/trunk/src/Geometry/BoundingTree.cpp
/trunk/src/Geometry/BoundingTree.h
/trunk/src/Geometry/CMakeLists.txt
/trunk/src/Geometry/Cell.h
/trunk/src/Geometry/GradientFilter.cpp
/trunk/src/Geometry/GradientFilter.h
/trunk/src/Geometry/GridAlgorithm.h
/trunk/src/Geometry/HGrid.h
/trunk/src/Geometry/IndexedFaceSet.h
/trunk/src/Geometry/KDTree.h
/trunk/src/Geometry/Material.h
/trunk/src/Geometry/Neighbours.cpp
/trunk/src/Geometry/Neighbours.h
/trunk/src/Geometry/OBox.cpp
/trunk/src/Geometry/OBox.h
/trunk/src/Geometry/Polygonizer.cpp
/trunk/src/Geometry/Polygonizer.h
/trunk/src/Geometry/QEM.cpp
/trunk/src/Geometry/QEM.h
/trunk/src/Geometry/RGrid.h
/trunk/src/Geometry/Ray.h
/trunk/src/Geometry/ThreeDDDA.cpp
/trunk/src/Geometry/ThreeDDDA.h
/trunk/src/Geometry/TriMesh.cpp
/trunk/src/Geometry/TriMesh.h
/trunk/src/Geometry/Triangle.cpp
/trunk/src/Geometry/Triangle.h
/trunk/src/Geometry/TrilinFilter.cpp
/trunk/src/Geometry/TrilinFilter.h
/trunk/src/Geometry/build_bbtree.cpp
/trunk/src/Geometry/build_bbtree.h
/trunk/src/Geometry/load.cpp
/trunk/src/Geometry/load.h
/trunk/src/Geometry/load_raw.cpp
/trunk/src/Geometry/load_raw.h
/trunk/src/Geometry/obj_load.cpp
/trunk/src/Geometry/obj_load.h
/trunk/src/Geometry/ply_load.cpp
/trunk/src/Geometry/ply_load.h
/trunk/src/Geometry/rply.c
/trunk/src/Geometry/rply.h
/trunk/src/Geometry/save_raw.h
/trunk/src/Geometry/tessellate.cpp
/trunk/src/Geometry/tessellate.h
/trunk/src/Geometry/verification.cpp
/trunk/src/Geometry/verification.h
/trunk/src/HMesh/CMakeLists.txt
/trunk/src/HMesh/Manifold.cpp
/trunk/src/HMesh/Manifold.h
/trunk/src/HMesh/caps_and_needles.cpp
/trunk/src/HMesh/caps_and_needles.h
/trunk/src/HMesh/close_holes.cpp
/trunk/src/HMesh/close_holes.h
/trunk/src/HMesh/load.cpp
/trunk/src/HMesh/load.h
/trunk/src/HMesh/mesh_optimization.cpp
/trunk/src/HMesh/mesh_optimization.h
/trunk/src/HMesh/obj_load.cpp
/trunk/src/HMesh/obj_load.h
/trunk/src/HMesh/obj_save.cpp
/trunk/src/HMesh/obj_save.h
/trunk/src/HMesh/off_load.cpp
/trunk/src/HMesh/off_load.h
/trunk/src/HMesh/off_save.cpp
/trunk/src/HMesh/off_save.h
/trunk/src/HMesh/ply_load.cpp
/trunk/src/HMesh/ply_load.h
/trunk/src/HMesh/quadric_simplify.cpp
/trunk/src/HMesh/quadric_simplify.h
/trunk/src/HMesh/refine_edges.cpp
/trunk/src/HMesh/refine_edges.h
/trunk/src/HMesh/smooth.cpp
/trunk/src/HMesh/smooth.h
/trunk/src/HMesh/subdivision.cpp
/trunk/src/HMesh/subdivision.h
/trunk/src/HMesh/triangulate.cpp
/trunk/src/HMesh/triangulate.h
/trunk/src/HMesh/x3d_load.cpp
/trunk/src/HMesh/x3d_load.h
/trunk/src/HMesh/x3d_save.cpp
/trunk/src/HMesh/x3d_save.h
/trunk/src/LinAlg/CMakeLists.txt
/trunk/src/LinAlg/LapackFunc.cpp
/trunk/src/LinAlg/LapackFunc.h
/trunk/src/LinAlg/LinAlgIO.cpp
/trunk/src/LinAlg/LinAlgIO.h
/trunk/src/LinAlg/Matrix.h
/trunk/src/LinAlg/Vector.h
/trunk/src/Util/ArgExtracter.h
/trunk/src/Util/CMakeLists.txt
/trunk/src/Util/Grid2D.h
/trunk/src/Util/HashKey.cpp
/trunk/src/Util/HashKey.h
/trunk/src/Util/HashTable.h
/trunk/src/Util/Parse.cpp
/trunk/src/Util/Parse.h
/trunk/src/Util/ResourceManager.h
/trunk/src/Util/Timer.h
/trunk/src/Util/XmlParser.cpp
/trunk/src/Util/XmlParser.h
/trunk/src/Util/string_utils.cpp
/trunk/src/Util/string_utils.h
570 4711 d 12 h jrf /trunk/src/CGLA/ Keeping new onb code, but pointing the resulting basis vectors in the same directions as the old function did.  
/trunk/src/CGLA/ArithVec3Float.cpp
569 4757 d 10 h jrf /trunk/src/CGLA/ updating orthogonal function and introducing onb function (the new version of orthogonal is significantly faster than the previous one)  
/trunk/src/CGLA/ArithVec3Float.cpp
/trunk/src/CGLA/ArithVec3Float.h
561 4920 d 15 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)
 
/trunk/src/GLGraphics/Console.cpp
/trunk/src/GLGraphics/Console.h
/trunk/test/GLGraphics-console
/trunk/test/GLGraphics-console/CMakeLists.txt
/trunk/test/GLGraphics-console/console_test.cpp
/trunk/CMakeLists.txt
/trunk/src/CGLA/ArithVec.h
/trunk/src/GLGraphics/CMakeLists.txt
/trunk/src/HMesh/Manifold.cpp
501 5577 d 10 h jrf /trunk/src/CGLA/ Adding .0 to doubles and .0f to floats.  
/trunk/src/CGLA/Mat3x3d.h
/trunk/src/CGLA/Mat3x3f.cpp
/trunk/src/CGLA/Mat3x3f.h
/trunk/src/CGLA/Mat4x4d.h
/trunk/src/CGLA/Mat4x4f.cpp
/trunk/src/CGLA/Mat4x4f.h
/trunk/src/CGLA/Quatd.h
/trunk/src/CGLA/Quatf.h
/trunk/src/CGLA/Vec4d.h
/trunk/src/CGLA/Vec4f.h
/trunk/src/CGLA/eigensolution.cpp
463 5700 d 20 h jab /trunk/src/CGLA/ Ooops. Previously, there was no 4D integer vector.  
/trunk/src/CGLA/Vec4i.h
462 5700 d 20 h jab /trunk/src/CGLA/ Ooops. Previously, there was no 4D integer vector.  
/trunk/src/CGLA/ArithVec4Int.h
461 5700 d 20 h jab /trunk/src/CGLA/ Removed the ability to set the 3D integer vectors in terms of spherical coordinates.  
/trunk/src/CGLA/ArithVec3Int.h
431 5924 d 23 h jab /trunk/src/CGLA/ Now with double matrices  
/trunk/src/CGLA/statistics.cpp
427 5930 d 11 h jrf /trunk/src/CGLA/ Correcting small mistake: abs -> fabs  
/trunk/src/CGLA/ArithQuat.h
418 5959 d 22 h jrf /trunk/ gel_rand.cpp now added to CMakeList  
/trunk/apps/Raytracer/raytrace.cpp
/trunk/src/CGLA/CMakeLists.txt
417 5960 d 17 h jrf /trunk/ Introducing gel_rand: a speed-optimized linear congruential pseudo-random number generator. It has been placed in CGLA.h. And all references to rand, srand, and RAND_MAX have been changed to gel_rand, gel_srand and GEL_RAND_MAX.  
/trunk/src/CGLA/gel_rand.cpp
/trunk/apps/MeshEdit/Renderer.cpp
/trunk/apps/MeshEdit/VisObj.cpp
/trunk/apps/MeshEdit/meshedit.cpp
/trunk/apps/Pathtracer/mesh.cpp
/trunk/apps/Raytracer/raytrace.cpp
/trunk/src/CGLA/CGLA.h
/trunk/src/Geometry/Polygonizer.cpp
/trunk/src/Geometry/Ray.h
/trunk/src/HMesh/mesh_optimization.cpp
/trunk/src/HMesh/quadric_simplify.cpp
/trunk/src/Util/HashKey.cpp
/trunk/test/CGLA-covariance/covariance_test.cpp
/trunk/test/CGLA-mat/mat_test.cpp
/trunk/test/CGLA-vec/vec_test.cpp
/trunk/test/Geometry-kdtree/CMakeLists.txt
/trunk/test/Geometry-kdtree/kdtree-test.cpp
/trunk/test/LinAlg-eigensolver/CMakeLists.txt
/trunk/test/LinAlg-eigensolver/eigensolvertest.cpp
/trunk/test/LinAlg-leastsq/CMakeLists.txt
/trunk/test/LinAlg-leastsq/leastsq-test.cpp
408 6056 d 19 h jab /trunk/src/CGLA/ Forgot 0 init of various functions producing standard matrices of type Mat4x4d  
/trunk/src/CGLA/Mat4x4d.cpp
385 6098 d 17 h jab /trunk/ CMakefiles included.

Note that exceptions were removed from Geometry/Polygonize.cpp since it did not play nice with visual studio 2005. An improved solution is needed so that the program does not just abort.
 
/trunk/CMakeLists.txt
/trunk/GELConfig.cmake.in
/trunk/GELFindGlew.cmake
/trunk/GELFindGlut.cmake
/trunk/GELFindLapack.cmake
/trunk/GELUse.cmake
/trunk/apps/BloomenthalPolygonize/CMakeLists.txt
/trunk/apps/BoundaryCollapse/CMakeLists.txt
/trunk/apps/Decimator/CMakeLists.txt
/trunk/apps/MeshDistance/CMakeLists.txt
/trunk/apps/OBJViewer/CMakeLists.txt
/trunk/apps/Pathtracer/CMakeLists.txt
/trunk/apps/RangeScanViewer/CMakeLists.txt
/trunk/apps/Raytracer/CMakeLists.txt
/trunk/apps/VolumePolygonize/CMakeLists.txt
/trunk/src/CGLA/CMakeLists.txt
/trunk/src/GLGraphics/CMakeLists.txt
/trunk/src/Geometry/CMakeLists.txt
/trunk/src/HMesh/CMakeLists.txt
/trunk/src/LinAlg/CMakeLists.txt
/trunk/src/Util/CMakeLists.txt
/trunk/test/CGLA-covariance/CMakeLists.txt
/trunk/test/CGLA-mat/CMakeLists.txt
/trunk/test/CGLA-ogl/CMakeLists.txt
/trunk/test/CGLA-simple/CMakeLists.txt
/trunk/test/CGLA-vec/CMakeLists.txt
/trunk/test/Geometry-kdtree/CMakeLists.txt
/trunk/test/LinAlg-eigensolver/CMakeLists.txt
/trunk/test/LinAlg-leastsq/CMakeLists.txt
/trunk/test/Util-resman/CMakeLists.txt
/trunk/apps/BoundaryCollapse/boundary_collapse.cpp
/trunk/src/Geometry/Polygonizer.cpp
382 6104 d 22 h jab /trunk/ a number of fixes  
/trunk/GEL.xcodeproj/jab.pbxuser
/trunk/GEL.xcodeproj/project.pbxproj
/trunk/apps/BoundaryCollapse/boundary_collapse.cpp
/trunk/apps/Decimator/decimator.cpp
/trunk/apps/MeshDistance/meshdist.cpp
/trunk/apps/OBJViewer/objview.cpp
/trunk/src/CGLA/ArithMatFloat.h
/trunk/src/CGLA/ArithQuat.h
/trunk/src/Geometry/load_raw.cpp
/trunk/src/Geometry/ply_load.cpp
/trunk/src/Util/ArgExtracter.h
/trunk/src/Util/XmlParser.h

Show All