Subversion Repositories gelsvn

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
621 4579 d 23 h jrf /trunk/src/Geometry/ Bug: error when reading 3ds Max mtl-file export. Fix: new fstream loader is more strict, so we have to be more careful when reading input.  
/trunk/src/Geometry/obj_load.cpp
612 4586 d 12 h jrf /trunk/src/Geometry/ correcting bug in last commit  
/trunk/src/Geometry/obj_load.cpp
606 4588 d 22 h jrf /trunk/src/Geometry/ ensuring compatibility with code based on pre-merge trunk version  
/trunk/src/Geometry/Material.h
/trunk/src/Geometry/obj_load.cpp
605 4592 d 9 h jab /trunk/  
/trunk/CMakeLists.txt
/trunk/README_MSVC
/trunk/src/CGLA/eigensolution.cpp
/trunk/src/Geometry/obj_load.cpp
/trunk/src/HMesh/Manifold.cpp
/trunk/src/LinAlg/LapackFunc.h
601 4595 d 0 h jab /trunk/ The include statements for header files have been changed. Instead of including, like say

#include <CGLA/Vec3f.h>

we now use

#include "../CGLA/Vec3f.h"

for all files in the GEL library source tree (i.e. apps and test are not altered).

The point is that if GEL is used as an OSX framework and I include a GEL header, I have to do it like this:

#include <GEL/HMesh/myheader.h>

Now, inside myheader.h I may include CGLA/Vec3f.h, but how should this file be found? If I just add the GEL
framework as a framework, the path to the GEL headers is not added to the header search path because the
framework name (in this case GEL) is part of the header path. If all headers had been in one directory that
would not have mattered, since Vec3f.h would be in the same directory as myheader.h. But it is not. So, I
have made things more relative and it works well.		  
/trunk/GEL
/trunk/GEL/GEL-Info.plist
/trunk/GEL/GEL-Prefix.pch
/trunk/GEL/en.lproj
/trunk/GEL/en.lproj/InfoPlist.strings
/trunk/MeshEdit/bunny.png
/trunk/GEL.xcodeproj/project.pbxproj
/trunk/src/GL/glew.c
/trunk/src/GL/glew.h
/trunk/src/GLGraphics/Console.cpp
/trunk/src/GLGraphics/Console.h
/trunk/src/GLGraphics/IDBufferWireFrameRenderer.cpp
/trunk/src/GLGraphics/IDBufferWireFrameRenderer.h
/trunk/src/GLGraphics/ManifoldRenderer.cpp
/trunk/src/GLGraphics/ManifoldRenderer.h
/trunk/src/GLGraphics/QuatTrackBall.cpp
/trunk/src/GLGraphics/QuatTrackBall.h
/trunk/src/GLGraphics/SOIL.c
/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/Geometry/AncestorGrid.h
/trunk/src/Geometry/BBox.h
/trunk/src/Geometry/BSPTree.cpp
/trunk/src/Geometry/BSPTree.h
/trunk/src/Geometry/BoundingNode.h
/trunk/src/Geometry/Cell.h
/trunk/src/Geometry/GradientFilter.cpp
/trunk/src/Geometry/GradientFilter.h
/trunk/src/Geometry/IndexedFaceSet.h
/trunk/src/Geometry/KDTree.h
/trunk/src/Geometry/Material.h
/trunk/src/Geometry/Neighbours.h
/trunk/src/Geometry/OBox.cpp
/trunk/src/Geometry/Polygonizer.cpp
/trunk/src/Geometry/QEM.cpp
/trunk/src/Geometry/QEM.h
/trunk/src/Geometry/RGrid.h
/trunk/src/Geometry/ThreeDDDA.cpp
/trunk/src/Geometry/ThreeDDDA.h
/trunk/src/Geometry/TriMesh.cpp
/trunk/src/Geometry/TriMesh.h
/trunk/src/Geometry/Triangle.cpp
/trunk/src/Geometry/Triangle.h
/trunk/src/Geometry/TrilinFilter.h
/trunk/src/Geometry/build_bbtree.cpp
/trunk/src/Geometry/load.cpp
/trunk/src/Geometry/load_raw.cpp
/trunk/src/Geometry/load_raw.h
/trunk/src/Geometry/obj_load.cpp
/trunk/src/Geometry/ply_load.cpp
/trunk/src/Geometry/ply_load.h
/trunk/src/Geometry/tessellate.cpp
/trunk/src/Geometry/tessellate.h
/trunk/src/HMesh/Manifold.cpp
/trunk/src/HMesh/Manifold.h
/trunk/src/HMesh/cleanup.cpp
/trunk/src/HMesh/curvature.cpp
/trunk/src/HMesh/dual.cpp
/trunk/src/HMesh/flatten.cpp
/trunk/src/HMesh/mesh_optimization.cpp
/trunk/src/HMesh/mesh_optimization.h
/trunk/src/HMesh/obj_load.cpp
/trunk/src/HMesh/obj_save.cpp
/trunk/src/HMesh/off_save.cpp
/trunk/src/HMesh/ply_load.cpp
/trunk/src/HMesh/quadric_simplify.cpp
/trunk/src/HMesh/smooth.cpp
/trunk/src/HMesh/subdivision.cpp
/trunk/src/HMesh/triangulate.cpp
/trunk/src/HMesh/x3d_load.cpp
/trunk/src/HMesh/x3d_save.cpp
/trunk/src/LinAlg/Matrix.h
/trunk/src/LinAlg/Vector.h
/trunk/src/Util/Grid2D.h
/trunk/src/Util/HashKey.cpp
/trunk/src/Util/HashKey.h
/trunk/src/Util/Parse.h
595 4598 d 13 h jab /trunk/src/ Merged version  
/trunk/src/HMesh/AttributeVector.h
/trunk/src/HMesh/ConnectivityKernel.cpp
/trunk/src/HMesh/ConnectivityKernel.h
/trunk/src/HMesh/ItemID.h
/trunk/src/HMesh/ItemVector.h
/trunk/src/HMesh/Iterators.h
/trunk/src/HMesh/Walker.h
/trunk/src/HMesh/curvature.cpp
/trunk/src/HMesh/curvature.h
/trunk/src/HMesh/dual.cpp
/trunk/src/HMesh/dual.h
/trunk/src/HMesh/flatten.cpp
/trunk/src/HMesh/flatten.h
/trunk/src/HMesh/Face.cpp
/trunk/src/HMesh/Face.h
/trunk/src/HMesh/FaceCirculator.h
/trunk/src/HMesh/HalfEdge.cpp
/trunk/src/HMesh/HalfEdge.h
/trunk/src/HMesh/Vertex.cpp
/trunk/src/HMesh/Vertex.h
/trunk/src/HMesh/VertexCirculator.h
/trunk/src/HMesh/build_manifold.cpp
/trunk/src/HMesh/build_manifold.h
/trunk/src/HMesh/templates.h
/trunk/src/HMesh/triangulate_face_order.cpp
/trunk/src/HMesh/volume_polygonize.cpp
/trunk/src/HMesh/volume_polygonize.h
/trunk/src/CGLA/ArithMatFloat.h
/trunk/src/CGLA/ArithQuat.h
/trunk/src/CGLA/ArithSqMat2x2Float.h
/trunk/src/CGLA/ArithSqMat3x3Float.cpp
/trunk/src/CGLA/ArithSqMat3x3Float.h
/trunk/src/CGLA/ArithSqMat4x4Float.cpp
/trunk/src/CGLA/ArithSqMat4x4Float.h
/trunk/src/CGLA/ArithSqMatFloat.h
/trunk/src/CGLA/ArithVec.h
/trunk/src/CGLA/ArithVec2Float.cpp
/trunk/src/CGLA/ArithVec2Float.h
/trunk/src/CGLA/ArithVec3Float.cpp
/trunk/src/CGLA/ArithVec3Float.h
/trunk/src/CGLA/ArithVec3Int.h
/trunk/src/CGLA/ArithVec4Float.h
/trunk/src/CGLA/ArithVec4Int.h
/trunk/src/CGLA/ArithVecFloat.h
/trunk/src/CGLA/ArithVecInt.h
/trunk/src/CGLA/BitMask.h
/trunk/src/CGLA/CGLA.h
/trunk/src/CGLA/CMakeLists.txt
/trunk/src/CGLA/ExceptionStandard.h
/trunk/src/CGLA/Mat2x2d.h
/trunk/src/CGLA/Mat2x2f.h
/trunk/src/CGLA/Mat2x3d.h
/trunk/src/CGLA/Mat2x3f.h
/trunk/src/CGLA/Mat3x3d.cpp
/trunk/src/CGLA/Mat3x3d.h
/trunk/src/CGLA/Mat3x3f.cpp
/trunk/src/CGLA/Mat3x3f.h
/trunk/src/CGLA/Mat4x4d.cpp
/trunk/src/CGLA/Mat4x4d.h
/trunk/src/CGLA/Mat4x4f.cpp
/trunk/src/CGLA/Mat4x4f.h
/trunk/src/CGLA/Quatd.h
/trunk/src/CGLA/Quaternion.h
/trunk/src/CGLA/Quatf.h
/trunk/src/CGLA/TableTrigonometry.cpp
/trunk/src/CGLA/TableTrigonometry.h
/trunk/src/CGLA/UnitVector.h
/trunk/src/CGLA/Vec2d.h
/trunk/src/CGLA/Vec2f.h
/trunk/src/CGLA/Vec2i.cpp
/trunk/src/CGLA/Vec2i.h
/trunk/src/CGLA/Vec2ui.h
/trunk/src/CGLA/Vec3Hf.h
/trunk/src/CGLA/Vec3d.h
/trunk/src/CGLA/Vec3f.cpp
/trunk/src/CGLA/Vec3f.h
/trunk/src/CGLA/Vec3i.cpp
/trunk/src/CGLA/Vec3i.h
/trunk/src/CGLA/Vec3uc.h
/trunk/src/CGLA/Vec3usi.h
/trunk/src/CGLA/Vec4d.h
/trunk/src/CGLA/Vec4f.h
/trunk/src/CGLA/Vec4i.h
/trunk/src/CGLA/Vec4uc.h
/trunk/src/CGLA/eigensolution.cpp
/trunk/src/CGLA/eigensolution.h
/trunk/src/CGLA/gel_rand.cpp
/trunk/src/CGLA/statistics.cpp
/trunk/src/CGLA/statistics.h
/trunk/src/Geometry/AABox.cpp
/trunk/src/Geometry/AABox.h
/trunk/src/Geometry/AncestorGrid.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/CMakeLists.txt
/trunk/src/Geometry/Cell.h
/trunk/src/Geometry/GradientFilter.cpp
/trunk/src/Geometry/GradientFilter.h
/trunk/src/Geometry/GridAlgorithm.h
/trunk/src/Geometry/HGrid.h
/trunk/src/Geometry/IndexedFaceSet.h
/trunk/src/Geometry/KDTree.h
/trunk/src/Geometry/Material.h
/trunk/src/Geometry/Neighbours.cpp
/trunk/src/Geometry/Neighbours.h
/trunk/src/Geometry/OBox.cpp
/trunk/src/Geometry/OBox.h
/trunk/src/Geometry/Polygonizer.cpp
/trunk/src/Geometry/Polygonizer.h
/trunk/src/Geometry/QEM.cpp
/trunk/src/Geometry/QEM.h
/trunk/src/Geometry/RGrid.h
/trunk/src/Geometry/Ray.h
/trunk/src/Geometry/ThreeDDDA.cpp
/trunk/src/Geometry/ThreeDDDA.h
/trunk/src/Geometry/TriMesh.cpp
/trunk/src/Geometry/TriMesh.h
/trunk/src/Geometry/Triangle.cpp
/trunk/src/Geometry/Triangle.h
/trunk/src/Geometry/TrilinFilter.cpp
/trunk/src/Geometry/TrilinFilter.h
/trunk/src/Geometry/build_bbtree.cpp
/trunk/src/Geometry/build_bbtree.h
/trunk/src/Geometry/load.cpp
/trunk/src/Geometry/load.h
/trunk/src/Geometry/load_raw.cpp
/trunk/src/Geometry/load_raw.h
/trunk/src/Geometry/obj_load.cpp
/trunk/src/Geometry/obj_load.h
/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/save_raw.h
/trunk/src/Geometry/tessellate.cpp
/trunk/src/Geometry/tessellate.h
/trunk/src/Geometry/verification.cpp
/trunk/src/Geometry/verification.h
/trunk/src/HMesh/CMakeLists.txt
/trunk/src/HMesh/Manifold.cpp
/trunk/src/HMesh/Manifold.h
/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/HMesh/load.cpp
/trunk/src/HMesh/load.h
/trunk/src/HMesh/mesh_optimization.cpp
/trunk/src/HMesh/mesh_optimization.h
/trunk/src/HMesh/obj_load.cpp
/trunk/src/HMesh/obj_load.h
/trunk/src/HMesh/obj_save.cpp
/trunk/src/HMesh/obj_save.h
/trunk/src/HMesh/off_load.cpp
/trunk/src/HMesh/off_load.h
/trunk/src/HMesh/off_save.cpp
/trunk/src/HMesh/off_save.h
/trunk/src/HMesh/ply_load.cpp
/trunk/src/HMesh/ply_load.h
/trunk/src/HMesh/quadric_simplify.cpp
/trunk/src/HMesh/quadric_simplify.h
/trunk/src/HMesh/refine_edges.cpp
/trunk/src/HMesh/refine_edges.h
/trunk/src/HMesh/smooth.cpp
/trunk/src/HMesh/smooth.h
/trunk/src/HMesh/subdivision.cpp
/trunk/src/HMesh/subdivision.h
/trunk/src/HMesh/triangulate.cpp
/trunk/src/HMesh/triangulate.h
/trunk/src/HMesh/x3d_load.cpp
/trunk/src/HMesh/x3d_load.h
/trunk/src/HMesh/x3d_save.cpp
/trunk/src/HMesh/x3d_save.h
/trunk/src/LinAlg/CMakeLists.txt
/trunk/src/LinAlg/LapackFunc.cpp
/trunk/src/LinAlg/LapackFunc.h
/trunk/src/LinAlg/LinAlgIO.cpp
/trunk/src/LinAlg/LinAlgIO.h
/trunk/src/LinAlg/Matrix.h
/trunk/src/LinAlg/Vector.h
/trunk/src/Util/ArgExtracter.h
/trunk/src/Util/CMakeLists.txt
/trunk/src/Util/Grid2D.h
/trunk/src/Util/HashKey.cpp
/trunk/src/Util/HashKey.h
/trunk/src/Util/HashTable.h
/trunk/src/Util/Parse.cpp
/trunk/src/Util/Parse.h
/trunk/src/Util/ResourceManager.h
/trunk/src/Util/Timer.h
/trunk/src/Util/XmlParser.cpp
/trunk/src/Util/XmlParser.h
/trunk/src/Util/string_utils.cpp
/trunk/src/Util/string_utils.h
510 5467 d 1 h jrf /trunk/src/ Enabling load of wavefront .mtl files without an associated object, and correcting the Material class slightly (ior instead of ior_in and ior_out).  
/trunk/src/Geometry/BoundingLNode.h
/trunk/src/Geometry/Material.h
/trunk/src/Geometry/Ray.h
/trunk/src/Geometry/obj_load.cpp
/trunk/src/Geometry/obj_load.h
/trunk/src/Util/string_utils.h
436 5908 d 12 h jrf /trunk/src/Geometry/ closing files after use  
/trunk/src/Geometry/obj_load.cpp
421 5936 d 0 h jrf /trunk/src/Geometry/ Updated Wavefront .mtl loading  
/trunk/src/Geometry/Material.h
/trunk/src/Geometry/obj_load.cpp
364 6216 d 2 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
178 7110 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
79 7181 d 7 h jab /trunk/src/Geometry/ some minor adjustments  
/trunk/src/Geometry/obj_load.cpp
/trunk/src/Geometry/obj_load.h
/trunk/src/Geometry/IndexedFaceSet.h
/trunk/src/Geometry/Makefile
/trunk/src/Geometry/Material.h
/trunk/src/Geometry/Texmap.cpp
/trunk/src/Geometry/Texmap.h
/trunk/src/Geometry/TriMesh.cpp
/trunk/src/Geometry/TriMesh.h