Subversion Repositories gelsvn

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
395 6163 d 18 h jab /branches/wireframe-experiments/apps/MeshEdit/ This branch contains some experimental wireframe code. It is too slow, but
if I throw it out, I can't go back to it.
 
/branches/wireframe-experiments/apps/MeshEdit/wire-generic.frag
/branches/wireframe-experiments/apps/MeshEdit/wire-generic.geom
/branches/wireframe-experiments/apps/MeshEdit/wire-generic.vert
/branches/wireframe-experiments/apps/MeshEdit/wire-hex.frag
/branches/wireframe-experiments/apps/MeshEdit/wire-hex.geom
/branches/wireframe-experiments/apps/MeshEdit/wire-hex.vert
/branches/wireframe-experiments/apps/MeshEdit/harmonics.cpp
/branches/wireframe-experiments/apps/MeshEdit/meshedit.cpp
/branches/wireframe-experiments/apps/MeshEdit/tri.frag
/branches/wireframe-experiments/apps/MeshEdit/wireframe.cpp
/branches/wireframe-experiments/apps/MeshEdit/wireframe.h
393 6163 d 18 h jab /branches/wireframe-experiments/ Creating a branch of GEL for certain wireframe experiments  
/branches/wireframe-experiments
391 6173 d 17 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
388 6178 d 7 h jab /trunk/apps/MeshEdit/ MeshEdit now really works. It contains a simple console interface which
allows you to try out almost any of the functions in HMesh which modify
a Manifold: Smoothing, edge refinement, face refinement, triangulation of
polygons, optimization of triangulations, Garland Heckbert simplification,
and more.

It is not perfect however, the harmonics analysis which started the whole thing
only works for small meshes, and wireframe drawing simply does not work for
non-triangles. Moreover to be really useful it should provide for plugins.
 
/trunk/apps/MeshEdit/harmonics.cpp
/trunk/apps/MeshEdit/harmonics.h
/trunk/apps/MeshEdit/meshedit.cpp
387 6179 d 16 h jab /trunk/apps/MeshEdit/ I added a lot of editing functions already in GEL  
/trunk/apps/MeshEdit/meshedit.cpp
386 6180 d 17 h jab /trunk/apps/MeshEdit/ Added MeshEdit. So far it can only do harmonic analysis but more should be
added
 
/trunk/apps/MeshEdit
/trunk/apps/MeshEdit/harmonics.cpp
/trunk/apps/MeshEdit/harmonics.h
/trunk/apps/MeshEdit/meshedit.cpp
/trunk/apps/MeshEdit/tri.frag
/trunk/apps/MeshEdit/tri.vert
/trunk/apps/MeshEdit/wireframe.cpp
/trunk/apps/MeshEdit/wireframe.h
385 6185 d 15 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 6191 d 20 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
374 6204 d 17 h jrf /trunk/apps/OBJViewer/ reinserting texture toggle on/off  
/trunk/apps/OBJViewer/objview.cpp
373 6204 d 18 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
370 6204 d 21 h jab /trunk/apps/OBJViewer/ First of all the wireframe drawing has been put in its own file. It is a shader
based feature (SM 4.0) and the shaders are inside the file as strings.

glsl_shader.cpp and glsl_shader.h were removed from this application and added
to GLGraphics in the GEL library. I wanted to do that for some time but it means that GEL becomes directly dependent on Glew. That is not a big issue though: GEL already depends on GL and GLEW is very easy to install.

I have added another ply loader (rply.c and rply.h) while ply.c and ply.h
were removed. The new one has the benefit of also loading binary ply files, but that is now all in the Geometry directory.

objview.cpp has been changed slightly. It now loads OBJ, PLY and X3D
 
/trunk/apps/OBJViewer/wireframe.cpp
/trunk/apps/OBJViewer/wireframe.h
/trunk/apps/OBJViewer/glsl_shader.cpp
/trunk/apps/OBJViewer/glsl_shader.h
/trunk/apps/OBJViewer/ply.c
/trunk/apps/OBJViewer/ply.h
/trunk/apps/OBJViewer/ply_load.cpp
/trunk/apps/OBJViewer/ply_load.h
/trunk/apps/OBJViewer/objview.cpp
368 6206 d 15 h jrf /trunk/ Bruteforce wireframe rendering introduced in draw framework and OBJViewer. Texture toggle on/off introduced in OBJViewer.  
/trunk/apps/OBJViewer/objview.cpp
/trunk/src/GLGraphics/draw.cpp
/trunk/src/GLGraphics/draw.h
367 6234 d 18 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
365 6296 d 20 h jab /trunk/ minor changes.  
/trunk/GEL.xcodeproj/jab.pbxuser
/trunk/GEL.xcodeproj/project.pbxproj
/trunk/apps/Decimator/decimator.cpp
/trunk/apps/OBJViewer/objview.cpp
/trunk/apps/OBJViewer/ply.c
/trunk/apps/OBJViewer/ply_load.cpp
/trunk/apps/VolumePolygonize/volpoly.cpp
363 6342 d 15 h jab /trunk/ A few changes to make quadric simplification better. In particular, boundaries
are now handled well.
 
/trunk/GEL.xcodeproj/jab.pbxuser
/trunk/GEL.xcodeproj/project.pbxproj
/trunk/apps/Decimator/decimator.cpp
/trunk/apps/OBJViewer/objview.cpp
/trunk/src/HMesh/Vertex.cpp
/trunk/src/HMesh/quadric_simplify.cpp
/trunk/src/HMesh/quadric_simplify.h
361 6461 d 8 h jab /trunk/apps/OBJViewer/ Added my shader loader functions to the GEL OBJViewer applications  
/trunk/apps/OBJViewer/glsl_shader.cpp
360 6461 d 8 h jab /trunk/apps/OBJViewer/ Added my shader loader functions to the GEL OBJViewer applications  
/trunk/apps/OBJViewer/glsl_shader.h
357 6465 d 18 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
356 6466 d 14 h jab /trunk/apps/Decimator/ changes to qslim code  
/trunk/apps/Decimator/decimator.cpp
355 6480 d 17 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

Show All