Browse Source

fix in cmake file for glew
new tutorial example for plotting colors


Former-commit-id: 0ba527487c7ea787da85e0e65adda6b73ea2b328

Daniele Panozzo 11 years ago
parent
commit
0aaef7e68f

+ 0 - 14
tutorial/100_FileIO/cube.obj

@@ -1,14 +0,0 @@
-v 1 0 1
-v 0 1 1
-v -1 0 1
-v 0 -1 1
-v 1 0 -1
-v 0 1 -1
-v -1 0 -1
-v 0 -1 -1
-f 1 2 3
-f 8 5 1
-f 5 6 2
-f 6 7 3
-f 4 3 7
-f 7 6 5

+ 1 - 1
tutorial/100_FileIO/main.cpp

@@ -9,7 +9,7 @@ Eigen::MatrixXi F;
 int main(int argc, char *argv[])
 {
   // Load a mesh in OFF format
-  igl::readOFF("cube.off", V, F);
+  igl::readOFF("../shared/cube.off", V, F);
 
   // Plot the vertices and faces matrices
   std::cerr << "Vertices: " << std::endl << V << std::endl;

+ 0 - 1
tutorial/102_DrawMesh/bunny.off.REMOVED.git-id

@@ -1 +0,0 @@
-a9f6cb63faaebfecf28f1fe317cc9a3e0ee9b0de

+ 1 - 1
tutorial/102_DrawMesh/main.cpp

@@ -8,7 +8,7 @@ Eigen::MatrixXi F;
 int main(int argc, char *argv[])
 {
   // Load a mesh in OFF format
-  igl::readOFF("bunny.off", V, F);
+  igl::readOFF("../shared/bunny.off", V, F);
 
   // Plot the mesh
   igl::Viewer viewer;

+ 2 - 2
tutorial/103_Events/main.cpp

@@ -30,8 +30,8 @@ bool key_down(igl::Viewer& viewer, unsigned char key, int modifier)
 int main(int argc, char *argv[])
 {
   // Load two meshes
-  igl::readOFF("bumpy.off", V1, F1);
-  igl::readOFF("fertility.off", V2, F2);
+  igl::readOFF("../shared/bumpy.off", V1, F1);
+  igl::readOFF("../shared/fertility.off", V2, F2);
 
   igl::Viewer viewer;
   // Register a keyboard callback that allows to switch between

+ 0 - 1
tutorial/104_Overlays/bunny.off.REMOVED.git-id

@@ -1 +0,0 @@
-a9f6cb63faaebfecf28f1fe317cc9a3e0ee9b0de

+ 2 - 2
tutorial/104_Overlays/main.cpp

@@ -9,7 +9,7 @@ Eigen::MatrixXi F;
 int main(int argc, char *argv[])
 {
   // Load a mesh in OFF format
-  igl::readOFF("bunny.off", V, F);
+  igl::readOFF("../shared/bunny.off", V, F);
 
   // Find the bounding box
   Eigen::Vector3d m = V.colwise().minCoeff();
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
   std::stringstream l2;
   l2 << M(0) << ", " << M(1) << ", " << M(2);
   viewer.draw_label(M,l2.str());
-  
+
   // Launch the viewer
   viewer.launch();
 }

+ 11 - 0
tutorial/105_Colors/CMakeLists.txt

@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 2.6)
+project(105_Colors)
+
+include("../CMakeLists.shared")
+
+set(SOURCES
+${PROJECT_SOURCE_DIR}/main.cpp
+)
+
+add_executable(105_Colors ${SOURCES} ${SHARED_SOURCES})
+target_link_libraries(105_Colors ${SHARED_LIBRARIES})

+ 37 - 0
tutorial/105_Colors/main.cpp

@@ -0,0 +1,37 @@
+#define IGL_HEADER_ONLY
+#include <igl/readOFF.h>
+#include <igl/viewer/Viewer.h>
+#include <igl/jet.h>
+
+Eigen::MatrixXd V;
+Eigen::MatrixXi F;
+
+int main(int argc, char *argv[])
+{
+  // Load a mesh in OFF format
+  igl::readOFF("../shared/screwdriver.off", V, F);
+
+  // Plot the mesh
+  igl::Viewer viewer;
+  viewer.draw_mesh(V, F);
+
+
+  // Normalize x coordinate between 0 and 1
+  Eigen::VectorXd value = V.col(0).array() - V.col(0).minCoeff();
+  value = value.array() / value.maxCoeff();
+
+  // Map to colors using jet colorramp
+  Eigen::MatrixXd C(V.rows(),3);
+  for (unsigned i=0; i<V.rows(); ++i)
+  {
+    double r,g,b;
+    igl::jet(value(i),r,g,b);
+    C.row(i) << r,g,b;
+  }
+
+  // Add per-vertex colors
+  viewer.draw_colors(C);
+
+  // Launch the viewer
+  viewer.launch();
+}

+ 3 - 14
tutorial/cmake/FindGLEW.cmake

@@ -3,11 +3,7 @@
 #
 #  GLEW_FOUND - system has GLEW
 #  GLEW_INCLUDE_DIR - the GLEW include directory
-#  GLEW_LIBRARIES - The libraries needed to use GLEW
-
-if(GLEW_INCLUDE_DIR AND GLEW_LIBRARIES)
-   set(GLEW_FOUND TRUE)
-else(GLEW_INCLUDE_DIR AND GLEW_LIBRARIES)
+#  GLEW_SOURCES - the GLEW source file list
 
 FIND_PATH(GLEW_INCLUDE_DIR GL/glew.h
    ${PROJECT_SOURCE_DIR}/../../external/glew/include
@@ -25,18 +21,11 @@ if(GLEW_INCLUDE_DIR)
    set(GLEW_FOUND TRUE)
 endif(GLEW_INCLUDE_DIR)
 
-
 if(GLEW_FOUND)
   set(GLEW_SOURCES ${GLEW_INCLUDE_DIR}/../src/glew.c)
-   if(NOT GLEW_FIND_QUIETLY)
-      message(STATUS "Found GLEW: ${GLEW_LIBRARIES}")
-   endif(NOT GLEW_FIND_QUIETLY)
+  message(STATUS "Found GLEW: ${GLEW_INCLUDE_DIR}")
 else(GLEW_FOUND)
-   if(GLEW_FIND_REQUIRED)
-      message(FATAL_ERROR "could NOT find glew")
-   endif(GLEW_FIND_REQUIRED)
+  message(FATAL_ERROR "could NOT find glew")
 endif(GLEW_FOUND)
 
 MARK_AS_ADVANCED(GLEW_INCLUDE_DIR)
-
-endif(GLEW_INCLUDE_DIR)

+ 0 - 0
tutorial/103_Events/bumpy.off → tutorial/shared/bumpy.off


+ 0 - 0
tutorial/100_FileIO/bunny.off.REMOVED.git-id → tutorial/shared/bunny.off.REMOVED.git-id


+ 0 - 0
tutorial/100_FileIO/cube.off → tutorial/shared/cube.off


+ 0 - 0
tutorial/103_Events/fertility.off.REMOVED.git-id → tutorial/shared/fertility.off.REMOVED.git-id


+ 1 - 0
tutorial/shared/screwdriver.off.REMOVED.git-id

@@ -0,0 +1 @@
+ae29a221ba0744eee76d2bb697226eb86bcdf563