| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 691 |
3749 d 1 h |
jerf |
/trunk/src/GLGraphics/ |
needed to compile with VS2013 |
|
/trunk/src/GLGraphics/Console.cpp
|
| 629 |
4442 d 6 h |
asny |
/trunk/src/GLGraphics/ |
Made it possible to save images in ONG format when using SOIL |
|
/trunk/src/GLGraphics/SOIL.c
/trunk/src/GLGraphics/SOIL.h
|
| 628 |
4469 d 7 h |
mono |
/trunk/src/GLGraphics/ |
allow images where width is multiple of 1 (default is 4) |
|
/trunk/src/GLGraphics/SOIL.c
|
| 627 |
4493 d 1 h |
jerf |
/trunk/src/GLGraphics/ |
killing unnecessary stb header file |
|
/trunk/src/GLGraphics/stb_image_aug.h
/trunk/src/GLGraphics/Console.cpp
|
| 626 |
4508 d 7 h |
awkr |
/trunk/src/GLGraphics/ |
Added missing include. |
|
/trunk/src/GLGraphics/Console.h
|
| 623 |
4554 d 11 h |
jerf |
/trunk/src/GLGraphics/ |
adding a function to GLViewController which sets up the camera using the usual input parameters |
|
/trunk/src/GLGraphics/GLViewController.cpp
/trunk/src/GLGraphics/GLViewController.h
/trunk/src/GLGraphics/QuatTrackBall.cpp
|
| 618 |
4609 d 9 h |
jab |
/trunk/ |
Some changes to make curvature visualization work |
|
/trunk/GEL.xcodeproj/project.pbxproj
/trunk/README
/trunk/apps/MeshEdit/VisObj.cpp
/trunk/apps/MeshEdit/VisObj.h
/trunk/apps/MeshEdit/meshedit.cpp
/trunk/src/GLGraphics/ManifoldRenderer.cpp
|
| 614 |
4610 d 10 h |
jab |
/trunk/ |
Fixed a problem with global variables in harmonics.cpp causing meshedit to crash on exit. |
|
/trunk/apps/MeshEdit/VisObj.h
/trunk/apps/MeshEdit/harmonics.cpp
/trunk/apps/MeshEdit/harmonics.h
/trunk/apps/MeshEdit/meshedit.cpp
/trunk/src/GLGraphics/ManifoldRenderer.cpp
|
| 609 |
4610 d 14 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
|
| 608 |
4612 d 22 h |
jrf |
/trunk/src/GLGraphics/ |
ensuring compatibility with code based on pre-merge trunk version |
|
/trunk/src/GLGraphics/draw.cpp
|
| 607 |
4612 d 22 h |
jrf |
/trunk/ |
removing Visual Studio warnings and some CMake problems |
|
/trunk/CMakeLists.txt
/trunk/apps/MeshEdit/meshedit.cpp
/trunk/apps/MeshEdit/polarize.cpp
/trunk/src/GLGraphics/ManifoldRenderer.cpp
/trunk/src/Geometry/tessellate.cpp
/trunk/src/HMesh/cleanup.cpp
/trunk/src/HMesh/curvature.cpp
/trunk/src/HMesh/mesh_optimization.cpp
/trunk/src/HMesh/triangulate.cpp
|
| 603 |
4617 d 8 h |
jab |
/trunk/ |
Made it work with cmake |
|
/trunk/src/GL/glxew.h
/trunk/src/GL/wglew.h
/trunk/CMakeLists.txt
/trunk/GELFindGlut.cmake
/trunk/src/GL/glew.h
/trunk/src/GLGraphics/SOIL.c
/trunk/src/GLGraphics/gel_gl.h
/trunk/src/GLGraphics/gel_glu.h
/trunk/src/GLGraphics/gel_glut.h
|
| 601 |
4619 d 1 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
|
| 600 |
4621 d 8 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
|
| 598 |
4622 d 13 h |
jrf |
/trunk/src/ |
Bug: CMake unable to generate project. Fix: Removing deleted source files from CMake lists. |
|
/trunk/src/GLGraphics/CMakeLists.txt
/trunk/src/HMesh/CMakeLists.txt
|
| 597 |
4622 d 14 h |
jab |
/ |
Some console stuff was not up to the right version |
|
/trunk/src/GLGraphics/stb_image_aug.h
/branches/ctl/hmesh_vector/GEL.xcodeproj/project.pbxproj
/trunk/src/GLGraphics/Console.cpp
/trunk/src/GLGraphics/Console.h
|
| 594 |
4622 d 14 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
|
| 563 |
4918 d 10 h |
awk |
/trunk/ |
|
|
/trunk/src/GLGraphics/Console.cpp
/trunk/src/GLGraphics/Console.h
/trunk/test/GLGraphics-console/console_test.cpp
|
| 561 |
4935 d 5 h |
awk |
/trunk/ |
Added GLGraphics::Console, a Quake-style console.
Added test application for console (test/GLGraphics-console).
Fixed Vec3f operator>>. The following now works:
CGLA::Vec3f in(0,1,2);
std::stringstream ss;
ss << in;
CGLA::Vec3f out;
ss >> out;
assert(in == out);
Didn't test any other VecXX types or Matrix types.. They might be broken.
Misc:
Fixed CMake Policy CMP0005 error.
Missing #include <iterator> in Manifold.cpp.
Disable ExportBuildSettings (deprecated in CMake) |
|
/trunk/src/GLGraphics/Console.cpp
/trunk/src/GLGraphics/Console.h
/trunk/test/GLGraphics-console
/trunk/test/GLGraphics-console/CMakeLists.txt
/trunk/test/GLGraphics-console/console_test.cpp
/trunk/CMakeLists.txt
/trunk/src/CGLA/ArithVec.h
/trunk/src/GLGraphics/CMakeLists.txt
/trunk/src/HMesh/Manifold.cpp
|
| 555 |
5019 d 11 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
|