Subversion Repositories gelsvn

Rev

Hide changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
643 4239 d 11 h janba /branches/cpp11-devel/ Polarization really works, but fitting to mesh not so much. Committing current version with voxel based fitting to reference mesh  
/branches/cpp11-devel/GEL.xcodeproj/project.pbxproj
/branches/cpp11-devel/apps/MeshDistance/meshdist.cpp
/branches/cpp11-devel/apps/MeshEdit/VisObj.cpp
/branches/cpp11-devel/apps/MeshEdit/VisObj.h
/branches/cpp11-devel/apps/MeshEdit/meshedit.cpp
/branches/cpp11-devel/apps/MeshEdit/polarize.cpp
/branches/cpp11-devel/apps/MeshEdit/polarize.h
/branches/cpp11-devel/apps/Raytracer/raytrace.cpp
/branches/cpp11-devel/src/GLGraphics/ManifoldRenderer.cpp
/branches/cpp11-devel/src/HMesh/Manifold.cpp
/branches/cpp11-devel/src/HMesh/dual.cpp
/branches/cpp11-devel/src/HMesh/smooth.cpp
631 4351 d 1 h janba /branches/cpp11-devel/ Many C++11 features added to this branch  
/branches/cpp11-devel/src/Geometry/geo_load.cpp
/branches/cpp11-devel/src/Geometry/geo_obj_load.cpp
/branches/cpp11-devel/src/Geometry/rply_load.cpp
/branches/cpp11-devel/src/Geometry/load.cpp
/branches/cpp11-devel/src/Geometry/obj_load.cpp
/branches/cpp11-devel/src/Geometry/ply_load.cpp
/branches/cpp11-devel/GEL.xcodeproj/project.pbxproj
/branches/cpp11-devel/apps/MeshDistance/meshdist.cpp
/branches/cpp11-devel/apps/MeshEdit/VisObj.cpp
/branches/cpp11-devel/apps/MeshEdit/meshedit.cpp
/branches/cpp11-devel/apps/MeshEdit/polarize.cpp
/branches/cpp11-devel/apps/MeshEdit/polarize.h
/branches/cpp11-devel/src/GLGraphics/ManifoldRenderer.cpp
/branches/cpp11-devel/src/GLGraphics/ManifoldRenderer.h
/branches/cpp11-devel/src/HMesh/AttributeVector.h
/branches/cpp11-devel/src/HMesh/Iterators.h
/branches/cpp11-devel/src/HMesh/Manifold.cpp
/branches/cpp11-devel/src/HMesh/Manifold.h
/branches/cpp11-devel/src/HMesh/Walker.h
/branches/cpp11-devel/src/HMesh/curvature.cpp
/branches/cpp11-devel/src/HMesh/flatten.cpp
/branches/cpp11-devel/src/HMesh/quadric_simplify.cpp
/branches/cpp11-devel/src/HMesh/refine_edges.cpp
/branches/cpp11-devel/src/HMesh/smooth.cpp
/branches/cpp11-devel/src/HMesh/smooth.h
/branches/cpp11-devel/src/HMesh/subdivision.cpp
/branches/cpp11-devel/src/HMesh/subdivision.h
630 4351 d 1 h janba /branches/cpp11-devel/ Add branch for c++11 development  
/branches/cpp11-devel
609 4586 d 5 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
600 4596 d 23 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
596 4598 d 5 h jab /trunk/ merging  
/trunk/GELDependencyConfig.cmake
/trunk/MeshEdit
/trunk/apps/MeshEdit/polarize.cpp
/trunk/apps/MeshEdit/polarize.h
/trunk/apps/OBJViewer/objviewer.cpp
/trunk/data/Armadillo.ply
/trunk/data/bunny.obj
/trunk/doc/halfedge-entities.pdf
/trunk/makefiles/Darwin_x86_64_cc.mk
/trunk/GELFindGlconsole.cmake
/trunk/GELFindLapack.cmake
/trunk/apps/BloomenthalPolygonize
/trunk/apps/BoundaryCollapse
/trunk/apps/Decimator
/trunk/apps/MeshEdit/Renderer.cpp
/trunk/apps/MeshEdit/Renderer.h
/trunk/apps/MeshEdit/curvature.cpp
/trunk/apps/MeshEdit/curvature.h
/trunk/apps/VolumePolygonize
/trunk/makefiles/MPC
/trunk
/trunk/CMakeLists.txt
/trunk/GEL.xcodeproj/jab.pbxuser
/trunk/GEL.xcodeproj/project.pbxproj
/trunk/README
/trunk/README_MSVC
/trunk/apps/MeshDistance/CMakeLists.txt
/trunk/apps/MeshDistance/meshdist.cpp
/trunk/apps/MeshEdit/CMakeLists.txt
/trunk/apps/MeshEdit/VisObj.cpp
/trunk/apps/MeshEdit/VisObj.h
/trunk/apps/MeshEdit/harmonics.cpp
/trunk/apps/MeshEdit/harmonics.h
/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/RangeScanViewer/rsview.cpp
/trunk/apps/Raytracer/CMakeLists.txt
/trunk/apps/Raytracer/raytrace.cpp
/trunk/data/bunny-little.x3d
/trunk/doc/intro.tex
/trunk/makefiles/findcompiler.sh
/trunk/test-bundle-Info.plist
/trunk/test/CGLA-covariance/covariance_test.cpp
/trunk/test/CGLA-ogl/CMakeLists.txt
459 5691 d 1 h jab /trunk/apps/MeshDistance/ Minor changes.  
/trunk/apps/MeshDistance/meshdist.cpp
385 6088 d 22 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 6095 d 3 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
341 6454 d 5 h jab /trunk/ Added a ply viewer to OBJViewer.
other minor changes.		  
/trunk/GEL.xcodeproj/jab.pbxuser
/trunk/GEL.xcodeproj/project.pbxproj
/trunk/apps/MeshDistance/meshdist.cpp
/trunk/apps/OBJViewer/objview.cpp
/trunk/apps/OBJViewer/ply_load.cpp
/trunk/apps/VolumePolygonize/volpoly.cpp
/trunk/src/HMesh/obj_save.cpp
309 6724 d 2 h jab /trunk/ numerous changes making ray tracing work with bbox hierarchy  
/trunk/apps/MeshDistance/meshdist.cpp
/trunk/apps/Raytracer/Camera.h
/trunk/apps/Raytracer/Makefile
/trunk/apps/Raytracer/raytrace.cpp
/trunk/src/Geometry/AABox.cpp
/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/Ray.h
/trunk/src/Geometry/Triangle.cpp
/trunk/src/Geometry/Triangle.h
/trunk/src/Geometry/build_bbtree.cpp
305 6726 d 2 h jab /trunk/apps/ I have made minor changes to ensure things compile on Linux. Mostly
adding Makefiles		  
/trunk/apps/MeshDistance/Makefile
/trunk/apps/Raytracer/Makefile
/trunk/apps/Decimator/decimator.cpp
/trunk/apps/Raytracer/raytrace.cpp
299 6738 d 1 h jrf /trunk/ The SPD branch has been merged with the main branch.
This means that Bounding Box Hierarchies, BSP Trees, and two new applications have been added.		  
/trunk/apps/MeshDistance
/trunk/apps/Raytracer
/trunk/src/Geometry/AABox.cpp
/trunk/src/Geometry/AABox.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/OBox.cpp
/trunk/src/Geometry/OBox.h
/trunk/src/Geometry/Ray.h
/trunk/src/Geometry/Triangle.cpp
/trunk/src/Geometry/Triangle.h
/trunk/src/Geometry/build_bbtree.cpp
/trunk/src/Geometry/build_bbtree.h
/trunk/src/Geometry/verification.cpp
/trunk/src/Geometry/verification.h
/trunk/apps/OBJViewer/objview.cpp
/trunk/src/GLGraphics/QuatTrackBall.cpp
/trunk/src/GLGraphics/draw.cpp
/trunk/src/GLGraphics/draw.h
/trunk/src/Geometry/ThreeDDDA.cpp
/trunk/src/Geometry/ThreeDDDA.h
294 6738 d 3 h jrf /  
/branches/SPD/apps/Raytracer
/branches/SPD/apps/Raytracer/Camera.h
/branches/SPD/apps/Raytracer/raytrace.cpp
/trunk/data/dolphins.obj
/branches/SPD/apps/MeshDistance/meshdist.cpp
/branches/SPD/apps/OBJViewer/objview.cpp
/branches/SPD/apps/VolumePolygonize/volpoly.cpp
/branches/SPD/src/GLGraphics/QuatTrackBall.cpp
/branches/SPD/src/GLGraphics/QuatTrackBall.h
/branches/SPD/src/Geometry/Ray.h
292 6739 d 23 h jrf /branches/SPD/apps/MeshDistance/  
/branches/SPD/apps/MeshDistance/meshdist.cpp
291 6740 d 0 h jrf /branches/SPD/  
/branches/SPD/apps/MeshDistance
/branches/SPD/apps/MeshDistance/meshdist.cpp
/branches/SPD/src/Geometry/tritest.cpp
/branches/SPD/src/GLGraphics/draw.cpp
/branches/SPD/src/GLGraphics/draw.h
/branches/SPD/src/Geometry/AABox.cpp
/branches/SPD/src/Geometry/AABox.h
/branches/SPD/src/Geometry/BSPTree.cpp
/branches/SPD/src/Geometry/BoundingINode.cpp
/branches/SPD/src/Geometry/BoundingINode.h
/branches/SPD/src/Geometry/BoundingLNode.cpp
/branches/SPD/src/Geometry/BoundingLNode.h
/branches/SPD/src/Geometry/BoundingNode.cpp
/branches/SPD/src/Geometry/BoundingNode.h
/branches/SPD/src/Geometry/BoundingTree.cpp
/branches/SPD/src/Geometry/BoundingTree.h
/branches/SPD/src/Geometry/OBox.cpp
/branches/SPD/src/Geometry/OBox.h
/branches/SPD/src/Geometry/Triangle.cpp
/branches/SPD/src/Geometry/Triangle.h
/branches/SPD/src/Geometry/build_bbtree.cpp
/branches/SPD/src/Geometry/build_bbtree.h
/branches/SPD/src/Geometry/verification.cpp
/branches/SPD/src/Geometry/verification.h