Subversion Repositories gelsvn

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
594 4595 d 12 h jab /trunk/src/GLGraphics/ Resolved conflicts  
/trunk/src/GLGraphics/ManifoldRenderer.cpp
/trunk/src/GLGraphics/ManifoldRenderer.h
/trunk/src/GLGraphics/test_SOIL.cpp
/trunk/src/GLGraphics/GLViewController.cpp
/trunk/src/GLGraphics/GLViewController.h
/trunk/src/GLGraphics/IDBufferWireFrameRenderer.cpp
/trunk/src/GLGraphics/IDBufferWireFrameRenderer.h
/trunk/src/GLGraphics/QuatTrackBall.cpp
/trunk/src/GLGraphics/QuatTrackBall.h
/trunk/src/GLGraphics/SOIL.h
/trunk/src/GLGraphics/SimpleTrackBall.cpp
/trunk/src/GLGraphics/SimpleTrackBall.h
/trunk/src/GLGraphics/SinglePassWireframeRenderer.cpp
/trunk/src/GLGraphics/SinglePassWireframeRenderer.h
/trunk/src/GLGraphics/draw.cpp
/trunk/src/GLGraphics/draw.h
/trunk/src/GLGraphics/gel_gl.h
/trunk/src/GLGraphics/gel_glu.h
/trunk/src/GLGraphics/gel_glut.h
/trunk/src/GLGraphics/glsl_shader.cpp
/trunk/src/GLGraphics/glsl_shader.h
/trunk/src/GLGraphics/image_DXT.h
/trunk/src/GLGraphics/image_helper.h
/trunk/src/GLGraphics/stbi_DDS_aug.h
/trunk/src/GLGraphics/stbi_DDS_aug_c.h
195 7073 d 11 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 7107 d 6 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
152 7143 d 5 h jab /branches/restructuring/src/GLGraphics/ Texmap is going altogether.  
/branches/restructuring/src/GLGraphics/Texmap.cpp
/branches/restructuring/src/GLGraphics/Texmap.h
/branches/restructuring/src/GLGraphics/GLViewController.cpp
/branches/restructuring/src/GLGraphics/GLViewController.h
/branches/restructuring/src/GLGraphics/QuatTrackBall.cpp
/branches/restructuring/src/GLGraphics/QuatTrackBall.h
/branches/restructuring/src/GLGraphics/SimpleTrackBall.cpp
/branches/restructuring/src/GLGraphics/SimpleTrackBall.h
147 7143 d 10 h jab /branches/restructuring/src/GLGraphics/ This is the contents of the Graphics directory moved to GLGraphics  
/branches/restructuring/src/GLGraphics
/branches/restructuring/src/GLGraphics/GLViewController.cpp
/branches/restructuring/src/GLGraphics/GLViewController.h
/branches/restructuring/src/GLGraphics/Makefile
/branches/restructuring/src/GLGraphics/QuatTrackBall.cpp
/branches/restructuring/src/GLGraphics/QuatTrackBall.h
/branches/restructuring/src/GLGraphics/SimpleTrackBall.cpp
/branches/restructuring/src/GLGraphics/SimpleTrackBall.h
/branches/restructuring/src/GLGraphics/gel_gl.h
/branches/restructuring/src/GLGraphics/gel_glu.h
/branches/restructuring/src/GLGraphics/gel_glut.h