Subversion Repositories gelsvn

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
601 4591 d 9 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
594 4594 d 22 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
447 5878 d 18 h jab /trunk/src/GLGraphics/ Fixed some include guards  
/trunk/src/GLGraphics/GLViewController.h
/trunk/src/GLGraphics/QuatTrackBall.h
/trunk/src/GLGraphics/SimpleTrackBall.h
/trunk/src/GLGraphics/glsl_shader.h
392 6073 d 18 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
277 6814 d 21 h jrf /trunk/src/ The int_pow function in CGLA has been updated to run with O(log(n)) complexity.

The QuatTrackBall has been updated.
 
/trunk/src/CGLA/CGLA.h
/trunk/src/GLGraphics/QuatTrackBall.cpp
/trunk/src/GLGraphics/QuatTrackBall.h
178 7106 d 16 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
169 7112 d 14 h jab /branches/restructuring/ Many important changes to the polygonizer.  
/branches/restructuring/apps/VolumePolygonize/volpoly.cpp
/branches/restructuring/src/GLGraphics/GLViewController.h
/branches/restructuring/src/GLGraphics/QuatTrackBall.h
/branches/restructuring/src/HMesh/fair_polygonize.cpp
/branches/restructuring/src/HMesh/fair_polygonize.h
152 7142 d 16 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 7142 d 20 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