| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 608 |
4625 d 13 h |
jrf |
/trunk/src/GLGraphics/ |
ensuring compatibility with code based on pre-merge trunk version |
|
/trunk/src/GLGraphics/draw.cpp
|
| 601 |
4631 d 15 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 |
4635 d 5 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
|
| 492 |
5630 d 1 h |
jrf |
/trunk/ |
Repairing and cleaning the OBJ Viewer app:
- load.h and load.cpp were missing in the cmake list of the Geometry package (causing the viewer not to compile in VS).
- It was previously illegal to include draw.h after including gel_glut.h (the problem was inclusion of glew.h in header files included by draw.h. This is undesirable as an application does not necessarily need glew.h when using draw.h).
- A lot of unnecessary header files were included here and there. |
|
/trunk/apps/OBJViewer/objview.cpp
/trunk/src/GLGraphics/draw.cpp
/trunk/src/GLGraphics/draw.h
/trunk/src/GLGraphics/gel_glut.h
/trunk/src/Geometry/CMakeLists.txt
/trunk/src/Geometry/load.h
|
| 441 |
5919 d 0 h |
jab |
/trunk/src/GLGraphics/ |
Loads textures now via SOIL |
|
/trunk/src/GLGraphics/draw.cpp
/trunk/src/GLGraphics/draw.h
|
| 432 |
5952 d 3 h |
jab |
/trunk/src/GLGraphics/ |
Allows drawing of Indexed face sets |
|
/trunk/src/GLGraphics/draw.cpp
/trunk/src/GLGraphics/draw.h
|
| 396 |
6102 d 23 h |
jab |
/trunk/src/GLGraphics/ |
I have added the SinglePassWireFrameRenderer which is a
fast path for triangle meshes.
I have addedd the IDBufferWireframeRenderer which is
less fast but should handle anything.
draw has grown some functions for wireframe drawing,
but you will need to use IDBufferWireframeRenderer directly,
it keeps a lot of state and it is difficult to make a
convenience function. |
|
/trunk/src/GLGraphics/IDBufferWireFrameRenderer.cpp
/trunk/src/GLGraphics/IDBufferWireFrameRenderer.h
/trunk/src/GLGraphics/SinglePassWireframeRenderer.cpp
/trunk/src/GLGraphics/SinglePassWireframeRenderer.h
/trunk/src/GLGraphics/draw.cpp
/trunk/src/GLGraphics/draw.h
|
| 373 |
6145 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 |
6145 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
|
| 368 |
6146 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
|
| 362 |
6287 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
|
| 339 |
6510 d 4 h |
jab |
/trunk/src/GLGraphics/ |
Added ply view to OBJViewer |
|
/trunk/src/GLGraphics/draw.cpp
|
| 331 |
6652 d 1 h |
jab |
/trunk/src/ |
Added a draw function for HMesh |
|
/trunk/src/GLGraphics/draw.cpp
/trunk/src/GLGraphics/draw.h
/trunk/src/HMesh/FaceCirculator.h
|
| 324 |
6688 d 2 h |
jab |
/trunk/src/ |
Some changes. Mostly a nasty precision issue has been fixed with regard
to 4x4 determinants. KDTrees have also been improved. |
|
/trunk/src/CGLA/ArithSqMat4x4Float.cpp
/trunk/src/CGLA/Vec2ui.h
/trunk/src/GLGraphics/draw.cpp
/trunk/src/Geometry/BBox.cpp
/trunk/src/Geometry/BoundingINode.h
/trunk/src/Geometry/BoundingLNode.h
/trunk/src/Geometry/BoundingNode.h
/trunk/src/Geometry/BoundingTree.cpp
/trunk/src/Geometry/KDTree.h
/trunk/src/Geometry/Ray.h
|
| 321 |
6695 d 16 h |
jab |
/trunk/ |
No log message. |
|
/trunk/Makefile
/trunk/src/CGLA/Vec3i.cpp
/trunk/src/GLGraphics/draw.cpp
/trunk/src/Geometry/BoundingINode.cpp
/trunk/src/Geometry/BoundingLNode.cpp
/trunk/src/Geometry/BoundingNode.cpp
/trunk/src/Geometry/BoundingTree.cpp
/trunk/src/HMesh/obj_load.cpp
|
| 299 |
6775 d 1 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
|
| 178 |
7146 d 22 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
|
| 167 |
7160 d 21 h |
jab |
/branches/restructuring/src/GLGraphics/ |
Added draw functions |
|
/branches/restructuring/src/GLGraphics/draw.cpp
/branches/restructuring/src/GLGraphics/draw.h
|