Merge commit '6ee24a177494f4c45cc40841f385f15060ed26a2 [formerly 4c60ab3bbdb125c7b9c0853b400760c435a85d7c]'

Former-commit-id: c1588368018d61e93ebc4d6a0a0ae91f58428ef2

include/igl/colon.cpp

@@ -43,7 +43,7 @@ IGL_INLINE void igl::colon(
     }
   }
   // resize output
-  int n = floor(double((hi-low)/step))+1;
+  int n = std::floor(double((hi-low)/step))+1;
   I.resize(n);
   int i = 0;
   T v = (T)low;

include/igl/viewer/Viewer.cpp

@@ -7,6 +7,7 @@
 #endif
 
 #ifndef __APPLE__
+#  define GLEW_STATIC
 #  include <GL/glew.h>
 #endif
 

tutorial/CMakeLists.txt

@@ -29,13 +29,13 @@ add_subdirectory("305_QuadraticProgramming")
 add_subdirectory("501_HarmonicParam")
 add_subdirectory("502_LSCMParam")
 add_subdirectory("503_ARAPParam")
-add_subdirectory("504_NRosyDesign")
-add_subdirectory("505_MIQ")
-add_subdirectory("506_FrameField")
+#add_subdirectory("504_NRosyDesign")
+#add_subdirectory("505_MIQ")
+#add_subdirectory("506_FrameField")
 
 # Chapter 6
 add_subdirectory("601_Serialization")
-add_subdirectory("602_Matlab")
+#add_subdirectory("602_Matlab")
 add_subdirectory("604_Triangle")
 add_subdirectory("605_Tetgen")
 add_subdirectory("606_AmbientOcclusion")

tutorial/cmake/FindEMBREE.cmake

@@ -13,14 +13,14 @@ FIND_PATH(EMBREE_INCLUDE_DIR embree/include/embree.h
 		NO_DEFAULT_PATH
     )
 
-SET(SEARCH_PATHS "${EMBREE_INCLUDE_DIR}" "${EMBREE_INCLUDE_DIR}/build")
+SET(SEARCH_PATHS "${EMBREE_INCLUDE_DIR}" "${EMBREE_INCLUDE_DIR}/build" "${EMBREE_INCLUDE_DIR}/lib")
 
-FIND_LIBRARY(EMBREE_CORE_LIBRARY  NAMES libembree.a PATHS ${SEARCH_PATHS})
-FIND_LIBRARY(EMBREE_CORE_LIBRARY2 NAMES libdevice.a PATHS ${SEARCH_PATHS})
-FIND_LIBRARY(EMBREE_CORE_LIBRARY3 NAMES libimage.a PATHS ${SEARCH_PATHS})
-FIND_LIBRARY(EMBREE_CORE_LIBRARY4 NAMES liblexers.a PATHS ${SEARCH_PATHS})
-FIND_LIBRARY(EMBREE_CORE_LIBRARY5 NAMES libloaders.a PATHS ${SEARCH_PATHS})
-FIND_LIBRARY(EMBREE_CORE_LIBRARY6 NAMES libsys.a PATHS ${SEARCH_PATHS})
+FIND_LIBRARY(EMBREE_CORE_LIBRARY  NAMES embree PATHS ${SEARCH_PATHS} PATH_SUFFIXES a lib)
+FIND_LIBRARY(EMBREE_CORE_LIBRARY2 NAMES device PATHS ${SEARCH_PATHS} PATH_SUFFIXES a lib)
+FIND_LIBRARY(EMBREE_CORE_LIBRARY3 NAMES image PATHS ${SEARCH_PATHS} PATH_SUFFIXES a lib)
+FIND_LIBRARY(EMBREE_CORE_LIBRARY4 NAMES lexers PATHS ${SEARCH_PATHS} PATH_SUFFIXES a lib)
+#FIND_LIBRARY(EMBREE_CORE_LIBRARY5 NAMES loaders PATHS ${SEARCH_PATHS} PATH_SUFFIXES a lib)
+FIND_LIBRARY(EMBREE_CORE_LIBRARY6 NAMES sys PATHS ${SEARCH_PATHS} PATH_SUFFIXES a lib)
 
 if(EMBREE_CORE_LIBRARY AND EMBREE_INCLUDE_DIR)
 set(EMBREE_FOUND TRUE)
@@ -34,7 +34,7 @@ IF (EMBREE_FOUND)
    "${EMBREE_CORE_LIBRARY2}"
    "${EMBREE_CORE_LIBRARY3}"
    "${EMBREE_CORE_LIBRARY4}"
-   "${EMBREE_CORE_LIBRARY5}"
+   #"${EMBREE_CORE_LIBRARY5}"
    "${EMBREE_CORE_LIBRARY6}"
    )
    SET(EMBREE_INCLUDE_DIRS ${EMBREE_INCLUDE_DIR} ${EMBREE_INCLUDE_DIR}/embree)

tutorial/cmake/FindTRIANGLE.cmake

@@ -5,6 +5,10 @@
 #  TRIANGLE_INCLUDE_DIR - the TRIANGLE include directory
 #  TRIANGLE_SOURCES - the TRIANGLE source files
 
+IF (WIN32)
+   add_definitions(-DNO_TIMER)
+ENDIF (WIN32)
+
 FIND_PATH(TRIANGLE_INCLUDE_DIR triangle.h
    /usr/include
    /usr/local/include