Subversion Repositories gelsvn

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
600 4607 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.
 
/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 4608 d 14 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
417 5961 d 6 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 6099 d 7 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
373 6118 d 10 h jrf /trunk/ eliminating errors and warnings in VS 2005 compile  
/trunk/apps/Decimator/decimator.cpp
/trunk/apps/OBJViewer/wireframe.cpp
/trunk/apps/Pathtracer/core.h
/trunk/apps/Pathtracer/pathtracer.cpp
/trunk/apps/RangeScanViewer/plyfile.c
/trunk/src/GLGraphics/SOIL.c
/trunk/src/GLGraphics/draw.cpp
/trunk/src/GLGraphics/glsl_shader.cpp
/trunk/src/GLGraphics/glsl_shader.h
/trunk/src/GLGraphics/image_helper.c
/trunk/src/GLGraphics/stbi_DDS_aug_c.h
/trunk/src/GLGraphics/test_SOIL.cpp
/trunk/src/Geometry/Triangle.cpp
/trunk/src/Geometry/ply_load.cpp
/trunk/src/Geometry/tessellate.cpp
/trunk/src/HMesh/quadric_simplify.cpp
/trunk/src/Util/ArgExtracter.h
367 6148 d 10 h jab /trunk/ Slight changes to quadric simplification. I made the interface a little saner.  
/trunk/GEL.xcodeproj/jab.pbxuser
/trunk/GEL.xcodeproj/project.pbxproj
/trunk/apps/Decimator/decimator.cpp
/trunk/apps/Pathtracer/pathtracer.cpp
/trunk/src/HMesh/quadric_simplify.cpp
/trunk/src/HMesh/quadric_simplify.h
357 6379 d 10 h jab /trunk/ A number of changes were made to quadric simplification  
/trunk/GEL.xcodeproj/jab.pbxuser
/trunk/GEL.xcodeproj/project.pbxproj
/trunk/apps/OBJViewer/objview.cpp
/trunk/apps/Pathtracer/pathtracer.cpp
/trunk/src/Geometry/QEM.cpp
/trunk/src/Geometry/QEM.h
/trunk/src/HMesh/quadric_simplify.cpp
/trunk/src/HMesh/quadric_simplify.h
355 6394 d 9 h awk /trunk/apps/  
/trunk/apps/Pathtracer/path_tracer.cpp
/trunk/apps/Pathtracer/tracer.cpp
/trunk/apps/Pathtracer/tracer.h
/trunk/apps/OBJViewer/Makefile
/trunk/apps/Pathtracer/pathtracer.cpp
/trunk/apps/Pathtracer/pathtracer.h
/trunk/apps/Pathtracer/scene.cpp
353 6394 d 9 h awk /trunk/apps/Pathtracer/  
/trunk/apps/Pathtracer/camera.h
/trunk/apps/Pathtracer/core.h
/trunk/apps/Pathtracer/glass.h
/trunk/apps/Pathtracer/luminaire.h
/trunk/apps/Pathtracer/material.h
/trunk/apps/Pathtracer/matte.h
/trunk/apps/Pathtracer/mesh.h
/trunk/apps/Pathtracer/metal.h
/trunk/apps/Pathtracer/omni.h
/trunk/apps/Pathtracer/pathtracer.h
/trunk/apps/Pathtracer/plastic.h
/trunk/apps/Pathtracer/scene.h
/trunk/apps/Pathtracer/tracer.h
/trunk/apps/Pathtracer/camera.hpp
/trunk/apps/Pathtracer/core.hpp
/trunk/apps/Pathtracer/glass.hpp
/trunk/apps/Pathtracer/luminaire.hpp
/trunk/apps/Pathtracer/material.hpp
/trunk/apps/Pathtracer/matte.hpp
/trunk/apps/Pathtracer/mesh.hpp
/trunk/apps/Pathtracer/metal.hpp
/trunk/apps/Pathtracer/omni.hpp
/trunk/apps/Pathtracer/path_tracer.hpp
/trunk/apps/Pathtracer/plastic.hpp
/trunk/apps/Pathtracer/scene.hpp
/trunk/apps/Pathtracer/tracer.hpp
/trunk/apps/Pathtracer/camera.cpp
/trunk/apps/Pathtracer/glass.cpp
/trunk/apps/Pathtracer/luminaire.cpp
/trunk/apps/Pathtracer/material.cpp
/trunk/apps/Pathtracer/matte.cpp
/trunk/apps/Pathtracer/mesh.cpp
/trunk/apps/Pathtracer/metal.cpp
/trunk/apps/Pathtracer/omni.cpp
/trunk/apps/Pathtracer/path_tracer.cpp
/trunk/apps/Pathtracer/pathtracer.cpp
/trunk/apps/Pathtracer/plastic.cpp
/trunk/apps/Pathtracer/scene.cpp
/trunk/apps/Pathtracer/tracer.cpp
352 6394 d 9 h awk /trunk/apps/Pathtracer/  
/trunk/apps/Pathtracer/core.hpp
350 6407 d 6 h awk /trunk/ Worked around bug in BSPTree. "intersect_fast_node" does not work with
GCC!
 
/trunk/apps/Pathtracer/path_tracer.cpp
/trunk/apps/Pathtracer/scene.cpp
/trunk/src/Geometry/BSPTree.cpp
349 6407 d 7 h awk /trunk/ Misc fixed to make it compile on ubuntu 7.10  
/trunk/Makefile
/trunk/apps/Pathtracer/camera.hpp
/trunk/apps/Pathtracer/glass.cpp
/trunk/apps/Pathtracer/glass.hpp
/trunk/apps/Pathtracer/luminaire.cpp
/trunk/apps/Pathtracer/luminaire.hpp
/trunk/apps/Pathtracer/material.cpp
/trunk/apps/Pathtracer/material.hpp
/trunk/apps/Pathtracer/matte.cpp
/trunk/apps/Pathtracer/matte.hpp
/trunk/apps/Pathtracer/mesh.hpp
/trunk/apps/Pathtracer/metal.cpp
/trunk/apps/Pathtracer/metal.hpp
/trunk/apps/Pathtracer/omni.cpp
/trunk/apps/Pathtracer/omni.hpp
/trunk/apps/Pathtracer/path_tracer.hpp
/trunk/apps/Pathtracer/plastic.cpp
/trunk/apps/Pathtracer/plastic.hpp
/trunk/apps/Pathtracer/scene.cpp
/trunk/apps/Pathtracer/scene.hpp
/trunk/apps/Pathtracer/tracer.cpp
/trunk/apps/Pathtracer/tracer.hpp
/trunk/src/Geometry/BSPTree.cpp
/trunk/src/Geometry/BSPTree.h
/trunk/src/HMesh/x3d_load.cpp
/trunk/src/Util/ArgExtracter.h
348 6407 d 7 h awk /trunk/apps/Pathtracer/ Added path tracer, misc fixes  
/trunk/apps/Pathtracer/mt19937ar.cpp
/trunk/apps/Pathtracer/pathtracer.cpp
/trunk/apps/Pathtracer/main.cpp
/trunk/apps/Pathtracer/mt19937ar.c
/trunk/apps/Pathtracer/Makefile
/trunk/apps/Pathtracer/camera.cpp
/trunk/apps/Pathtracer/core.hpp
/trunk/apps/Pathtracer/mesh.cpp
/trunk/apps/Pathtracer/path_tracer.cpp
347 6407 d 7 h awk /trunk/apps/Pathtracer/  
/trunk/apps/Pathtracer/main.cpp
346 6407 d 8 h awk /trunk/  
/trunk/apps/Pathtracer
/trunk/apps/Pathtracer/Makefile
/trunk/apps/Pathtracer/camera.cpp
/trunk/apps/Pathtracer/camera.hpp
/trunk/apps/Pathtracer/core.hpp
/trunk/apps/Pathtracer/glass.cpp
/trunk/apps/Pathtracer/glass.hpp
/trunk/apps/Pathtracer/luminaire.cpp
/trunk/apps/Pathtracer/luminaire.hpp
/trunk/apps/Pathtracer/main.cpp
/trunk/apps/Pathtracer/material.cpp
/trunk/apps/Pathtracer/material.hpp
/trunk/apps/Pathtracer/matte.cpp
/trunk/apps/Pathtracer/matte.hpp
/trunk/apps/Pathtracer/mesh.cpp
/trunk/apps/Pathtracer/mesh.hpp
/trunk/apps/Pathtracer/metal.cpp
/trunk/apps/Pathtracer/metal.hpp
/trunk/apps/Pathtracer/mt19937ar.c
/trunk/apps/Pathtracer/mt19937ar.h
/trunk/apps/Pathtracer/omni.cpp
/trunk/apps/Pathtracer/omni.hpp
/trunk/apps/Pathtracer/path_tracer.cpp
/trunk/apps/Pathtracer/path_tracer.hpp
/trunk/apps/Pathtracer/plastic.cpp
/trunk/apps/Pathtracer/plastic.hpp
/trunk/apps/Pathtracer/scene.cpp
/trunk/apps/Pathtracer/scene.hpp
/trunk/apps/Pathtracer/tracer.cpp
/trunk/apps/Pathtracer/tracer.hpp
/trunk/data/cornell_box
/trunk/data/cornell_box/back.obj
/trunk/data/cornell_box/box1.obj
/trunk/data/cornell_box/box2.obj
/trunk/data/cornell_box/ceiling.obj
/trunk/data/cornell_box/floor.obj
/trunk/data/cornell_box/front.obj
/trunk/data/cornell_box/left.obj
/trunk/data/cornell_box/quad.obj
/trunk/data/cornell_box/right.obj
/trunk/data/cornell_box/small_sphere.obj
/trunk/data/cornell_box/sphere1.obj
/trunk/data/cornell_box/sphere2.obj
/trunk/data/cornell_box/teapot1.obj
/trunk/data/cornell_box/teapot2.obj
/trunk/apps/Raytracer/Makefile
/trunk/src/HMesh/x3d_load.cpp