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 6079 d 1 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 6079 d 1 h jab /branches/wireframe-experiments/ Creating a branch of GEL for certain wireframe experiments  
/branches/wireframe-experiments
392 6089 d 0 h jab /trunk/ Many mostly minor changes. The QuatTrackball and GLViewController had
some questionable code that I improved. Fixed a bug in the loader.
 
/trunk/GEL.xcodeproj/jab.pbxuser
/trunk/GEL.xcodeproj/project.pbxproj
/trunk/src/GLGraphics/GLViewController.cpp
/trunk/src/GLGraphics/GLViewController.h
/trunk/src/GLGraphics/QuatTrackBall.cpp
/trunk/src/GLGraphics/QuatTrackBall.h
/trunk/src/HMesh/load.cpp
/trunk/src/HMesh/x3d_load.cpp
391 6089 d 0 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
390 6089 d 1 h mkm /trunk/ Minor changes in the CMake files - in order to put binaries into the right folders.  
/trunk/CMakeLists.txt
/trunk/GELConfig.cmake.in
389 6093 d 14 h jab /trunk/ minor changes  
/trunk/GEL.xcodeproj/jab.pbxuser
/trunk/GEL.xcodeproj/project.pbxproj
/trunk/src/gel.doxygen
388 6093 d 14 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 6095 d 0 h jab /trunk/apps/MeshEdit/ I added a lot of editing functions already in GEL  
/trunk/apps/MeshEdit/meshedit.cpp
386 6096 d 0 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 6100 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
384 6100 d 22 h jab /trunk/GEL.xcodeproj/ minor change to the xcode framework - should perhaps not be under version control  
/trunk/GEL.xcodeproj/jab.pbxuser
383 6100 d 22 h jab /trunk/src/HMesh/ Added ply load as well as a generic loader that detects file type  
/trunk/src/HMesh/load.cpp
/trunk/src/HMesh/load.h
/trunk/src/HMesh/ply_load.cpp
/trunk/src/HMesh/ply_load.h
382 6107 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
381 6116 d 23 h jrf /trunk/src/Util/ trimming element names to make more robust  
/trunk/src/Util/XmlParser.cpp
380 6117 d 0 h jrf /trunk/src/ switching the XML parser to a process-while-reading strategy  
/trunk/src/HMesh/x3d_load.cpp
/trunk/src/Util/XmlParser.cpp
/trunk/src/Util/XmlParser.h
379 6117 d 1 h jab /trunk/src/LinAlg/ I added a function "EigenSolutionsSym" to LapackFunc.cpp. This is simply a veiled version of
the Lapack function dsyev that works with the CMatrix and CVector classes.
 
/trunk/src/LinAlg/LapackFunc.cpp
/trunk/src/LinAlg/LapackFunc.h
378 6117 d 1 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
377 6117 d 4 h jrf /trunk/src/ making the XML parser more robust  
/trunk/src/HMesh/x3d_load.cpp
/trunk/src/Util/XmlParser.cpp
376 6119 d 22 h jrf /trunk/src/Util/ Changing buffer size  
/trunk/src/Util/XmlParser.cpp
375 6119 d 22 h jrf /trunk/src/ Adding a homebrewed XmlParser and bashing the Expat dependency!  
/trunk/src/Util/XmlParser.cpp
/trunk/src/Util/XmlParser.h
/trunk/src/Util/string_utils.cpp
/trunk/src/Util/string_utils.h
/trunk/src/Geometry/TriMesh.cpp
/trunk/src/Geometry/TriMesh.h
/trunk/src/HMesh/x3d_load.cpp
374 6120 d 0 h jrf /trunk/apps/OBJViewer/ reinserting texture toggle on/off  
/trunk/apps/OBJViewer/objview.cpp
373 6120 d 1 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
372 6120 d 4 h jab /trunk/ Minor changes to draw and the Xcode project  
/trunk/GEL.xcodeproj/jab.pbxuser
/trunk/GEL.xcodeproj/project.pbxproj
/trunk/src/GLGraphics/draw.cpp
/trunk/src/GLGraphics/draw.h
371 6120 d 4 h jab /trunk/src/Geometry/ Ply loading was added to this Directory. Two files rply.c and rply.h which
expose an MIT licensed ply handling API have been introduced as well as
a ply_load function declared in ply_load.h and defined in ply_load.cpp
 
/trunk/src/Geometry/ply_load.cpp
/trunk/src/Geometry/ply_load.h
/trunk/src/Geometry/rply.c
/trunk/src/Geometry/rply.h
/trunk/src/Geometry/TriMesh.cpp
370 6120 d 4 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
369 6120 d 23 h jab /trunk/src/GLGraphics/ The SOIL - simple opengl image library is in the public domain. I added it to
GEL because it is much simpler to use and more compact than DevIL.
By including it in the actual GEL distribution, we also lower the number
of external dependencies by 1 while slightly increasing compilation time.
 
/trunk/src/GLGraphics/SOIL.c
/trunk/src/GLGraphics/SOIL.h
/trunk/src/GLGraphics/glsl_shader.cpp
/trunk/src/GLGraphics/glsl_shader.h
/trunk/src/GLGraphics/image_DXT.c
/trunk/src/GLGraphics/image_DXT.h
/trunk/src/GLGraphics/image_helper.c
/trunk/src/GLGraphics/image_helper.h
/trunk/src/GLGraphics/stb_image_aug.c
/trunk/src/GLGraphics/stb_image_aug.h
/trunk/src/GLGraphics/stbi_DDS_aug.h
/trunk/src/GLGraphics/stbi_DDS_aug_c.h
/trunk/src/GLGraphics/test_SOIL.cpp
368 6121 d 22 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 6150 d 1 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
366 6150 d 5 h jab /trunk/src/CGLA/ So a variable l has now been given a default value to protect against
warnings
 
/trunk/src/CGLA/eigensolution.cpp
365 6212 d 3 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
364 6227 d 18 h jrf /trunk/src/Geometry/ Corrections to have the ray tracer run properly in Visual Studio  
/trunk/src/Geometry/BSPTree.cpp
/trunk/src/Geometry/obj_load.cpp
363 6257 d 22 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
362 6262 d 15 h jab /trunk/src/ Some added documentation and also I added the tesselation routine  
/trunk/src/Geometry/tessellate.cpp
/trunk/src/Geometry/tessellate.h
/trunk/src/GLGraphics/draw.cpp
/trunk/src/GLGraphics/draw.h
/trunk/src/HMesh/build_manifold.h
/trunk/src/HMesh/close_holes.h
/trunk/src/HMesh/mesh_optimization.h
/trunk/src/HMesh/obj_load.cpp
/trunk/src/HMesh/obj_load.h
/trunk/src/HMesh/obj_save.h
/trunk/src/HMesh/quadric_simplify.cpp
/trunk/src/HMesh/quadric_simplify.h
/trunk/src/HMesh/x3d_load.h
361 6376 d 16 h jab /trunk/apps/OBJViewer/ Added my shader loader functions to the GEL OBJViewer applications  
/trunk/apps/OBJViewer/glsl_shader.cpp
360 6376 d 16 h jab /trunk/apps/OBJViewer/ Added my shader loader functions to the GEL OBJViewer applications  
/trunk/apps/OBJViewer/glsl_shader.h
359 6376 d 16 h jab /trunk/src/CGLA/ Added 3D matrix functions for transformations  
/trunk/src/CGLA/Mat3x3d.cpp
358 6376 d 16 h jab /trunk/src/CGLA/ added rotation and scaling matrices to 3d double matrices  
/trunk/src/CGLA/Mat3x3d.h
357 6381 d 2 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 6381 d 21 h jab /trunk/apps/Decimator/ changes to qslim code  
/trunk/apps/Decimator/decimator.cpp
355 6396 d 0 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