Subversion Repositories gelsvn

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
630 4364 d 3 h janba /branches/cpp11-devel/ Add branch for c++11 development  
/branches/cpp11-devel
609 4599 d 7 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 4610 d 1 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 4611 d 7 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
563 4907 d 3 h awk /trunk/  
/trunk/src/GLGraphics/Console.cpp
/trunk/src/GLGraphics/Console.h
/trunk/test/GLGraphics-console/console_test.cpp
561 4923 d 22 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
417 5964 d 0 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
385 6102 d 1 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
378 6118 d 4 h jab /trunk/test/LinAlg-eigensolver/ Added a test for the Lapack based routine for finding eigensolutions to dense symmetric real matrices.  
/trunk/test/LinAlg-eigensolver
/trunk/test/LinAlg-eigensolver/Makefile
/trunk/test/LinAlg-eigensolver/eigensolvertest.cpp
343 6423 d 1 h jab /trunk/test/CGLA-mat/ The power eigensolution method was slightly broken. It seems to work now. This test program has been improved.  
/trunk/test/CGLA-mat/mat_test.cpp
328 6663 d 7 h jab /trunk/test/Geometry-kdtree/ Some changes to the kdtree test  
/trunk/test/Geometry-kdtree/kdtree-test.cpp
326 6663 d 7 h jab /trunk/test/CGLA-mat/ changes  
/trunk/test/CGLA-mat/mat_test.cpp
306 6739 d 2 h jrf /trunk/ quaternion_cleanup branch has been merged with main branch  
/trunk/src/CGLA/ArithQuat.h
/trunk/src/CGLA/Quaternion.cpp
/trunk/src/CGLA/Quatd.h
/trunk/src/CGLA/Quaternion.h
/trunk/src/CGLA/Quatf.h
/trunk/src/CGLA/Vec3d.h
/trunk/src/CGLA/Vec3f.cpp
/trunk/src/CGLA/Vec3f.h
/trunk/test/CGLA-simple/simple_test.cpp
/trunk/test/CGLA-vec/vec_test.cpp
271 6845 d 3 h bj /trunk/ removed .vcproj and .sln files from SVN  
/trunk/GEL.sln
/trunk/apps/BloomenthalPolygonize/BloomenthalPolygonize.vcproj
/trunk/apps/BoundaryCollapse/BoundaryCollapse.vcproj
/trunk/apps/Decimator/Decimator.vcproj
/trunk/apps/OBJViewer/OBJViewer.vcproj
/trunk/apps/VolumePolygonize/VolumePolygonize.vcproj
/trunk/src/CGLA/CGLA.vcproj
/trunk/src/GLGraphics/GLGraphics.vcproj
/trunk/src/Geometry/Geometry.vcproj
/trunk/src/HMesh/HMesh.vcproj
/trunk/src/LinAlg/LinAlg.vcproj
/trunk/src/Util/Util.vcproj
/trunk/test/CGLA-covariance/CGLA_covariance.vcproj
/trunk/test/CGLA-mat/CGLA_mat.vcproj
/trunk/test/CGLA-ogl/CGLA_ogl.vcproj
/trunk/test/CGLA-simple/CGLA_simple.vcproj
/trunk/test/CGLA-vec/CGLA_vec.vcproj
/trunk/test/Geometry-kdtree/Geometry_kdtree.vcproj
/trunk/test/LinAlg-leastsq/LinAlg_leastsq.vcproj
/trunk/test/Util-resman/Util_resman.vcproj
198 7088 d 4 h bj /trunk/ Added Visual Studio 2005 compatibility  
/trunk/MPC/config/swig_perl.mpb
/trunk/MPC/templates/vc8platforms.mpt
/trunk/build_vc8_solution.bat
/trunk/makefiles/msvc8exe.mpt
/trunk/makefiles/msvc8lib.mpt
/trunk
/trunk/MPC/config/boost_date_time.mpb
/trunk/MPC/config/boost_filesystem.mpb
/trunk/MPC/config/boost_prg_exec_monitor.mpb
/trunk/MPC/config/boost_regex.mpb
/trunk/MPC/config/boost_signals.mpb
/trunk/MPC/config/boost_test_exec_monitor.mpb
/trunk/MPC/config/boost_thread.mpb
/trunk/MPC/config/boost_unit_test_framework.mpb
/trunk/MPC/config/global.features
/trunk/MPC/config/xerces.mpb
/trunk/MPC/modules/AutomakeWorkspaceCreator.pm
/trunk/MPC/modules/BMakeWorkspaceCreator.pm
/trunk/MPC/modules/Creator.pm
/trunk/MPC/modules/DirectoryManager.pm
/trunk/MPC/modules/NMakeWorkspaceCreator.pm
/trunk/MPC/modules/ProjectCreator.pm
/trunk/MPC/modules/TemplateInputReader.pm
/trunk/MPC/modules/TemplateParser.pm
/trunk/MPC/modules/VC8WorkspaceCreator.pm
/trunk/MPC/modules/WorkspaceCreator.pm
/trunk/MPC/mpc.pl
/trunk/MPC/mwc.pl
/trunk/MPC/templates/automake.mpd
/trunk/MPC/templates/bmake.mpd
/trunk/MPC/templates/em3.mpd
/trunk/MPC/templates/ghs.mpd
/trunk/MPC/templates/html.mpd
/trunk/MPC/templates/make.mpd
/trunk/MPC/templates/makedll.mpt
/trunk/MPC/templates/nmake.mpd
/trunk/MPC/templates/nmakedll.mpt
/trunk/MPC/templates/nmakeexe.mpt
/trunk/MPC/templates/sle.mpd
/trunk/MPC/templates/vc6.mpd
/trunk/MPC/templates/vc7.mpd
/trunk/MPC/templates/vc7csharp.mpd
/trunk/MPC/templates/vc7dll.mpt
/trunk/MPC/templates/vc7exe.mpt
/trunk/MPC/templates/vc7libexe.mpt
/trunk/MPC/templates/vc7vb.mpd
/trunk/MPC/templates/vc8.mpd
/trunk/MPC/templates/vc8dll.mpt
/trunk/MPC/templates/vc8exe.mpt
/trunk/MPC/templates/vc8lib.mpt
/trunk/MPC/templates/vc8libexe.mpt
/trunk/MPC/templates/vccommon.mpt
/trunk/apps/BloomenthalPolygonize/BloomenthalPolygonize.vcproj
/trunk/apps/BoundaryCollapse/BoundaryCollapse.vcproj
/trunk/apps/Decimator/Decimator.vcproj
/trunk/apps/Decimator/decimator.cpp
/trunk/apps/OBJViewer/OBJViewer.vcproj
/trunk/apps/OBJViewer/objview.cpp
/trunk/apps/VolumePolygonize/VolumePolygonize.vcproj
/trunk/makefiles/msvcexe.mpt
/trunk/src/CGLA/CGLA.vcproj
/trunk/src/GLGraphics/GLGraphics.vcproj
/trunk/src/GLGraphics/SimpleTrackBall.h
/trunk/src/Geometry/Geometry.vcproj
/trunk/src/Geometry/KDTree.h
/trunk/src/HMesh/HMesh.vcproj
/trunk/src/LinAlg/LinAlg.vcproj
/trunk/src/Util/Util.vcproj
/trunk/test/CGLA-covariance/CGLA_covariance.vcproj
/trunk/test/CGLA-mat/CGLA_mat.vcproj
/trunk/test/CGLA-ogl/CGLA_ogl.vcproj
/trunk/test/CGLA-simple/CGLA_simple.vcproj
/trunk/test/CGLA-vec/CGLA_vec.vcproj
/trunk/test/Geometry-kdtree/Geometry_kdtree.vcproj
/trunk/test/Geometry-kdtree/kdtree-test.cpp
/trunk/test/LinAlg-leastsq/LinAlg_leastsq.vcproj
/trunk/test/Util-resman/Util_resman.vcproj
195 7089 d 6 h jrf /trunk/ warning pragmas corrected.
Added messages stating that some preprocessor directives are needed for HMesh to work with MSVC8.
 
/trunk/apps/OBJViewer/objview.cpp
/trunk/src/CGLA/CGLA.h
/trunk/src/GLGraphics/SimpleTrackBall.cpp
/trunk/src/Geometry/Material.h
/trunk/src/HMesh/build_manifold.cpp
/trunk/src/HMesh/templates.h
/trunk/test/CGLA-simple/simple_test.cpp
194 7090 d 3 h jrf /trunk/test/CGLA-mat/ main now has a return type  
/trunk/test/CGLA-mat/mat_test.cpp
193 7090 d 3 h jrf /trunk/test/CGLA-covariance/ main now has a return type  
/trunk/test/CGLA-covariance/covariance_test.cpp
190 7105 d 6 h bj /trunk/ updated vcproj/sln files  
/trunk/GEL.sln
/trunk/apps/BloomenthalPolygonize/BloomenthalPolygonize.vcproj
/trunk/apps/BoundaryCollapse/BoundaryCollapse.vcproj
/trunk/apps/Decimator/Decimator.vcproj
/trunk/apps/OBJViewer/OBJViewer.vcproj
/trunk/apps/VolumePolygonize/VolumePolygonize.vcproj
/trunk/src/CGLA/CGLA.vcproj
/trunk/src/GLGraphics/GLGraphics.vcproj
/trunk/src/Geometry/Geometry.vcproj
/trunk/src/HMesh/HMesh.vcproj
/trunk/src/LinAlg/LinAlg.vcproj
/trunk/src/Util/Util.vcproj
/trunk/test/CGLA-covariance/CGLA_covariance.vcproj
/trunk/test/CGLA-mat/CGLA_mat.vcproj
/trunk/test/CGLA-ogl/CGLA_ogl.vcproj
/trunk/test/CGLA-simple/CGLA_simple.vcproj
/trunk/test/CGLA-vec/CGLA_vec.vcproj
/trunk/test/Geometry-kdtree/Geometry_kdtree.vcproj
/trunk/test/LinAlg-leastsq/LinAlg_leastsq.vcproj
/trunk/test/Util-resman/Util_resman.vcproj
182 7122 d 7 h bj /trunk/ merged restructuring branch properly  
/trunk/src/HMesh/build_manifold.cpp
/trunk/src/HMesh/build_manifold.h
/trunk/src/HMesh/caps_and_needles.cpp
/trunk/src/HMesh/caps_and_needles.h
/trunk/src/HMesh/fair_polygonize.cpp
/trunk/src/HMesh/fair_polygonize.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/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/triangulate.cpp
/trunk/src/HMesh/triangulate.h
/trunk/src/HMesh/triangulate_face_order.cpp
/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/gel.doxygen
/trunk/GEL.sln
/trunk/apps/BloomenthalPolygonize/BloomenthalPolygonize.vcproj
/trunk/apps/BoundaryCollapse/BoundaryCollapse.vcproj
/trunk/apps/Decimator/Decimator.vcproj
/trunk/apps/OBJViewer/OBJViewer.vcproj
/trunk/apps/VolumePolygonize/VolumePolygonize.vcproj
/trunk/src/CGLA/CGLA.vcproj
/trunk/src/GLGraphics/GLGraphics.vcproj
/trunk/src/Geometry/Geometry.vcproj
/trunk/src/HMesh/HMesh.vcproj
/trunk/src/LinAlg/LinAlg.vcproj
/trunk/src/Util/Util.vcproj
/trunk/test/CGLA-covariance/CGLA_covariance.vcproj
/trunk/test/CGLA-mat/CGLA_mat.vcproj
/trunk/test/CGLA-ogl/CGLA_ogl.vcproj
/trunk/test/CGLA-simple/CGLA_simple.vcproj
/trunk/test/CGLA-vec/CGLA_vec.vcproj
/trunk/test/Geometry-kdtree/Geometry_kdtree.vcproj
/trunk/test/LinAlg-leastsq/LinAlg_leastsq.vcproj
/trunk/test/Util-resman/Util_resman.vcproj

Show All