Subversion Repositories gelsvn

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
393 6065 d 9 h jab /branches/wireframe-experiments/ Creating a branch of GEL for certain wireframe experiments  
/branches/wireframe-experiments
382 6093 d 12 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 6106 d 8 h jrf /trunk/apps/OBJViewer/ reinserting texture toggle on/off  
/trunk/apps/OBJViewer/objview.cpp
370 6106 d 13 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 6108 d 7 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
365 6198 d 11 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 6244 d 6 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
357 6367 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
341 6452 d 13 h jab /trunk/ Added a ply viewer to OBJViewer.
other minor changes.		  
/trunk/GEL.xcodeproj/jab.pbxuser
/trunk/GEL.xcodeproj/project.pbxproj
/trunk/apps/MeshDistance/meshdist.cpp
/trunk/apps/OBJViewer/objview.cpp
/trunk/apps/OBJViewer/ply_load.cpp
/trunk/apps/VolumePolygonize/volpoly.cpp
/trunk/src/HMesh/obj_save.cpp
337 6471 d 12 h jab /trunk/apps/OBJViewer/ Added ply view to OBJViewer  
/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
299 6736 d 10 h jrf /trunk/ The SPD branch has been merged with the main branch.
This means that Bounding Box Hierarchies, BSP Trees, and two new applications have been added.		  
/trunk/apps/MeshDistance
/trunk/apps/Raytracer
/trunk/src/Geometry/AABox.cpp
/trunk/src/Geometry/AABox.h
/trunk/src/Geometry/BBox.cpp
/trunk/src/Geometry/BBox.h
/trunk/src/Geometry/BSPTree.cpp
/trunk/src/Geometry/BSPTree.h
/trunk/src/Geometry/BoundingINode.cpp
/trunk/src/Geometry/BoundingINode.h
/trunk/src/Geometry/BoundingLNode.cpp
/trunk/src/Geometry/BoundingLNode.h
/trunk/src/Geometry/BoundingNode.cpp
/trunk/src/Geometry/BoundingNode.h
/trunk/src/Geometry/BoundingTree.cpp
/trunk/src/Geometry/BoundingTree.h
/trunk/src/Geometry/OBox.cpp
/trunk/src/Geometry/OBox.h
/trunk/src/Geometry/Ray.h
/trunk/src/Geometry/Triangle.cpp
/trunk/src/Geometry/Triangle.h
/trunk/src/Geometry/build_bbtree.cpp
/trunk/src/Geometry/build_bbtree.h
/trunk/src/Geometry/verification.cpp
/trunk/src/Geometry/verification.h
/trunk/apps/OBJViewer/objview.cpp
/trunk/src/GLGraphics/QuatTrackBall.cpp
/trunk/src/GLGraphics/draw.cpp
/trunk/src/GLGraphics/draw.h
/trunk/src/Geometry/ThreeDDDA.cpp
/trunk/src/Geometry/ThreeDDDA.h
198 7073 d 10 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 7074 d 12 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
178 7108 d 7 h bj /trunk/ merged restructuring branch  
/trunk/bin
/trunk/src/GLGraphics
/trunk/apps/IMeshViewer
/trunk/src/Geometry/Texmap.cpp
/trunk/src/Geometry/Texmap.h
/trunk/src/Graphics
/trunk/src/HMeshUtil
/trunk/src/IMesh
/trunk/src/IMeshUtil
/trunk/GEL.sln
/trunk/Makefile
/trunk/README
/trunk/apps/BloomenthalPolygonize/BloomenthalPolygonize.vcproj
/trunk/apps/BloomenthalPolygonize/Makefile
/trunk/apps/BloomenthalPolygonize/bloomenthal-polygonize.cpp
/trunk/apps/BoundaryCollapse/BoundaryCollapse.vcproj
/trunk/apps/BoundaryCollapse/Makefile
/trunk/apps/BoundaryCollapse/boundary_collapse.cpp
/trunk/apps/Decimator/Decimator.vcproj
/trunk/apps/Decimator/Makefile
/trunk/apps/Decimator/decimator.cpp
/trunk/apps/OBJViewer/Makefile
/trunk/apps/OBJViewer/OBJViewer.vcproj
/trunk/apps/OBJViewer/objview.cpp
/trunk/apps/VolumePolygonize/Makefile
/trunk/apps/VolumePolygonize/VolumePolygonize.vcproj
/trunk/apps/VolumePolygonize/volpoly.cpp
/trunk/makefiles/GELapp.mpc
/trunk/makefiles/common.mk
/trunk/makefiles/config.mk
/trunk/src/CGLA/CGLA.h
/trunk/src/CGLA/CGLA.vcproj
/trunk/src/CGLA/Quaternion.cpp
/trunk/src/CGLA/Quaternion.h
/trunk/src/Geometry/Geometry.vcproj
/trunk/src/Geometry/IndexedFaceSet.h
/trunk/src/Geometry/Material.h
/trunk/src/Geometry/TriMesh.cpp
/trunk/src/Geometry/TriMesh.h
/trunk/src/Geometry/obj_load.cpp
/trunk/src/HMesh/FaceCirculator.h
/trunk/src/HMesh/HMesh.vcproj
/trunk/src/HMesh/Manifold.cpp
/trunk/src/HMesh/Manifold.h
/trunk/src/HMesh/VertexCirculator.h
/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-ogl/ogl_test.cpp
/trunk/test/CGLA-simple/CGLA_simple.vcproj
/trunk/test/CGLA-vec/CGLA_vec.vcproj
/trunk/test/CGLA-vec/Makefile
/trunk/test/Geometry-kdtree/Geometry_kdtree.vcproj
/trunk/test/LinAlg-leastsq/LinAlg_leastsq.vcproj
/trunk/test/Util-resman/Util_resman.vcproj
132 7158 d 10 h jab /trunk/ minor changes. These programs now include the new gel_gl.h gel_glu.h and
gel_glut.h headers instead of the normal GL headers. Easier portability.		  
/trunk/apps/IMeshViewer/trimesh_viewer.cpp
/trunk/apps/OBJViewer/objview.cpp
/trunk/src/Geometry/Texmap.h
/trunk/src/Geometry/TriMesh.cpp
/trunk/test/CGLA-ogl/ogl_test.cpp
125 7164 d 12 h jab /trunk/ Many small changes to allow GEL to compile on Mac OS X 10.4. Incidentally,
this version of OS X is based on gcc 4.0, so problems with this version of
gcc should also have been fixed now.		  
/trunk/apps/IMeshViewer/trimesh_viewer.cpp
/trunk/apps/OBJViewer/objview.cpp
/trunk/makefiles/Darwin_Power_Macintosh_g++.mk
/trunk/src/CGLA/ArithVec3Float.cpp
/trunk/src/CGLA/ArithVecFloat.h
/trunk/src/Geometry/HGrid.h
/trunk/src/Geometry/KDTree.h
/trunk/src/Geometry/RGrid.h
/trunk/src/Geometry/Texmap.cpp
/trunk/src/Geometry/Texmap.h
/trunk/src/Geometry/save_raw.h
/trunk/src/Graphics/GLViewController.cpp
/trunk/src/Graphics/QuatTrackBall.cpp
/trunk/src/Graphics/SimpleTrackBall.cpp
/trunk/src/HMeshUtil/fair_polygonize.cpp
/trunk/src/LinAlg/Vector.h
/trunk/test/CGLA-ogl/ogl_test.cpp
102 7177 d 12 h bj /trunk/ "fixed" most warnings when compiling with MSVC. Did it by disabling the warnings in CGLA.h and Timer.h  
/trunk/apps/OBJViewer/objview.cpp
/trunk/src/CGLA/CGLA.h
/trunk/src/CGLA/statistics.h
/trunk/src/Geometry/GradientFilter.cpp
/trunk/src/Geometry/Polygonizer.cpp
/trunk/src/HMeshUtil/fair_polygonize.cpp
/trunk/src/HMeshUtil/obj_save.cpp
/trunk/src/HMeshUtil/x3d_load.cpp
/trunk/src/HMeshUtil/x3d_save.cpp
/trunk/src/Util/Timer.h
97 7178 d 5 h bj /trunk/ *** empty log message ***  
/trunk/data/kd_head.bmp
/trunk/apps/Geometry-test/bloomenthal-polygonize.cpp
/trunk/apps/HMesh/boundary_collapse.cpp
/trunk/apps/HMesh/decimator.cpp
/trunk/apps/IMesh/.meshviewer.trackball
/trunk/apps/OBJViewer/objview.cpp
/trunk/apps/VolumePolygonize/volpoly.cpp
82 7178 d 12 h jab /trunk/apps/OBJViewer/ Added objview - a simple obj viewer.  
/trunk/apps/OBJViewer
/trunk/apps/OBJViewer/Makefile
/trunk/apps/OBJViewer/objview.cpp