| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 609 |
4610 d 2 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 10 h |
jrf |
/trunk/src/GLGraphics/ |
ensuring compatibility with code based on pre-merge trunk version |
|
/trunk/src/GLGraphics/draw.cpp
|
| 607 |
4612 d 10 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
|
| 606 |
4612 d 10 h |
jrf |
/trunk/src/Geometry/ |
ensuring compatibility with code based on pre-merge trunk version |
|
/trunk/src/Geometry/Material.h
/trunk/src/Geometry/obj_load.cpp
|
| 605 |
4615 d 21 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
|
| 604 |
4616 d 16 h |
jab |
/trunk/GEL.xcodeproj/ |
The GEL XCode project has been made more streamlined. |
|
/trunk/GEL.xcodeproj/project.pbxproj
|
| 603 |
4616 d 19 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
|
| 602 |
4617 d 1 h |
jab |
/trunk/ |
Removed the stale app rangescanviewer. Several changes to the XCode project which now compiles a proper framework for GEL and also compiles all test apps. |
|
/trunk/apps/RangeScanViewer
/trunk/GEL.xcodeproj/project.pbxproj
|
| 601 |
4618 d 13 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 |
4620 d 20 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
|
| 599 |
4621 d 13 h |
jab |
/trunk/src/ |
adding glew and a change for compatibility to ItemVector |
|
/trunk/src/GL
/trunk/src/GL/glew.c
/trunk/src/GL/glew.h
/trunk/src/HMesh/ItemVector.h
|
| 598 |
4622 d 0 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 1 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
|
| 596 |
4622 d 2 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
|
| 595 |
4622 d 2 h |
jab |
/trunk/src/ |
Merged version |
|
/trunk/src/HMesh/AttributeVector.h
/trunk/src/HMesh/ConnectivityKernel.cpp
/trunk/src/HMesh/ConnectivityKernel.h
/trunk/src/HMesh/ItemID.h
/trunk/src/HMesh/ItemVector.h
/trunk/src/HMesh/Iterators.h
/trunk/src/HMesh/Walker.h
/trunk/src/HMesh/curvature.cpp
/trunk/src/HMesh/curvature.h
/trunk/src/HMesh/dual.cpp
/trunk/src/HMesh/dual.h
/trunk/src/HMesh/flatten.cpp
/trunk/src/HMesh/flatten.h
/trunk/src/HMesh/Face.cpp
/trunk/src/HMesh/Face.h
/trunk/src/HMesh/FaceCirculator.h
/trunk/src/HMesh/HalfEdge.cpp
/trunk/src/HMesh/HalfEdge.h
/trunk/src/HMesh/Vertex.cpp
/trunk/src/HMesh/Vertex.h
/trunk/src/HMesh/VertexCirculator.h
/trunk/src/HMesh/build_manifold.cpp
/trunk/src/HMesh/build_manifold.h
/trunk/src/HMesh/templates.h
/trunk/src/HMesh/triangulate_face_order.cpp
/trunk/src/HMesh/volume_polygonize.cpp
/trunk/src/HMesh/volume_polygonize.h
/trunk/src/CGLA/ArithMatFloat.h
/trunk/src/CGLA/ArithQuat.h
/trunk/src/CGLA/ArithSqMat2x2Float.h
/trunk/src/CGLA/ArithSqMat3x3Float.cpp
/trunk/src/CGLA/ArithSqMat3x3Float.h
/trunk/src/CGLA/ArithSqMat4x4Float.cpp
/trunk/src/CGLA/ArithSqMat4x4Float.h
/trunk/src/CGLA/ArithSqMatFloat.h
/trunk/src/CGLA/ArithVec.h
/trunk/src/CGLA/ArithVec2Float.cpp
/trunk/src/CGLA/ArithVec2Float.h
/trunk/src/CGLA/ArithVec3Float.cpp
/trunk/src/CGLA/ArithVec3Float.h
/trunk/src/CGLA/ArithVec3Int.h
/trunk/src/CGLA/ArithVec4Float.h
/trunk/src/CGLA/ArithVec4Int.h
/trunk/src/CGLA/ArithVecFloat.h
/trunk/src/CGLA/ArithVecInt.h
/trunk/src/CGLA/BitMask.h
/trunk/src/CGLA/CGLA.h
/trunk/src/CGLA/CMakeLists.txt
/trunk/src/CGLA/ExceptionStandard.h
/trunk/src/CGLA/Mat2x2d.h
/trunk/src/CGLA/Mat2x2f.h
/trunk/src/CGLA/Mat2x3d.h
/trunk/src/CGLA/Mat2x3f.h
/trunk/src/CGLA/Mat3x3d.cpp
/trunk/src/CGLA/Mat3x3d.h
/trunk/src/CGLA/Mat3x3f.cpp
/trunk/src/CGLA/Mat3x3f.h
/trunk/src/CGLA/Mat4x4d.cpp
/trunk/src/CGLA/Mat4x4d.h
/trunk/src/CGLA/Mat4x4f.cpp
/trunk/src/CGLA/Mat4x4f.h
/trunk/src/CGLA/Quatd.h
/trunk/src/CGLA/Quaternion.h
/trunk/src/CGLA/Quatf.h
/trunk/src/CGLA/TableTrigonometry.cpp
/trunk/src/CGLA/TableTrigonometry.h
/trunk/src/CGLA/UnitVector.h
/trunk/src/CGLA/Vec2d.h
/trunk/src/CGLA/Vec2f.h
/trunk/src/CGLA/Vec2i.cpp
/trunk/src/CGLA/Vec2i.h
/trunk/src/CGLA/Vec2ui.h
/trunk/src/CGLA/Vec3Hf.h
/trunk/src/CGLA/Vec3d.h
/trunk/src/CGLA/Vec3f.cpp
/trunk/src/CGLA/Vec3f.h
/trunk/src/CGLA/Vec3i.cpp
/trunk/src/CGLA/Vec3i.h
/trunk/src/CGLA/Vec3uc.h
/trunk/src/CGLA/Vec3usi.h
/trunk/src/CGLA/Vec4d.h
/trunk/src/CGLA/Vec4f.h
/trunk/src/CGLA/Vec4i.h
/trunk/src/CGLA/Vec4uc.h
/trunk/src/CGLA/eigensolution.cpp
/trunk/src/CGLA/eigensolution.h
/trunk/src/CGLA/gel_rand.cpp
/trunk/src/CGLA/statistics.cpp
/trunk/src/CGLA/statistics.h
/trunk/src/Geometry/AABox.cpp
/trunk/src/Geometry/AABox.h
/trunk/src/Geometry/AncestorGrid.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/CMakeLists.txt
/trunk/src/Geometry/Cell.h
/trunk/src/Geometry/GradientFilter.cpp
/trunk/src/Geometry/GradientFilter.h
/trunk/src/Geometry/GridAlgorithm.h
/trunk/src/Geometry/HGrid.h
/trunk/src/Geometry/IndexedFaceSet.h
/trunk/src/Geometry/KDTree.h
/trunk/src/Geometry/Material.h
/trunk/src/Geometry/Neighbours.cpp
/trunk/src/Geometry/Neighbours.h
/trunk/src/Geometry/OBox.cpp
/trunk/src/Geometry/OBox.h
/trunk/src/Geometry/Polygonizer.cpp
/trunk/src/Geometry/Polygonizer.h
/trunk/src/Geometry/QEM.cpp
/trunk/src/Geometry/QEM.h
/trunk/src/Geometry/RGrid.h
/trunk/src/Geometry/Ray.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.cpp
/trunk/src/Geometry/TrilinFilter.h
/trunk/src/Geometry/build_bbtree.cpp
/trunk/src/Geometry/build_bbtree.h
/trunk/src/Geometry/load.cpp
/trunk/src/Geometry/load.h
/trunk/src/Geometry/load_raw.cpp
/trunk/src/Geometry/load_raw.h
/trunk/src/Geometry/obj_load.cpp
/trunk/src/Geometry/obj_load.h
/trunk/src/Geometry/ply_load.cpp
/trunk/src/Geometry/ply_load.h
/trunk/src/Geometry/rply.c
/trunk/src/Geometry/rply.h
/trunk/src/Geometry/save_raw.h
/trunk/src/Geometry/tessellate.cpp
/trunk/src/Geometry/tessellate.h
/trunk/src/Geometry/verification.cpp
/trunk/src/Geometry/verification.h
/trunk/src/HMesh/CMakeLists.txt
/trunk/src/HMesh/Manifold.cpp
/trunk/src/HMesh/Manifold.h
/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/HMesh/load.cpp
/trunk/src/HMesh/load.h
/trunk/src/HMesh/mesh_optimization.cpp
/trunk/src/HMesh/mesh_optimization.h
/trunk/src/HMesh/obj_load.cpp
/trunk/src/HMesh/obj_load.h
/trunk/src/HMesh/obj_save.cpp
/trunk/src/HMesh/obj_save.h
/trunk/src/HMesh/off_load.cpp
/trunk/src/HMesh/off_load.h
/trunk/src/HMesh/off_save.cpp
/trunk/src/HMesh/off_save.h
/trunk/src/HMesh/ply_load.cpp
/trunk/src/HMesh/ply_load.h
/trunk/src/HMesh/quadric_simplify.cpp
/trunk/src/HMesh/quadric_simplify.h
/trunk/src/HMesh/refine_edges.cpp
/trunk/src/HMesh/refine_edges.h
/trunk/src/HMesh/smooth.cpp
/trunk/src/HMesh/smooth.h
/trunk/src/HMesh/subdivision.cpp
/trunk/src/HMesh/subdivision.h
/trunk/src/HMesh/triangulate.cpp
/trunk/src/HMesh/triangulate.h
/trunk/src/HMesh/x3d_load.cpp
/trunk/src/HMesh/x3d_load.h
/trunk/src/HMesh/x3d_save.cpp
/trunk/src/HMesh/x3d_save.h
/trunk/src/LinAlg/CMakeLists.txt
/trunk/src/LinAlg/LapackFunc.cpp
/trunk/src/LinAlg/LapackFunc.h
/trunk/src/LinAlg/LinAlgIO.cpp
/trunk/src/LinAlg/LinAlgIO.h
/trunk/src/LinAlg/Matrix.h
/trunk/src/LinAlg/Vector.h
/trunk/src/Util/ArgExtracter.h
/trunk/src/Util/CMakeLists.txt
/trunk/src/Util/Grid2D.h
/trunk/src/Util/HashKey.cpp
/trunk/src/Util/HashKey.h
/trunk/src/Util/HashTable.h
/trunk/src/Util/Parse.cpp
/trunk/src/Util/Parse.h
/trunk/src/Util/ResourceManager.h
/trunk/src/Util/Timer.h
/trunk/src/Util/XmlParser.cpp
/trunk/src/Util/XmlParser.h
/trunk/src/Util/string_utils.cpp
/trunk/src/Util/string_utils.h
|
| 594 |
4622 d 2 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
|
| 570 |
4725 d 13 h |
jrf |
/trunk/src/CGLA/ |
Keeping new onb code, but pointing the resulting basis vectors in the same directions as the old function did. |
|
/trunk/src/CGLA/ArithVec3Float.cpp
|
| 569 |
4771 d 12 h |
jrf |
/trunk/src/CGLA/ |
updating orthogonal function and introducing onb function (the new version of orthogonal is significantly faster than the previous one) |
|
/trunk/src/CGLA/ArithVec3Float.cpp
/trunk/src/CGLA/ArithVec3Float.h
|
| 567 |
4877 d 9 h |
jrf |
/trunk/src/Geometry/ |
adding area information to TriMesh |
|
/trunk/src/Geometry/TriMesh.cpp
/trunk/src/Geometry/TriMesh.h
|
| 563 |
4917 d 22 h |
awk |
/trunk/ |
|
|
/trunk/src/GLGraphics/Console.cpp
/trunk/src/GLGraphics/Console.h
/trunk/test/GLGraphics-console/console_test.cpp
|