| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 653 |
4218 d 1 h |
janba |
/branches/cpp11-devel/ |
A few changes to the apps since GEL (the library) is now unaware of GLUT. |
|
/branches/cpp11-devel/GEL.xcodeproj/project.pbxproj
/branches/cpp11-devel/apps/OBJViewer/objviewer.cpp
/branches/cpp11-devel/apps/Pathtracer/pathtracer.cpp
/branches/cpp11-devel/apps/Raytracer/Camera.h
/branches/cpp11-devel/apps/Raytracer/raytrace.cpp
/branches/cpp11-devel/data/dolphins.obj
|
| 630 |
4357 d 16 h |
janba |
/branches/cpp11-devel/ |
Add branch for c++11 development |
|
/branches/cpp11-devel
|
| 625 |
4491 d 5 h |
jerf |
/trunk/apps/OBJViewer/ |
Adding a keyboard switch for turning hardware antialiasing on/off in the OBJViewer. |
|
/trunk/apps/OBJViewer/objview.cpp
|
| 609 |
4592 d 20 h |
jab |
/trunk/ |
I have added some patches to make cmake work for Unix Makefiles on Mac.
The old Makefile system has been removed.
Slight change to XCode project
Minor changes |
|
/trunk/Makefile
/trunk/apps/MeshDistance/Makefile
/trunk/apps/OBJViewer/Makefile
/trunk/apps/Pathtracer/Makefile
/trunk/apps/Raytracer/Makefile
/trunk/makefiles
/trunk/src/CGLA/Makefile
/trunk/src/GLGraphics/Makefile
/trunk/src/Geometry/Makefile
/trunk/src/HMesh/Makefile
/trunk/src/LinAlg/Makefile
/trunk/src/Util/Makefile
/trunk/test/CGLA-covariance/Makefile
/trunk/test/CGLA-mat/Makefile
/trunk/test/CGLA-ogl/Makefile
/trunk/test/CGLA-simple/Makefile
/trunk/test/CGLA-vec/Makefile
/trunk/test/Geometry-kdtree/Makefile
/trunk/test/LinAlg-eigensolver/Makefile
/trunk/test/LinAlg-leastsq/Makefile
/trunk/test/Util-resman/Makefile
/trunk/CMakeLists.txt
/trunk/GEL.xcodeproj/project.pbxproj
/trunk/src/GLGraphics/QuatTrackBall.cpp
/trunk/src/Geometry/AABox.cpp
/trunk/src/Geometry/Polygonizer.cpp
/trunk/src/Geometry/Polygonizer.h
/trunk/src/Geometry/Ray.h
/trunk/src/Geometry/rply.c
/trunk/src/Util/HashKey.cpp
/trunk/src/Util/XmlParser.cpp
/trunk/src/Util/XmlParser.h
|
| 600 |
4603 d 14 h |
jab |
/ |
Build system. I have both edited the bespoke Xcode project file, played with a premake4 build generator and our cmake system. Nothing works perfectly, but cmake might end up as the best solution. The cmake file now automatically finds the GEL files, but this entails that cmake is run when a new file is added.
Functions were added to Manifold: remove_face, remove_edge, remove_vertex. These do as advertised. I also added an add_face function (not tested but very simple ... hmmm famous last words)
the cpp/h file pairs close_holes and caps_and_needles were merged into "cleanup". To cleanup I added some functions that stitch meshes together, i.e. edges which share geometric end points are stitched. |
|
/trunk/premake4.lua
/trunk/src/HMesh/cleanup.cpp
/trunk/src/HMesh/cleanup.h
/trunk/src/CGLA/CMakeLists.txt
/trunk/src/GLGraphics/CMakeLists.txt
/trunk/src/Geometry/CMakeLists.txt
/trunk/src/HMesh/CMakeLists.txt
/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/LinAlg/CMakeLists.txt
/trunk/src/Util/CMakeLists.txt
/branches/ctl/hmesh_vector/GEL.xcodeproj/project.pbxproj
/trunk/CMakeLists.txt
/trunk/apps/MeshDistance/CMakeLists.txt
/trunk/apps/MeshEdit/CMakeLists.txt
/trunk/apps/MeshEdit/meshedit.cpp
/trunk/apps/OBJViewer/CMakeLists.txt
/trunk/apps/OBJViewer/objview.cpp
/trunk/apps/Pathtracer/CMakeLists.txt
/trunk/apps/RangeScanViewer/CMakeLists.txt
/trunk/apps/Raytracer/CMakeLists.txt
/trunk/src/HMesh/Manifold.cpp
/trunk/src/HMesh/Manifold.h
/trunk/test/CGLA-covariance/CMakeLists.txt
/trunk/test/CGLA-mat/CMakeLists.txt
/trunk/test/CGLA-ogl/CMakeLists.txt
/trunk/test/CGLA-simple/CMakeLists.txt
/trunk/test/CGLA-vec/CMakeLists.txt
/trunk/test/GLGraphics-console/CMakeLists.txt
/trunk/test/Geometry-kdtree/CMakeLists.txt
/trunk/test/LinAlg-eigensolver/CMakeLists.txt
/trunk/test/LinAlg-leastsq/CMakeLists.txt
/trunk/test/Util-resman/CMakeLists.txt
|
| 596 |
4604 d 20 h |
jab |
/trunk/ |
merging |
|
/trunk/GELDependencyConfig.cmake
/trunk/MeshEdit
/trunk/apps/MeshEdit/polarize.cpp
/trunk/apps/MeshEdit/polarize.h
/trunk/apps/OBJViewer/objviewer.cpp
/trunk/data/Armadillo.ply
/trunk/data/bunny.obj
/trunk/doc/halfedge-entities.pdf
/trunk/makefiles/Darwin_x86_64_cc.mk
/trunk/GELFindGlconsole.cmake
/trunk/GELFindLapack.cmake
/trunk/apps/BloomenthalPolygonize
/trunk/apps/BoundaryCollapse
/trunk/apps/Decimator
/trunk/apps/MeshEdit/Renderer.cpp
/trunk/apps/MeshEdit/Renderer.h
/trunk/apps/MeshEdit/curvature.cpp
/trunk/apps/MeshEdit/curvature.h
/trunk/apps/VolumePolygonize
/trunk/makefiles/MPC
/trunk
/trunk/CMakeLists.txt
/trunk/GEL.xcodeproj/jab.pbxuser
/trunk/GEL.xcodeproj/project.pbxproj
/trunk/README
/trunk/README_MSVC
/trunk/apps/MeshDistance/CMakeLists.txt
/trunk/apps/MeshDistance/meshdist.cpp
/trunk/apps/MeshEdit/CMakeLists.txt
/trunk/apps/MeshEdit/VisObj.cpp
/trunk/apps/MeshEdit/VisObj.h
/trunk/apps/MeshEdit/harmonics.cpp
/trunk/apps/MeshEdit/harmonics.h
/trunk/apps/MeshEdit/meshedit.cpp
/trunk/apps/OBJViewer/CMakeLists.txt
/trunk/apps/OBJViewer/objview.cpp
/trunk/apps/Pathtracer/CMakeLists.txt
/trunk/apps/RangeScanViewer/CMakeLists.txt
/trunk/apps/RangeScanViewer/rsview.cpp
/trunk/apps/Raytracer/CMakeLists.txt
/trunk/apps/Raytracer/raytrace.cpp
/trunk/data/bunny-little.x3d
/trunk/doc/intro.tex
/trunk/makefiles/findcompiler.sh
/trunk/test-bundle-Info.plist
/trunk/test/CGLA-covariance/covariance_test.cpp
/trunk/test/CGLA-ogl/CMakeLists.txt
|
| 555 |
5001 d 17 h |
jrf |
/trunk/ |
Update of the stb image library used by SOIL such that it can now also write png. I haven't yet extended the SOIL API, so call stbi_write_png(...) to use the new functionality. |
|
/trunk/src/GLGraphics/stb_image.c
/trunk/src/GLGraphics/stb_image.h
/trunk/src/GLGraphics/stb_image_write.c
/trunk/src/GLGraphics/stb_image_write.h
/trunk/src/GLGraphics/stb_image_aug.c
/trunk/src/GLGraphics/stb_image_aug.h
/trunk/apps/OBJViewer/objview.cpp
/trunk/src/GLGraphics/CMakeLists.txt
/trunk/src/GLGraphics/SOIL.c
/trunk/src/GLGraphics/stbi_DDS_aug.h
|
| 492 |
5599 d 16 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
|
| 442 |
5888 d 16 h |
jab |
/trunk/apps/OBJViewer/ |
Loading of textures is now longer part of OBJViewer since image loading has been included in GEL via SOIL |
|
/trunk/apps/OBJViewer/objview.cpp
|
| 407 |
6053 d 15 h |
jab |
/trunk/apps/OBJViewer/ |
Some files were moved and I have updated CMakeLists.txt |
|
/trunk/apps/OBJViewer/CMakeLists.txt
|
| 398 |
6072 d 14 h |
jab |
/trunk/apps/OBJViewer/ |
Wireframe drawing is now handled in GLGraphics |
|
/trunk/apps/OBJViewer/wireframe.cpp
/trunk/apps/OBJViewer/wireframe.h
/trunk/apps/OBJViewer/objview.cpp
|
| 385 |
6095 d 13 h |
jab |
/trunk/ |
CMakefiles included.
Note that exceptions were removed from Geometry/Polygonize.cpp since it did not play nice with visual studio 2005. An improved solution is needed so that the program does not just abort. |
|
/trunk/CMakeLists.txt
/trunk/GELConfig.cmake.in
/trunk/GELFindGlew.cmake
/trunk/GELFindGlut.cmake
/trunk/GELFindLapack.cmake
/trunk/GELUse.cmake
/trunk/apps/BloomenthalPolygonize/CMakeLists.txt
/trunk/apps/BoundaryCollapse/CMakeLists.txt
/trunk/apps/Decimator/CMakeLists.txt
/trunk/apps/MeshDistance/CMakeLists.txt
/trunk/apps/OBJViewer/CMakeLists.txt
/trunk/apps/Pathtracer/CMakeLists.txt
/trunk/apps/RangeScanViewer/CMakeLists.txt
/trunk/apps/Raytracer/CMakeLists.txt
/trunk/apps/VolumePolygonize/CMakeLists.txt
/trunk/src/CGLA/CMakeLists.txt
/trunk/src/GLGraphics/CMakeLists.txt
/trunk/src/Geometry/CMakeLists.txt
/trunk/src/HMesh/CMakeLists.txt
/trunk/src/LinAlg/CMakeLists.txt
/trunk/src/Util/CMakeLists.txt
/trunk/test/CGLA-covariance/CMakeLists.txt
/trunk/test/CGLA-mat/CMakeLists.txt
/trunk/test/CGLA-ogl/CMakeLists.txt
/trunk/test/CGLA-simple/CMakeLists.txt
/trunk/test/CGLA-vec/CMakeLists.txt
/trunk/test/Geometry-kdtree/CMakeLists.txt
/trunk/test/LinAlg-eigensolver/CMakeLists.txt
/trunk/test/LinAlg-leastsq/CMakeLists.txt
/trunk/test/Util-resman/CMakeLists.txt
/trunk/apps/BoundaryCollapse/boundary_collapse.cpp
/trunk/src/Geometry/Polygonizer.cpp
|
| 382 |
6101 d 18 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 |
6114 d 15 h |
jrf |
/trunk/apps/OBJViewer/ |
reinserting texture toggle on/off |
|
/trunk/apps/OBJViewer/objview.cpp
|
| 373 |
6114 d 16 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
|
| 370 |
6114 d 19 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 |
6116 d 14 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 |
6206 d 18 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 |
6252 d 13 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
|
| 361 |
6371 d 7 h |
jab |
/trunk/apps/OBJViewer/ |
Added my shader loader functions to the GEL OBJViewer applications |
|
/trunk/apps/OBJViewer/glsl_shader.cpp
|