Subversion Repositories gelsvn

Rev

Go to most recent revision | Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
595 4598 d 12 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 4598 d 12 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 4702 d 0 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 4747 d 22 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 4853 d 20 h jrf /trunk/src/Geometry/ adding area information to TriMesh  
/trunk/src/Geometry/TriMesh.cpp
/trunk/src/Geometry/TriMesh.h
563 4894 d 8 h awk /trunk/  
/trunk/src/GLGraphics/Console.cpp
/trunk/src/GLGraphics/Console.h
/trunk/test/GLGraphics-console/console_test.cpp
561 4911 d 3 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 4995 d 9 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
554 5089 d 12 h jrf /trunk/src/Geometry/ Ray::reset() has been updated to include reset of more recently added ray properties.  
/trunk/src/Geometry/Ray.h
541 5280 d 23 h jrf /trunk/src/Geometry/ Using references instead of copying vectors when not necessary. And fixing some iterator code in the BSPTree that doesn't work in VS2010.  
/trunk/src/Geometry/BSPTree.cpp
/trunk/src/Geometry/Ray.h
/trunk/src/Geometry/TriMesh.cpp
540 5285 d 22 h jrf /trunk/src/Util/ Undoing an unnecessary part of the previous bug fix.  
/trunk/src/Util/XmlParser.cpp
539 5290 d 21 h jrf /trunk/src/Util/ Bug fix: Inserting a check for empty string in XmlParser.  
/trunk/src/Util/XmlParser.cpp
521 5375 d 4 h s042372 /trunk/src/HMesh/ minor bugfixes  
/trunk/src/HMesh/off_save.cpp
/trunk/src/HMesh/quadric_simplify.cpp
510 5467 d 0 h jrf /trunk/src/ Enabling load of wavefront .mtl files without an associated object, and correcting the Material class slightly (ior instead of ior_in and ior_out).  
/trunk/src/Geometry/BoundingLNode.h
/trunk/src/Geometry/Material.h
/trunk/src/Geometry/Ray.h
/trunk/src/Geometry/obj_load.cpp
/trunk/src/Geometry/obj_load.h
/trunk/src/Util/string_utils.h
503 5556 d 9 h jrf /trunk/src/GLGraphics/ correction in comment  
/trunk/src/GLGraphics/glsl_shader.cpp
502 5556 d 9 h jrf /trunk/src/GLGraphics/ GLSL shader update: Deleting shaders before returning 0 and printing filenames of loaded shaders when there is a compiler problem.  
/trunk/src/GLGraphics/glsl_shader.cpp
/trunk/src/GLGraphics/glsl_shader.h
501 5567 d 21 h jrf /trunk/src/CGLA/ Adding .0 to doubles and .0f to floats.  
/trunk/src/CGLA/Mat3x3d.h
/trunk/src/CGLA/Mat3x3f.cpp
/trunk/src/CGLA/Mat3x3f.h
/trunk/src/CGLA/Mat4x4d.h
/trunk/src/CGLA/Mat4x4f.cpp
/trunk/src/CGLA/Mat4x4f.h
/trunk/src/CGLA/Quatd.h
/trunk/src/CGLA/Quatf.h
/trunk/src/CGLA/Vec4d.h
/trunk/src/CGLA/Vec4f.h
/trunk/src/CGLA/eigensolution.cpp
492 5593 d 8 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
463 5691 d 8 h jab /trunk/src/CGLA/ Ooops. Previously, there was no 4D integer vector.  
/trunk/src/CGLA/Vec4i.h
462 5691 d 8 h jab /trunk/src/CGLA/ Ooops. Previously, there was no 4D integer vector.  
/trunk/src/CGLA/ArithVec4Int.h

Show All