Browse Source

be sure to link quicklook against compiled static GLU

Former-commit-id: ab6fc97fd8f3bf8bca49cc469e1522f69c88e2e7
Alec Jacobson (jalec 11 years ago
parent
commit
10ba90de62

+ 4 - 4
examples/patches/temp.rbr

@@ -1,6 +1,6 @@
-wireframe_visible: TW_TYPE_BOOLCPP 1
+wireframe_visible: TW_TYPE_BOOLCPP 0
 fill_visible: TW_TYPE_BOOLCPP 1
-camera_rotation: TW_TYPE_QUAT4D 0.0807446 0.213478 0.0177076 0.973444
-rotation_type: RotationType two axis fixed up
-orient_method: OrientMethod ambient occlusion
+camera_rotation: TW_TYPE_QUAT4D 0.0143118 -0.420487 0.907043 0.0161202
+rotation_type: RotationType igl trackball
+orient_method: OrientMethod outward
 

+ 2 - 1
examples/quicklook-mesh/Makefile

@@ -16,7 +16,8 @@ LIBIGL_INC=-I $(LIBIGL)/include
 # http://www.alecjacobson.com/weblog/?p=2827
 GLU=/usr/local/
 GLU_INC=-I$(GLU)/include
-GLU_LIB=-L$(GLU)/lib -lGLU
+#GLU_LIB=-L$(GLU)/lib -lGLU
+GLU_LIB=$(GLU)/lib/libGLU.a
 
 MESA=/opt/local/
 MESA_INC=-I$(MESA)/include

+ 7 - 1
examples/quicklook-mesh/README

@@ -22,4 +22,10 @@ Install Mesa3D using macports.
 
     sudo port install mesa
 
-Then re-install mesa's GLU à la http://www.alecjacobson.com/weblog/?p=2827
+Then re-install GLU à la http://www.alecjacobson.com/weblog/?p=2827
+
+= Note about Mesa =
+
+If things look weird (too far away, blank, etc.) then maybe you should
+reinstall GLU. It seems that the version of GLU that comes with macports' mesa
+is buggy/corrupted.

+ 2 - 2
include/igl/embree/orient_outward_ao.cpp

@@ -134,7 +134,7 @@ IGL_INLINE void igl::orient_outward_ao(
   
   cout << "shooting rays... ";
 #pragma omp parallel for
-  for (int i = 0; i < ray_face.size(); ++i)
+  for (int i = 0; i < (int)ray_face.size(); ++i)
   {
     int      f = ray_face[i];
     Vector3d o = ray_ori [i];
@@ -184,5 +184,5 @@ IGL_INLINE void igl::orient_outward_ao(
 
 #ifndef IGL_HEADER_ONLY
 // Explicit template specialization
-template void igl::orient_outward_ao<Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1> >(Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, int, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&);
+template void igl::orient_outward_ao<Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1> >(Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, int, int, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&);
 #endif