Home Explore Help
Sign In
3DFaces
/
libigl_Martin
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

anttweakbar as extra

Former-commit-id: fc8191ce01e8fbc3c4d3d68644a177a880b7d002
Alec Jacobson 10 years ago
parent
06abd0cfe5
commit
75a2f963a6
22 changed files with 31 additions and 25 deletions
Split View Show Diff Stats
  1. 2 4
      examples/Makefile.conf
  2. 1 1
      examples/ReAntTweakBar/example.cpp
  3. 1 1
      examples/ambient-occlusion/example.cpp
  4. 1 1
      examples/arap/example.cpp
  5. 1 1
      examples/camera/example.cpp
  6. 1 1
      examples/colored-mesh/example.cpp
  7. 1 1
      examples/components/example.cpp
  8. 1 1
      examples/flare-eyes/example.cpp
  9. 1 1
      examples/intersections/example.cpp
  10. 1 1
      examples/patches/example.cpp
  11. 1 1
      examples/randomly-sample-mesh/example.cpp
  12. 1 1
      examples/rotate-widget/example.cpp
  13. 1 1
      examples/scene-rotation/example.cpp
  14. 1 1
      examples/shadow-mapping/example.cpp
  15. 1 1
      examples/skeleton-builder/example.cpp
  16. 1 1
      examples/skeleton-poser/example.cpp
  17. 1 1
      examples/skeleton/example.cpp
  18. 1 1
      examples/textured-mesh/example.cpp
  19. 1 1
      examples/transparency/example.cpp
  20. 1 1
      include/igl/anttweakbar/ReAntTweakBar.h
  21. 1 1
      include/igl/anttweakbar/cocoa_key_to_anttweakbar_key.h
  22. 9 1
      optional/CMakeLists.txt

+ 2 - 4
examples/Makefile.conf
View File 

@@ -210,9 +210,7 @@ ifndef EIGEN3_INC
 
 	EIGEN3_INC=-I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3/unsupported
 
 endif
 
 
-ifndef LIBIGL
 
-	LIBIGL=$(THIS_DIR)/../
 
-endif
 
+LIBIGL=$(THIS_DIR)/../
 
 LIBIGL_INC=-I$(LIBIGL)/include
 
 
 ifndef ANTTWEAKBAR_INC
 
@@ -220,7 +218,7 @@ ifndef ANTTWEAKBAR_INC
 
 endif
 
 ifndef ANTTWEAKBAR_LIB
 
 	# AntTweakBar needs AppKit on mac os x
 
-	ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
 
+	ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit -liglanttweakbar
 
 endif
 
 
 ifndef SINGULAR_VALUE_DECOMPOSITION_INC

+ 1 - 1
examples/ReAntTweakBar/example.cpp
View File 

@@ -31,7 +31,7 @@
 
 //  ---------------------------------------------------------------------------
 
 
 
-#include <igl/ReAntTweakBar.h>
 
+#include <igl/anttweakbar/ReAntTweakBar.h>
 
 using namespace igl;
 
 
 #include <stdlib.h>

+ 1 - 1
examples/ambient-occlusion/example.cpp
View File 

@@ -17,7 +17,7 @@
 
 #include <igl/material_colors.h>
 
 #include <igl/barycenter.h>
 
 #include <igl/matlab_format.h>
 
-#include <igl/ReAntTweakBar.h>
 
+#include <igl/anttweakbar/ReAntTweakBar.h>
 
 #include <igl/pathinfo.h>
 
 #include <igl/embree/EmbreeIntersector.h>
 
 #include <igl/embree/ambient_occlusion.h>

+ 1 - 1
examples/arap/example.cpp
View File 

@@ -28,7 +28,7 @@
 
 #include <igl/material_colors.h>
 
 #include <igl/barycenter.h>
 
 #include <igl/matlab_format.h>
 
-#include <igl/ReAntTweakBar.h>
 
+#include <igl/anttweakbar/ReAntTweakBar.h>
 
 #include <igl/pathinfo.h>
 
 #include <igl/Camera.h>
 
 #include <igl/get_seconds.h>

+ 1 - 1
examples/camera/example.cpp
View File 

@@ -3,7 +3,7 @@
 
 #include <igl/Camera.h>
 
 #include <igl/matlab_format.h>
 
 #include <igl/report_gl_error.h>
 
-#include <igl/ReAntTweakBar.h>
 
+#include <igl/anttweakbar/ReAntTweakBar.h>
 
 #include <igl/trackball.h>
 
 #include <igl/two_axis_valuator_fixed_up.h>
 
 #include <igl/PI.h>

+ 1 - 1
examples/colored-mesh/example.cpp
View File 

@@ -21,7 +21,7 @@
 
 #include <igl/material_colors.h>
 
 #include <igl/barycenter.h>
 
 #include <igl/matlab_format.h>
 
-#include <igl/ReAntTweakBar.h>
 
+#include <igl/anttweakbar/ReAntTweakBar.h>
 
 #include <igl/pathinfo.h>
 
 #include <igl/Camera.h>
 
 #include <igl/get_seconds.h>

+ 1 - 1
examples/components/example.cpp
View File 

@@ -7,7 +7,7 @@
 
 #include <igl/snap_to_canonical_view_quat.h>
 
 #include <igl/REDRUM.h>
 
 #include <igl/Camera.h>
 
-#include <igl/ReAntTweakBar.h>
 
+#include <igl/anttweakbar/ReAntTweakBar.h>
 
 #include <igl/get_seconds.h>
 
 #include <igl/jet.h>
 
 #include <igl/rgb_to_hsv.h>

+ 1 - 1
examples/flare-eyes/example.cpp
View File 

@@ -17,7 +17,7 @@
 
 #include <igl/snap_to_canonical_view_quat.h>
 
 #include <igl/REDRUM.h>
 
 #include <igl/Camera.h>
 
-#include <igl/ReAntTweakBar.h>
 
+#include <igl/anttweakbar/ReAntTweakBar.h>
 
 #include <igl/PI.h>
 
 #include <igl/render_to_tga.h>
 
 #include <igl/STR.h>

+ 1 - 1
examples/intersections/example.cpp
View File 

@@ -21,7 +21,7 @@
 
 #include <igl/material_colors.h>
 
 #include <igl/barycenter.h>
 
 #include <igl/matlab_format.h>
 
-#include <igl/ReAntTweakBar.h>
 
+#include <igl/anttweakbar/ReAntTweakBar.h>
 
 #include <igl/pathinfo.h>
 
 #include <igl/Camera.h>
 
 #include <igl/cat.h>

+ 1 - 1
examples/patches/example.cpp
View File 

@@ -18,7 +18,7 @@
 
 #include <igl/snap_to_canonical_view_quat.h>
 
 #include <igl/REDRUM.h>
 
 #include <igl/Camera.h>
 
-#include <igl/ReAntTweakBar.h>
 
+#include <igl/anttweakbar/ReAntTweakBar.h>
 
 #include <igl/get_seconds.h>
 
 #include <igl/jet.h>
 
 #include <igl/randperm.h>

+ 1 - 1
examples/randomly-sample-mesh/example.cpp
View File 

@@ -19,7 +19,7 @@
 
 #include <igl/snap_to_fixed_up.h>
 
 #include <igl/REDRUM.h>
 
 #include <igl/Camera.h>
 
-#include <igl/ReAntTweakBar.h>
 
+#include <igl/anttweakbar/ReAntTweakBar.h>
 
 #include <igl/get_seconds.h>
 
 #include <igl/random_points_on_mesh.h>

+ 1 - 1
examples/rotate-widget/example.cpp
View File 

@@ -21,7 +21,7 @@
 
 #include <igl/snap_to_fixed_up.h>
 
 #include <igl/REDRUM.h>
 
 #include <igl/Camera.h>
 
-#include <igl/ReAntTweakBar.h>
 
+#include <igl/anttweakbar/ReAntTweakBar.h>
 
 #include <igl/get_seconds.h>
 
 
 #include <Eigen/Core>

+ 1 - 1
examples/scene-rotation/example.cpp
View File 

@@ -24,7 +24,7 @@
 
 #include <igl/snap_to_fixed_up.h>
 
 #include <igl/REDRUM.h>
 
 #include <igl/Camera.h>
 
-#include <igl/ReAntTweakBar.h>
 
+#include <igl/anttweakbar/ReAntTweakBar.h>
 
 #include <igl/get_seconds.h>
 
 
 #include <Eigen/Core>

+ 1 - 1
examples/shadow-mapping/example.cpp
View File 

@@ -19,7 +19,7 @@
 
 #include <igl/trackball.h>
 
 #include <igl/snap_to_canonical_view_quat.h>
 
 #include <igl/REDRUM.h>
 
-#include <igl/ReAntTweakBar.h>
 
+#include <igl/anttweakbar/ReAntTweakBar.h>
 
 #include <igl/get_seconds.h>
 
 #include <igl/jet.h>
 
 #include <igl/randperm.h>

+ 1 - 1
examples/skeleton-builder/example.cpp
View File 

@@ -17,7 +17,7 @@
 
 #include <igl/snap_to_fixed_up.h>
 
 #include <igl/REDRUM.h>
 
 #include <igl/Camera.h>
 
-#include <igl/ReAntTweakBar.h>
 
+#include <igl/anttweakbar/ReAntTweakBar.h>
 
 #include <igl/get_seconds.h>
 
 #include <igl/forward_kinematics.h>
 
 #include <igl/boundary_conditions.h>

+ 1 - 1
examples/skeleton-poser/example.cpp
View File 

@@ -1,7 +1,7 @@
 
 #include <igl/Camera.h>
 
 #include <igl/MouseController.h>
 
 #include <igl/REDRUM.h>
 
-#include <igl/ReAntTweakBar.h>
 
+#include <igl/anttweakbar/ReAntTweakBar.h>
 
 #include <igl/STR.h>
 
 #include <igl/barycenter.h>
 
 #include <igl/bbw/bbw.h>

+ 1 - 1
examples/skeleton/example.cpp
View File 

@@ -22,7 +22,7 @@
 
 #include <igl/snap_to_fixed_up.h>
 
 #include <igl/REDRUM.h>
 
 #include <igl/Camera.h>
 
-#include <igl/ReAntTweakBar.h>
 
+#include <igl/anttweakbar/ReAntTweakBar.h>
 
 #include <igl/get_seconds.h>
 
 #include <igl/forward_kinematics.h>
 
 #include <igl/tetgen/mesh_with_skeleton.h>

+ 1 - 1
examples/textured-mesh/example.cpp
View File 

@@ -21,7 +21,7 @@
 
 #include <igl/material_colors.h>
 
 #include <igl/barycenter.h>
 
 #include <igl/matlab_format.h>
 
-#include <igl/ReAntTweakBar.h>
 
+#include <igl/anttweakbar/ReAntTweakBar.h>
 
 #include <igl/pathinfo.h>
 
 #include <igl/Camera.h>
 
 #include <igl/get_seconds.h>

+ 1 - 1
examples/transparency/example.cpp
View File 

@@ -14,7 +14,7 @@
 
 #include <igl/colon.h>
 
 #include <igl/slice.h>
 
 #include <igl/report_gl_error.h>
 
-#include <igl/ReAntTweakBar.h>
 
+#include <igl/anttweakbar/ReAntTweakBar.h>
 
 #include <igl/EPS.h>
 
 #define IGL_HEADER_ONLY
 
 #include <igl/sort_triangles.h>

+ 1 - 1
include/igl/anttweakbar/ReAntTweakBar.h
View File 

@@ -7,7 +7,7 @@
 
 // obtain one at http://mozilla.org/MPL/2.0/.
 
 #ifndef IGL_REANTTWEAKBAR_H
 
 #define IGL_REANTTWEAKBAR_H
 
-#include "igl_inline.h"
 
+#include "../igl_inline.h"
 
 // ReAntTweakBar is a minimal wrapper for the AntTweakBar library that allows
 
 // "bars" to be saved and load from disk. Changing your existing app that uses
 
 // AntTweakBar to use ReAntTweakBar is trivial.

+ 1 - 1
include/igl/anttweakbar/cocoa_key_to_anttweakbar_key.h
View File 

@@ -7,7 +7,7 @@
 
 // obtain one at http://mozilla.org/MPL/2.0/.
 
 #ifndef IGL_COCOA_KEY_TO_ANTTWEAKBAR_KEY_H
 
 #define IGL_COCOA_KEY_TO_ANTTWEAKBAR_KEY_H
 
-#include "igl_inline.h"
 
+#include "../igl_inline.h"
 
 
 
 namespace igl

+ 9 - 1
optional/CMakeLists.txt
View File 

@@ -13,6 +13,8 @@ add_definitions(-DIGL_STATIC_LIBRARY)
 
 find_package(GLFW QUIET)
 
 if (GLFW_FOUND)
 
   include_directories( ${GLFW_INCLUDE_DIR})
 
+else (GLFW_FOUND)
 
+  message(STATUS "GLFW not found.")
 
 endif(GLFW_FOUND)
 
 
 find_package(OpenGL QUIET)
 
@@ -21,6 +23,8 @@ find_package(OpenGL QUIET)
 
 find_package(ANTTWEAKBAR QUIET)
 
 if (ANTTWEAKBAR_FOUND)
 
   include_directories( ${ANT_TWEAK_BAR_INCLUDE_DIR})
 
+else (ANTTWEAKBAR_FOUND)
 
+  message(STATUS "AntTweakBar not found.")
 
 endif(ANTTWEAKBAR_FOUND)
 
 
 
@@ -34,12 +38,16 @@ endif(LIBCOMISO_FOUND)
 
 find_package(MATLAB QUIET)
 
 if (MATLAB_FOUND)
 
   include_directories( ${MATLAB_INCLUDE_DIR})
 
+else (MATLAB_FOUND)
 
+  message(STATUS "MATLAB not found.")
 
 endif(MATLAB_FOUND)
 
 
 ## Check for EMBREE, if not available skip the examples that depends on it
 
 find_package(EMBREE QUIET)
 
 if (EMBREE_FOUND)
 
   include_directories( ${EMBREE_INCLUDE_DIR})
 
+else (EMBREE_FOUND)
 
+  message(STATUS "Embree not found.")
 
 endif(EMBREE_FOUND)
 
 
 ## Check for CGAL, if not available skip the examples that depends on it
 
@@ -120,7 +128,7 @@ add_library(igl STATIC ${SOURCES})
 
 #### Compile the AntTweakBar part
 
 if (ANTTWEAKBAR_FOUND)
 
   file(GLOB SOURCES_ANTTWEAKBAR
 
-    "${PROJECT_SOURCE_DIR}/include/igl/anttweakbar/*.cpp"
 
+    "${PROJECT_SOURCE_DIR}/../include/igl/anttweakbar/*.cpp"
 
   )
 
 add_library(iglanttweakbar STATIC ${SOURCES_ANTTWEAKBAR})
 
 endif (ANTTWEAKBAR_FOUND)