| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 662 |
4128 d 15 h |
janba |
/branches/cpp11-devel/src/ |
A bunch of changes to support PAM |
|
/branches/cpp11-devel/src/GLGraphics/ManifoldRenderer.cpp
/branches/cpp11-devel/src/GLGraphics/ManifoldRenderer.h
/branches/cpp11-devel/src/GLGraphics/MeshEditor.cpp
/branches/cpp11-devel/src/GLGraphics/MeshEditor.h
/branches/cpp11-devel/src/GLGraphics/VisObj.cpp
/branches/cpp11-devel/src/GLGraphics/VisObj.h
/branches/cpp11-devel/src/HMesh/ItemID.h
/branches/cpp11-devel/src/HMesh/Manifold.cpp
/branches/cpp11-devel/src/HMesh/curvature.cpp
/branches/cpp11-devel/src/HMesh/curvature.h
/branches/cpp11-devel/src/HMesh/harmonics.cpp
/branches/cpp11-devel/src/HMesh/harmonics.h
/branches/cpp11-devel/src/HMesh/obj_load.cpp
/branches/cpp11-devel/src/HMesh/obj_save.cpp
/branches/cpp11-devel/src/HMesh/smooth.cpp
|
| 658 |
4212 d 0 h |
janba |
/branches/cpp11-devel/src/HMesh/ |
I can now cut holes |
|
/branches/cpp11-devel/src/HMesh/Manifold.cpp
|
| 657 |
4212 d 4 h |
janba |
/branches/cpp11-devel/ |
Added mesh deformation with the mouse and vertex selection. |
|
/branches/cpp11-devel/apps/MeshEditCocoa/Base.lproj
/branches/cpp11-devel/GEL.xcodeproj/project.pbxproj
/branches/cpp11-devel/apps/MeshEditCocoa/BasicOpenGLView.mm
/branches/cpp11-devel/src/GLGraphics/IDBufferWireFrameRenderer.cpp
/branches/cpp11-devel/src/GLGraphics/ManifoldRenderer.cpp
/branches/cpp11-devel/src/GLGraphics/MeshEditor.cpp
/branches/cpp11-devel/src/GLGraphics/MeshEditor.h
/branches/cpp11-devel/src/GLGraphics/VisObj.cpp
/branches/cpp11-devel/src/GLGraphics/VisObj.h
/branches/cpp11-devel/src/GLGraphics/draw.cpp
/branches/cpp11-devel/src/GLGraphics/draw.h
/branches/cpp11-devel/src/HMesh/Manifold.cpp
/branches/cpp11-devel/src/HMesh/Manifold.h
/branches/cpp11-devel/src/HMesh/smooth.cpp
|
| 652 |
4219 d 17 h |
janba |
/branches/cpp11-devel/src/HMesh/ |
Added volume polygonization |
|
/branches/cpp11-devel/src/HMesh/polygonize.cpp
/branches/cpp11-devel/src/HMesh/polygonize.h
/branches/cpp11-devel/src/HMesh/curvature.cpp
/branches/cpp11-devel/src/HMesh/mesh_optimization.cpp
/branches/cpp11-devel/src/HMesh/mesh_optimization.h
/branches/cpp11-devel/src/HMesh/obj_load.cpp
/branches/cpp11-devel/src/HMesh/smooth.cpp
/branches/cpp11-devel/src/HMesh/smooth.h
|
| 649 |
4223 d 18 h |
janba |
/branches/cpp11-devel/ |
Fixed some header paths |
|
/branches/cpp11-devel/MeshEdit
/branches/cpp11-devel/MeshEdit/AppDelegate.h
/branches/cpp11-devel/MeshEdit/AppDelegate.m
/branches/cpp11-devel/MeshEdit/Base.lproj
/branches/cpp11-devel/MeshEdit/BasicOpenGLView.h
/branches/cpp11-devel/MeshEdit/BasicOpenGLView.mm
/branches/cpp11-devel/MeshEdit/Images.xcassets
/branches/cpp11-devel/MeshEdit/Images.xcassets/AppIcon.appiconset
/branches/cpp11-devel/MeshEdit/Images.xcassets/AppIcon.appiconset/Contents.json
/branches/cpp11-devel/MeshEdit/MainMenu.xib
/branches/cpp11-devel/MeshEdit/MeshEdit-Info.plist
/branches/cpp11-devel/MeshEdit/MeshEdit-Prefix.pch
/branches/cpp11-devel/MeshEdit/bunny.icns
/branches/cpp11-devel/MeshEdit/en.lproj
/branches/cpp11-devel/MeshEdit/main.m
/branches/cpp11-devel/MeshEditTests
/branches/cpp11-devel/MeshEditTests/MeshEditTests-Info.plist
/branches/cpp11-devel/MeshEditTests/MeshEditTests.m
/branches/cpp11-devel/MeshEditTests/en.lproj
/branches/cpp11-devel/MeshEditTests/en.lproj/InfoPlist.strings
/branches/cpp11-devel/GEL.xcodeproj/project.pbxproj
/branches/cpp11-devel/src/GLGraphics/MeshEditor.h
/branches/cpp11-devel/src/GLGraphics/VisObj.h
/branches/cpp11-devel/src/GLGraphics/gel_gl.h
/branches/cpp11-devel/src/HMesh/harmonics.h
|
| 646 |
4226 d 3 h |
janba |
/branches/cpp11-devel/src/HMesh/ |
Many changes. In particular Harmonis moved here from the meshedit application |
|
/branches/cpp11-devel/src/HMesh/harmonics.cpp
/branches/cpp11-devel/src/HMesh/harmonics.h
/branches/cpp11-devel/src/HMesh/Manifold.cpp
/branches/cpp11-devel/src/HMesh/Manifold.h
/branches/cpp11-devel/src/HMesh/curvature.cpp
/branches/cpp11-devel/src/HMesh/curvature.h
/branches/cpp11-devel/src/HMesh/smooth.cpp
/branches/cpp11-devel/src/HMesh/smooth.h
|
| 643 |
4247 d 18 h |
janba |
/branches/cpp11-devel/ |
Polarization really works, but fitting to mesh not so much. Committing current version with voxel based fitting to reference mesh |
|
/branches/cpp11-devel/GEL.xcodeproj/project.pbxproj
/branches/cpp11-devel/apps/MeshDistance/meshdist.cpp
/branches/cpp11-devel/apps/MeshEdit/VisObj.cpp
/branches/cpp11-devel/apps/MeshEdit/VisObj.h
/branches/cpp11-devel/apps/MeshEdit/meshedit.cpp
/branches/cpp11-devel/apps/MeshEdit/polarize.cpp
/branches/cpp11-devel/apps/MeshEdit/polarize.h
/branches/cpp11-devel/apps/Raytracer/raytrace.cpp
/branches/cpp11-devel/src/GLGraphics/ManifoldRenderer.cpp
/branches/cpp11-devel/src/HMesh/Manifold.cpp
/branches/cpp11-devel/src/HMesh/dual.cpp
/branches/cpp11-devel/src/HMesh/smooth.cpp
|
| 638 |
4269 d 5 h |
khor |
/branches/cpp11-devel/ |
Works on visual studio now, test needed in clang and gcc
Thinks changesed
(std::min)
typcasting of warlker
class initilazation |
|
/branches/cpp11-devel/apps/MeshEdit/VisObj.h
/branches/cpp11-devel/apps/Raytracer/raytrace.cpp
/branches/cpp11-devel/src/GLGraphics/GLViewController.cpp
/branches/cpp11-devel/src/GLGraphics/GLViewController.h
/branches/cpp11-devel/src/GLGraphics/SimpleTrackBall.h
/branches/cpp11-devel/src/HMesh/smooth.cpp
|
| 637 |
4270 d 3 h |
janba |
/branches/cpp11-devel/ |
only simple changes. |
|
/branches/cpp11-devel/doc/intro.pdf
/branches/cpp11-devel/src/GLGraphics/SimpleTrackBall.h
/branches/cpp11-devel/src/HMesh/AttributeVector.h
/branches/cpp11-devel/src/HMesh/smooth.cpp
|
| 636 |
4270 d 8 h |
khor |
/branches/cpp11-devel/ |
Works on visual studio, need to be tested if clang is busted.
Doc is now updated to c++11, still need to remove iterator in some of the flit example
(std::min)() and (std::max)() is need for it to work. |
|
/branches/cpp11-devel/doc/intro.pdf
/branches/cpp11-devel/doc/intro.tex
/branches/cpp11-devel/src/CGLA/ArithVec.h
/branches/cpp11-devel/src/CGLA/ArithVecFloat.h
/branches/cpp11-devel/src/GLGraphics/SimpleTrackBall.h
/branches/cpp11-devel/src/HMesh/AttributeVector.h
/branches/cpp11-devel/src/HMesh/Manifold.cpp
/branches/cpp11-devel/src/HMesh/Manifold.h
/branches/cpp11-devel/src/HMesh/mesh_optimization.h
/branches/cpp11-devel/src/HMesh/smooth.cpp
/branches/cpp11-devel/src/HMesh/x3d_load.cpp
/branches/cpp11-devel/src/LinAlg/LapackFunc.h
/branches/cpp11-devel/src/LinAlg/LinAlgIO.h
|
| 635 |
4320 d 12 h |
janba |
/branches/cpp11-devel/ |
Save stuff |
|
/branches/cpp11-devel/apps/MeshEdit/VisObj.h
/branches/cpp11-devel/doc/intro.tex
/branches/cpp11-devel/src/GLGraphics/ManifoldRenderer.cpp
/branches/cpp11-devel/src/HMesh/smooth.cpp
|
| 633 |
4352 d 8 h |
janba |
/branches/cpp11-devel/ |
Some compatibility changes |
|
/branches/cpp11-devel/doc/intro.tex
/branches/cpp11-devel/src/CGLA/ArithVec.h
/branches/cpp11-devel/src/GLGraphics/QuatTrackBall.h
/branches/cpp11-devel/src/HMesh/Manifold.cpp
/branches/cpp11-devel/src/HMesh/Manifold.h
/branches/cpp11-devel/src/HMesh/smooth.cpp
|
| 632 |
4356 d 13 h |
janba |
/branches/cpp11-devel/ |
Had fun rewriting ArithVec.h |
|
/branches/cpp11-devel/apps/Pathtracer/core.h
/branches/cpp11-devel/apps/Pathtracer/pathtracer.cpp
/branches/cpp11-devel/src/CGLA/ArithMatFloat.h
/branches/cpp11-devel/src/CGLA/ArithVec.h
/branches/cpp11-devel/src/CGLA/CGLA.h
/branches/cpp11-devel/src/CGLA/eigensolution.cpp
/branches/cpp11-devel/src/GLGraphics/SimpleTrackBall.h
/branches/cpp11-devel/src/Geometry/save_raw.h
/branches/cpp11-devel/src/HMesh/curvature.cpp
/branches/cpp11-devel/src/HMesh/mesh_optimization.cpp
/branches/cpp11-devel/src/HMesh/mesh_optimization.h
/branches/cpp11-devel/src/HMesh/quadric_simplify.cpp
/branches/cpp11-devel/src/HMesh/smooth.cpp
/branches/cpp11-devel/src/HMesh/x3d_load.cpp
|
| 631 |
4359 d 8 h |
janba |
/branches/cpp11-devel/ |
Many C++11 features added to this branch |
|
/branches/cpp11-devel/src/Geometry/geo_load.cpp
/branches/cpp11-devel/src/Geometry/geo_obj_load.cpp
/branches/cpp11-devel/src/Geometry/rply_load.cpp
/branches/cpp11-devel/src/Geometry/load.cpp
/branches/cpp11-devel/src/Geometry/obj_load.cpp
/branches/cpp11-devel/src/Geometry/ply_load.cpp
/branches/cpp11-devel/GEL.xcodeproj/project.pbxproj
/branches/cpp11-devel/apps/MeshDistance/meshdist.cpp
/branches/cpp11-devel/apps/MeshEdit/VisObj.cpp
/branches/cpp11-devel/apps/MeshEdit/meshedit.cpp
/branches/cpp11-devel/apps/MeshEdit/polarize.cpp
/branches/cpp11-devel/apps/MeshEdit/polarize.h
/branches/cpp11-devel/src/GLGraphics/ManifoldRenderer.cpp
/branches/cpp11-devel/src/GLGraphics/ManifoldRenderer.h
/branches/cpp11-devel/src/HMesh/AttributeVector.h
/branches/cpp11-devel/src/HMesh/Iterators.h
/branches/cpp11-devel/src/HMesh/Manifold.cpp
/branches/cpp11-devel/src/HMesh/Manifold.h
/branches/cpp11-devel/src/HMesh/Walker.h
/branches/cpp11-devel/src/HMesh/curvature.cpp
/branches/cpp11-devel/src/HMesh/flatten.cpp
/branches/cpp11-devel/src/HMesh/quadric_simplify.cpp
/branches/cpp11-devel/src/HMesh/refine_edges.cpp
/branches/cpp11-devel/src/HMesh/smooth.cpp
/branches/cpp11-devel/src/HMesh/smooth.h
/branches/cpp11-devel/src/HMesh/subdivision.cpp
/branches/cpp11-devel/src/HMesh/subdivision.h
|
| 630 |
4359 d 8 h |
janba |
/branches/cpp11-devel/ |
Add branch for c++11 development |
|
/branches/cpp11-devel
|
| 609 |
4594 d 12 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
|
| 607 |
4596 d 21 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
|
| 605 |
4600 d 8 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 |
4602 d 23 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 |
4605 d 6 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
|