Subversion Repositories gelsvn

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
618 4586 d 4 h jab /trunk/ Some changes to make curvature visualization work  
/trunk/GEL.xcodeproj/project.pbxproj
/trunk/README
/trunk/apps/MeshEdit/VisObj.cpp
/trunk/apps/MeshEdit/VisObj.h
/trunk/apps/MeshEdit/meshedit.cpp
/trunk/src/GLGraphics/ManifoldRenderer.cpp
614 4587 d 5 h jab /trunk/ Fixed a problem with global variables in harmonics.cpp causing meshedit to crash on exit.  
/trunk/apps/MeshEdit/VisObj.h
/trunk/apps/MeshEdit/harmonics.cpp
/trunk/apps/MeshEdit/harmonics.h
/trunk/apps/MeshEdit/meshedit.cpp
/trunk/src/GLGraphics/ManifoldRenderer.cpp
607 4589 d 17 h jrf /trunk/ removing Visual Studio warnings and some CMake problems  
/trunk/CMakeLists.txt
/trunk/apps/MeshEdit/meshedit.cpp
/trunk/apps/MeshEdit/polarize.cpp
/trunk/src/GLGraphics/ManifoldRenderer.cpp
/trunk/src/Geometry/tessellate.cpp
/trunk/src/HMesh/cleanup.cpp
/trunk/src/HMesh/curvature.cpp
/trunk/src/HMesh/mesh_optimization.cpp
/trunk/src/HMesh/triangulate.cpp
600 4598 d 3 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 4599 d 9 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
458 5692 d 5 h jab /trunk/apps/MeshEdit/ Oops. The name of the MeshEdit window was harmonics. Changed to MeshEdit  
/trunk/apps/MeshEdit/meshedit.cpp
456 5692 d 5 h jab /trunk/apps/MeshEdit/ Long overdue commit. Mostly minor changes  
/trunk/apps/MeshEdit/Renderer.cpp
/trunk/apps/MeshEdit/Renderer.h
/trunk/apps/MeshEdit/VisObj.cpp
/trunk/apps/MeshEdit/meshedit.cpp
434 5916 d 8 h jab /trunk/apps/MeshEdit/ Minor changes to incorporate that we can now load off files. Also some experimental facilities  
/trunk/apps/MeshEdit/meshedit.cpp
417 5952 d 2 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
416 6008 d 3 h jab /trunk/ Minor changes  
/trunk/GEL.xcodeproj/jab.pbxuser
/trunk/apps/MeshEdit/harmonics.cpp
/trunk/apps/MeshEdit/meshedit.cpp
415 6025 d 8 h jab /trunk/ Small changes to MeshEdit to make it compatible withe latest version of GLConsole  
/trunk/GEL.xcodeproj/jab.pbxuser
/trunk/apps/MeshEdit/meshedit.cpp
412 6046 d 21 h jab /trunk/apps/MeshEdit/ A numberof changes  
/trunk/apps/MeshEdit/Renderer.cpp
/trunk/apps/MeshEdit/VisObj.cpp
/trunk/apps/MeshEdit/VisObj.h
/trunk/apps/MeshEdit/curvature.cpp
/trunk/apps/MeshEdit/curvature.h
/trunk/apps/MeshEdit/harmonics.cpp
/trunk/apps/MeshEdit/meshedit.cpp
411 6047 d 3 h jrf /trunk/apps/MeshEdit/ Bug: harmonics.partial_reconstruct crash  
/trunk/apps/MeshEdit/meshedit.cpp
406 6060 d 8 h jab /trunk/apps/MeshEdit/ A nice corroded copper renderer was added.  
/trunk/apps/MeshEdit/Renderer.cpp
/trunk/apps/MeshEdit/Renderer.h
/trunk/apps/MeshEdit/VisObj.cpp
/trunk/apps/MeshEdit/meshedit.cpp
403 6061 d 4 h jab /trunk/apps/MeshEdit/ I added curvature visualization and made the Renderer interface much nicer.  
/trunk/apps/MeshEdit/curvature.cpp
/trunk/apps/MeshEdit/curvature.h
/trunk/apps/MeshEdit/CMakeLists.txt
/trunk/apps/MeshEdit/Renderer.cpp
/trunk/apps/MeshEdit/Renderer.h
/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
401 6064 d 9 h jab /trunk/ Some adjustments to the renderers.  
/trunk/GEL.xcodeproj/jab.pbxuser
/trunk/apps/MeshEdit/Renderer.cpp
/trunk/apps/MeshEdit/Renderer.h
/trunk/apps/MeshEdit/VisObj.cpp
/trunk/apps/MeshEdit/meshedit.cpp
399 6065 d 19 h jab /trunk/apps/MeshEdit/ VisObj which is responsible for drawing a single mesh in the MeshEdit application is now in its own file.
I have created a class hierarchy of renderers. This leads to a homogeneous way for drawing different appearances.
I have added some renderers: A reflection line renderer, an isophote renderer, a metallic renderer, and also
a gouraud renderer and a wireframe renderer. So far these are just for MeshEdit but could perhaps migrate to
GLGraphics.

The dual function in MeshEdit was made robust, but it will bite off a layer of polygons around any boundary.

Overall, the code is now much cleaner.
 
/trunk/apps/MeshEdit/Renderer.cpp
/trunk/apps/MeshEdit/Renderer.h
/trunk/apps/MeshEdit/VisObj.cpp
/trunk/apps/MeshEdit/VisObj.h
/trunk/apps/MeshEdit/wireframe.cpp
/trunk/apps/MeshEdit/wireframe.h
/trunk/apps/MeshEdit/harmonics.cpp
/trunk/apps/MeshEdit/harmonics.h
/trunk/apps/MeshEdit/meshedit.cpp
397 6067 d 3 h jab /trunk/apps/MeshEdit/ I embedded the two shader programs used for drawing
harmonics and tweaked the code to provide generic
wireframe support.
 
/trunk/apps/MeshEdit/tri.frag
/trunk/apps/MeshEdit/tri.vert
/trunk/apps/MeshEdit/harmonics.cpp
/trunk/apps/MeshEdit/meshedit.cpp
/trunk/apps/MeshEdit/wireframe.cpp
394 6068 d 5 h jab /trunk/ Minor changes to the viewcontroller and the MeshEdit application  
/trunk/GEL.xcodeproj/jab.pbxuser
/trunk/GEL.xcodeproj/project.pbxproj
/trunk/apps/MeshEdit/harmonics.cpp
/trunk/apps/MeshEdit/meshedit.cpp
/trunk/apps/MeshEdit/tri.frag
/trunk/doc/CGLA-usage.tex
/trunk/src/GLGraphics/GLViewController.cpp
/trunk/src/GLGraphics/GLViewController.h
/trunk/src/HMesh/x3d_save.cpp
391 6078 d 5 h jab /trunk/apps/MeshEdit/ A number of changes were made, and the MeshEdit application now supports
almost all of the functions that operate on the Manifold objects.
 
/trunk/apps/MeshEdit/harmonics.cpp
/trunk/apps/MeshEdit/harmonics.h
/trunk/apps/MeshEdit/meshedit.cpp

Show All