| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 635 |
4329 d 15 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
|
| 634 |
4361 d 11 h |
janba |
/branches/cpp11-devel/src/CGLA/ |
More compat stuff |
|
/branches/cpp11-devel/src/CGLA/ArithVec.h
|
| 633 |
4361 d 11 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 |
4365 d 16 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 |
4368 d 12 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 |
4368 d 12 h |
janba |
/branches/cpp11-devel/ |
Add branch for c++11 development |
|
/branches/cpp11-devel
|
| 600 |
4614 d 10 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
|
| 597 |
4615 d 15 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
|
| 593 |
4615 d 16 h |
jab |
/branches/ctl/hmesh_vector/ |
Minor changes. An extra constructor for Vec3i and a function for creating a face in Manifold |
|
/branches/ctl/hmesh_vector/GEL.xcodeproj/project.pbxproj
/branches/ctl/hmesh_vector/src/CGLA/Vec3i.cpp
/branches/ctl/hmesh_vector/src/CGLA/Vec3i.h
/branches/ctl/hmesh_vector/src/HMesh/Manifold.cpp
/branches/ctl/hmesh_vector/src/HMesh/Manifold.h
|
| 592 |
4617 d 4 h |
jab |
/branches/ctl/hmesh_vector/makefiles/ |
A Darwin 64 bit makefile. Does not work quite yet. |
|
/branches/ctl/hmesh_vector/makefiles/Darwin_x86_64_cc.mk
|
| 591 |
4617 d 4 h |
jab |
/branches/ctl/hmesh_vector/ |
Various changes to clean up mostly |
|
/branches/ctl/hmesh_vector/TODO.txt
/branches/ctl/hmesh_vector/src/GLGraphics/test_SOIL.cpp
/branches/ctl/hmesh_vector/doc/intro.tex
/branches/ctl/hmesh_vector/makefiles/findcompiler.sh
/branches/ctl/hmesh_vector/src/Geometry/QEM.cpp
/branches/ctl/hmesh_vector/src/HMesh/curvature.cpp
/branches/ctl/hmesh_vector/src/Util/ArgExtracter.h
|
| 590 |
4617 d 5 h |
jab |
/branches/ctl/hmesh_vector/makefiles/ |
Old build stuff |
|
/branches/ctl/hmesh_vector/makefiles/MPC
|
| 589 |
4621 d 11 h |
jab |
/branches/ctl/hmesh_vector/src/HMesh/ |
After much deliberation, I changed it back so that ConnectivityKernel is now contained in Manifold - not an ancestor. |
|
/branches/ctl/hmesh_vector/src/HMesh/ConnectivityKernel.h
/branches/ctl/hmesh_vector/src/HMesh/ItemID.h
/branches/ctl/hmesh_vector/src/HMesh/Manifold.cpp
/branches/ctl/hmesh_vector/src/HMesh/Manifold.h
|
| 588 |
4621 d 15 h |
jab |
/branches/ctl/hmesh_vector/ |
In a rather structural change, Manifold now inherits from ConnectivityKernel as opposed to containing it. What this means is that we now see the connectivityKernel as an abstract manifold. Methods for directly adding and removing vertices are protected and thus the user cannot see them. However, in a big change, the functions next, prev, opp, last, vert, which map mesh entities to other mesh entities (referenced by ID) are now exposed. This means that the Walker is no longer the sole means of getting to things in the mesh. I think this is an advantage, but I am not positive. Need to reflect before merging back into trunk. |
|
/branches/ctl/hmesh_vector/GEL.xcodeproj/project.pbxproj
/branches/ctl/hmesh_vector/src/HMesh/ConnectivityKernel.cpp
/branches/ctl/hmesh_vector/src/HMesh/ConnectivityKernel.h
/branches/ctl/hmesh_vector/src/HMesh/Iterators.h
/branches/ctl/hmesh_vector/src/HMesh/Manifold.cpp
/branches/ctl/hmesh_vector/src/HMesh/Manifold.h
|
| 587 |
4622 d 15 h |
jab |
/branches/ctl/hmesh_vector/ |
A number of changes. Importantly
Vertex positions in Manifold are now stored as Vec3d
HalfEdgeWalker has been renamed Walker |
|
/branches/ctl/hmesh_vector/src/HMesh/Walker.h
/branches/ctl/hmesh_vector/src/HMesh/HalfEdgeWalker.h
/branches/ctl/hmesh_vector/GEL.xcodeproj/project.pbxproj
/branches/ctl/hmesh_vector/apps/MeshDistance/meshdist.cpp
/branches/ctl/hmesh_vector/apps/MeshEdit/VisObj.cpp
/branches/ctl/hmesh_vector/apps/MeshEdit/VisObj.h
/branches/ctl/hmesh_vector/apps/MeshEdit/harmonics.cpp
/branches/ctl/hmesh_vector/apps/MeshEdit/meshedit.cpp
/branches/ctl/hmesh_vector/apps/MeshEdit/polarize.cpp
/branches/ctl/hmesh_vector/doc/intro.tex
/branches/ctl/hmesh_vector/src/GLGraphics/IDBufferWireFrameRenderer.cpp
/branches/ctl/hmesh_vector/src/GLGraphics/ManifoldRenderer.cpp
/branches/ctl/hmesh_vector/src/GLGraphics/draw.cpp
/branches/ctl/hmesh_vector/src/Geometry/build_bbtree.cpp
/branches/ctl/hmesh_vector/src/HMesh/AttributeVector.h
/branches/ctl/hmesh_vector/src/HMesh/ItemID.h
/branches/ctl/hmesh_vector/src/HMesh/ItemVector.h
/branches/ctl/hmesh_vector/src/HMesh/Manifold.cpp
/branches/ctl/hmesh_vector/src/HMesh/Manifold.h
/branches/ctl/hmesh_vector/src/HMesh/caps_and_needles.cpp
/branches/ctl/hmesh_vector/src/HMesh/curvature.cpp
/branches/ctl/hmesh_vector/src/HMesh/dual.cpp
/branches/ctl/hmesh_vector/src/HMesh/flatten.cpp
/branches/ctl/hmesh_vector/src/HMesh/mesh_optimization.cpp
/branches/ctl/hmesh_vector/src/HMesh/obj_save.cpp
/branches/ctl/hmesh_vector/src/HMesh/off_save.cpp
/branches/ctl/hmesh_vector/src/HMesh/quadric_simplify.cpp
/branches/ctl/hmesh_vector/src/HMesh/refine_edges.cpp
/branches/ctl/hmesh_vector/src/HMesh/smooth.cpp
/branches/ctl/hmesh_vector/src/HMesh/subdivision.cpp
/branches/ctl/hmesh_vector/src/HMesh/triangulate.cpp
/branches/ctl/hmesh_vector/src/HMesh/x3d_save.cpp
|
| 586 |
4623 d 3 h |
jab |
/branches/ctl/hmesh_vector/ |
Numerous changes. In particular, I changed the ItemID, ItemVector, and ConnectivityKernel in HMesh. This was done to make interfaces more clear.
Now ItemVector knows ItemIDs and conversion from ItemID to the actual integer ids happens in the ItemVector class and not connectivity kernel. |
|
/branches/ctl/hmesh_vector/GEL.xcodeproj/project.pbxproj
/branches/ctl/hmesh_vector/apps/MeshDistance/meshdist.cpp
/branches/ctl/hmesh_vector/apps/MeshEdit/VisObj.cpp
/branches/ctl/hmesh_vector/apps/MeshEdit/harmonics.cpp
/branches/ctl/hmesh_vector/apps/MeshEdit/meshedit.cpp
/branches/ctl/hmesh_vector/apps/MeshEdit/polarize.cpp
/branches/ctl/hmesh_vector/src/GLGraphics/Console.cpp
/branches/ctl/hmesh_vector/src/GLGraphics/IDBufferWireFrameRenderer.cpp
/branches/ctl/hmesh_vector/src/HMesh/ConnectivityKernel.h
/branches/ctl/hmesh_vector/src/HMesh/ItemID.h
/branches/ctl/hmesh_vector/src/HMesh/ItemVector.h
/branches/ctl/hmesh_vector/src/HMesh/Manifold.cpp
/branches/ctl/hmesh_vector/src/HMesh/Manifold.h
/branches/ctl/hmesh_vector/src/HMesh/curvature.cpp
/branches/ctl/hmesh_vector/src/HMesh/curvature.h
/branches/ctl/hmesh_vector/src/HMesh/dual.cpp
/branches/ctl/hmesh_vector/src/HMesh/flatten.cpp
/branches/ctl/hmesh_vector/src/HMesh/mesh_optimization.cpp
/branches/ctl/hmesh_vector/src/HMesh/obj_save.cpp
/branches/ctl/hmesh_vector/src/HMesh/off_save.cpp
/branches/ctl/hmesh_vector/src/HMesh/quadric_simplify.cpp
/branches/ctl/hmesh_vector/src/HMesh/refine_edges.cpp
/branches/ctl/hmesh_vector/src/HMesh/smooth.cpp
/branches/ctl/hmesh_vector/src/HMesh/subdivision.cpp
/branches/ctl/hmesh_vector/src/HMesh/triangulate.cpp
/branches/ctl/hmesh_vector/src/HMesh/x3d_save.cpp
|
| 585 |
4624 d 10 h |
jab |
/branches/ctl/hmesh_vector/ |
Committed many small changes. resolved conflicts. This commit merges in trunk. Now to merge back ... |
|
/branches/ctl/hmesh_vector/src/GLGraphics/stb_image.c
/branches/ctl/hmesh_vector/src/GLGraphics/stb_image.h
/branches/ctl/hmesh_vector/src/GLGraphics/stb_image_write.c
/branches/ctl/hmesh_vector/src/GLGraphics/stb_image_write.h
/branches/ctl/hmesh_vector/Win32GetLibs.py
/branches/ctl/hmesh_vector/src/GLGraphics/stb_image_aug.c
/branches/ctl/hmesh_vector
/branches/ctl/hmesh_vector/CMakeLists.txt
/branches/ctl/hmesh_vector/GEL.xcodeproj/project.pbxproj
/branches/ctl/hmesh_vector/apps/MeshEdit/VisObj.h
/branches/ctl/hmesh_vector/apps/OBJViewer/objview.cpp
/branches/ctl/hmesh_vector/src/CGLA/ArithVec.h
/branches/ctl/hmesh_vector/src/CGLA/ArithVec3Float.cpp
/branches/ctl/hmesh_vector/src/CGLA/ArithVec3Float.h
/branches/ctl/hmesh_vector/src/CGLA/BitMask.h
/branches/ctl/hmesh_vector/src/CGLA/Mat3x3d.h
/branches/ctl/hmesh_vector/src/CGLA/Mat3x3f.cpp
/branches/ctl/hmesh_vector/src/CGLA/Mat3x3f.h
/branches/ctl/hmesh_vector/src/CGLA/Mat4x4d.h
/branches/ctl/hmesh_vector/src/CGLA/Mat4x4f.cpp
/branches/ctl/hmesh_vector/src/CGLA/Mat4x4f.h
/branches/ctl/hmesh_vector/src/CGLA/Quatd.h
/branches/ctl/hmesh_vector/src/CGLA/Quatf.h
/branches/ctl/hmesh_vector/src/CGLA/Vec4d.h
/branches/ctl/hmesh_vector/src/CGLA/Vec4f.h
/branches/ctl/hmesh_vector/src/CGLA/statistics.cpp
/branches/ctl/hmesh_vector/src/GLGraphics/CMakeLists.txt
/branches/ctl/hmesh_vector/src/GLGraphics/SOIL.c
/branches/ctl/hmesh_vector/src/GLGraphics/draw.cpp
/branches/ctl/hmesh_vector/src/GLGraphics/draw.h
/branches/ctl/hmesh_vector/src/GLGraphics/gel_glut.h
/branches/ctl/hmesh_vector/src/GLGraphics/glsl_shader.cpp
/branches/ctl/hmesh_vector/src/GLGraphics/glsl_shader.h
/branches/ctl/hmesh_vector/src/Geometry/BSPTree.cpp
/branches/ctl/hmesh_vector/src/Geometry/BoundingLNode.h
/branches/ctl/hmesh_vector/src/Geometry/CMakeLists.txt
/branches/ctl/hmesh_vector/src/Geometry/Polygonizer.cpp
/branches/ctl/hmesh_vector/src/Geometry/Ray.h
/branches/ctl/hmesh_vector/src/Geometry/TriMesh.cpp
/branches/ctl/hmesh_vector/src/Geometry/TriMesh.h
/branches/ctl/hmesh_vector/src/Geometry/load.h
/branches/ctl/hmesh_vector/src/Geometry/obj_load.cpp
/branches/ctl/hmesh_vector/src/Geometry/obj_load.h
/branches/ctl/hmesh_vector/src/Geometry/ply_load.cpp
/branches/ctl/hmesh_vector/src/Geometry/rply.c
/branches/ctl/hmesh_vector/src/Geometry/tessellate.cpp
/branches/ctl/hmesh_vector/src/HMesh/ItemID.h
/branches/ctl/hmesh_vector/src/HMesh/Manifold.cpp
/branches/ctl/hmesh_vector/src/HMesh/Manifold.h
/branches/ctl/hmesh_vector/src/HMesh/caps_and_needles.cpp
/branches/ctl/hmesh_vector/src/HMesh/caps_and_needles.h
/branches/ctl/hmesh_vector/src/HMesh/close_holes.h
/branches/ctl/hmesh_vector/src/HMesh/curvature.cpp
/branches/ctl/hmesh_vector/src/HMesh/mesh_optimization.cpp
/branches/ctl/hmesh_vector/src/HMesh/obj_save.h
/branches/ctl/hmesh_vector/src/HMesh/off_load.h
/branches/ctl/hmesh_vector/src/HMesh/ply_load.h
/branches/ctl/hmesh_vector/src/HMesh/quadric_simplify.cpp
/branches/ctl/hmesh_vector/src/HMesh/quadric_simplify.h
/branches/ctl/hmesh_vector/src/HMesh/refine_edges.cpp
/branches/ctl/hmesh_vector/src/HMesh/refine_edges.h
/branches/ctl/hmesh_vector/src/HMesh/smooth.cpp
/branches/ctl/hmesh_vector/src/HMesh/smooth.h
/branches/ctl/hmesh_vector/src/HMesh/subdivision.h
/branches/ctl/hmesh_vector/src/HMesh/triangulate.cpp
/branches/ctl/hmesh_vector/src/Util/XmlParser.cpp
/branches/ctl/hmesh_vector/src/Util/string_utils.h
|
| 584 |
4627 d 17 h |
jab |
/branches/ctl/hmesh_vector/ |
Number of minor changes |
|
/branches/ctl/hmesh_vector/MeshEdit
/branches/ctl/hmesh_vector/MeshEdit/AppDelegate.h
/branches/ctl/hmesh_vector/MeshEdit/AppDelegate.m
/branches/ctl/hmesh_vector/MeshEdit/MeshEdit-Info.plist
/branches/ctl/hmesh_vector/MeshEdit/MeshEdit-Prefix.pch
/branches/ctl/hmesh_vector/MeshEdit/armadillo-very-simple.obj
/branches/ctl/hmesh_vector/MeshEdit/bunny.icns
/branches/ctl/hmesh_vector/MeshEdit/bunny.obj
/branches/ctl/hmesh_vector/MeshEdit/bunny.png
/branches/ctl/hmesh_vector/MeshEdit/cube.obj
/branches/ctl/hmesh_vector/MeshEdit/deformdisc.x3d
/branches/ctl/hmesh_vector/MeshEdit/en.lproj
/branches/ctl/hmesh_vector/MeshEdit/en.lproj/Credits.rtf
/branches/ctl/hmesh_vector/MeshEdit/en.lproj/InfoPlist.strings
/branches/ctl/hmesh_vector/MeshEdit/en.lproj/MainMenu.xib
/branches/ctl/hmesh_vector/MeshEdit/torus.obj
/branches/ctl/hmesh_vector/GEL.xcodeproj/project.pbxproj
/branches/ctl/hmesh_vector/apps/MeshEdit/meshedit.cpp
/branches/ctl/hmesh_vector/src/GLGraphics/IDBufferWireFrameRenderer.cpp
/branches/ctl/hmesh_vector/src/GLGraphics/ManifoldRenderer.cpp
/branches/ctl/hmesh_vector/src/Geometry/Ray.h
/branches/ctl/hmesh_vector/src/Geometry/ply_load.cpp
/branches/ctl/hmesh_vector/src/Geometry/ply_load.h
/branches/ctl/hmesh_vector/src/HMesh/load.cpp
/branches/ctl/hmesh_vector/src/HMesh/obj_load.cpp
/branches/ctl/hmesh_vector/src/HMesh/off_load.cpp
/branches/ctl/hmesh_vector/src/HMesh/ply_load.cpp
/branches/ctl/hmesh_vector/src/HMesh/x3d_load.cpp
|
| 583 |
4635 d 7 h |
jab |
/branches/ctl/hmesh_vector/ |
now c++ 11ish |
|
/branches/ctl/hmesh_vector/GEL.xcodeproj/project.pbxproj
/branches/ctl/hmesh_vector/apps/MeshEdit/meshedit.cpp
|
| 582 |
4656 d 13 h |
awk |
/branches/ctl/hmesh_vector/ |
Uncommented some stuff in CMakeLists.txt.. BloomenthalP.. Boundarycollapse, decimator, etc doesn't exist anymore.
Added some glPushAttribs to Console.cpp, so that gl state is the same before and after calls to display. |
|
/branches/ctl/hmesh_vector/CMakeLists.txt
/branches/ctl/hmesh_vector/src/GLGraphics/Console.cpp
|