Преглед изворни кода

Merge branch 'master' of github.com:libigl/libigl

Former-commit-id: 53cecc34d77c1a346bd477ff9e7bd1dbbb081d30
Alec Jacobson пре 11 година
родитељ
комит
c36a46797e
4 измењених фајлова са 8 додато и 5 уклоњено
  1. 2 3
      README.md
  2. 1 1
      examples/patches/temp.rbr
  3. 4 0
      include/igl/Camera.h
  4. 1 1
      include/igl/pathinfo.h

+ 2 - 3
README.md

@@ -111,10 +111,9 @@ To build the tetgen library and executable on Mac OS X issue:
     cd external/tetgen
     make clean
     rm -f obj/*.o
-    make -f Makefile.igl tetlib
-    rm -f obj/*.o
-    rm tetgen
     make -f Makefile.igl tetgen
+    rm -f obj/*.o
+    make -f Makefile.igl tetlib
 
 ##### Installing medit #####
 To build the igl version of the medit executable on Mac OS X issue:

+ 1 - 1
examples/patches/temp.rbr

@@ -1,4 +1,4 @@
-camera_rotation: TW_TYPE_QUAT4D -0.174598206033656 0.778057756210189 0.215373556063922 0.563698346457904
+camera_rotation: TW_TYPE_QUAT4D 0.221720768269005 -0.655276665457443 -0.211493904735977 0.690451099560792
 center_type: CenterType orbit
 wireframe_visible: TW_TYPE_BOOLCPP 0
 fill_visible: TW_TYPE_BOOLCPP 1

+ 4 - 0
include/igl/Camera.h

@@ -138,6 +138,10 @@ namespace igl
         const Eigen::Vector3d & eye,
         const Eigen::Vector3d & at,
         const Eigen::Vector3d & up);
+    // Needed any time Eigen Structures are used as class members
+    // http://eigen.tuxfamily.org/dox-devel/group__TopicStructHavingEigenMembers.html
+    public:
+        EIGEN_MAKE_ALIGNED_OPERATOR_NEW
   };
 }
 

+ 1 - 1
include/igl/pathinfo.h

@@ -27,7 +27,7 @@ namespace igl
   //  dirname  string containing dirname (see dirname.h)
   //  basename  string containing basename (see basename.h)
   //  extension  string containing extension (characters after last '.')
-  //  filename  string containing extension (characters of basename before last
+  //  filename  string containing filename (characters of basename before last
   //    '.')
   //
   //  See also: basename, dirname