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

# Conflicts:
#	include/igl/triangle_triangle_adjacency.h

tutorial/106_ViewerMenu/main.cpp

@@ -3,7 +3,7 @@
 int main()
 {
   std::cerr<<
-    "Error: recompile with IGL_VIEWER_WITH_NANOGUI defined."<<std::endl;
+    "Error: recompile with LIBIGL_VIEWER_WITH_NANOGUI defined."<<std::endl;
   return EXIT_FAILURE;
 }
 #else
@@ -15,14 +15,15 @@ int main()
 #include <iostream>
 #include "tutorial_shared_path.h"
 
-Eigen::MatrixXd V;
-Eigen::MatrixXi F;
-
-bool boolVariable = true;
-float floatVariable = 0.1f;
-
 int main(int argc, char *argv[])
 {
+  Eigen::MatrixXd V;
+  Eigen::MatrixXi F;
+
+  bool boolVariable = true;
+  float floatVariable = 0.1f;
+  enum Orientation { Up=0,Down,Left,Right } dir = Up;
+
   // Load a mesh in OFF format
   igl::readOFF(TUTORIAL_SHARED_PATH "/bunny.off", V, F);
 
@@ -45,10 +46,13 @@ int main(int argc, char *argv[])
       return boolVariable; // get
     });
 
+    // Expose an enumaration type
+    viewer.ngui->addVariable<Orientation>("Direction",dir)->setItems({"Up","Down","Left","Right"});
+
     // Add a button
     viewer.ngui->addButton("Print Hello",[](){ std::cout << "Hello\n"; });
 
-    // Add an additional bar
+    // Add an additional menu window
     viewer.ngui->addWindow(Eigen::Vector2i(220,10),"New Window");
 
     // Expose the same variable directly ...