Update cmake config, add SOLID includes

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86962cec92adfd0662b93f8ea301ed32d1f10bb0..05273c08ed761fcdef8a8ad76517ea1eb0f4155f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,11 @@ link_directories(../../bcar/build)
 link_libraries(bcar)
 link_libraries(pslot)
 
+ADD_DEFINITIONS(-DUSE_SOLID=1)
+include_directories(../solid-2.1.0/include)
+link_directories(../../solid-2.1.0/lib)
+link_libraries(solid)
+
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/incl)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/api)
 

diff --git a/src/psp.cc b/src/psp.cc
index 9e53e36ec1d7c54cde0c8565cf3067c1f72245c8..4761535a917d521dd009ba40f721bd78804b1900 100644 (file)
--- a/src/psp.cc
+++ b/src/psp.cc
@@ -3,8 +3,19 @@
 #include <queue>
 #include "psp.h"
 
+#ifdef USE_SOLID
+        #define USE_QUADS
+        #include <SOLID/solid.h>
+        #include <3D/Point.h>
+        #include <3D/Quaternion.h>
+#endif /* USE_SOLID */
+
 bool PSPlanner::collide()
 {
+#ifdef USE_SOLID
+        // TODO
+        return false;
+#else /* USE_SOLID */
         if(std::get<0>(intersect(
                 this->cc().lfx(), this->cc().lfy(),
                 this->cc().lrx(), this->cc().lry(),
@@ -90,6 +101,7 @@ bool PSPlanner::collide()
         )))
                 return true;
         return false;
+#endif /* USE_SOLID */
 }
 
 bool PSPlanner::left()