[SensableEmulation] Update & clean code.

sofa-framework · Feb 24, 2019 · a28fea2 · a28fea2
1 parent 952d966
commit a28fea2
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 247 deletions.
diff --git a/applications/plugins/SensableEmulation/CMakeLists.txt b/applications/plugins/SensableEmulation/CMakeLists.txt
@@ -3,27 +3,24 @@ project(SensableEmulation)
 
 
 set(HEADER_FILES
-    # NewOmniDriverEmu.h
     OmniDriverEmu.h
     config.h
-    pthread/pthread.h
 )
 
 set(SOURCE_FILES
-    # NewOmniDriverEmu.cpp
     OmniDriverEmu.cpp
     initSensableEmulation.cpp
 )
 
 set(README_FILES PluginSensableEmulation.txt)
 
-find_package(SofaGeneral REQUIRED)
+find_package(SofaHaptics REQUIRED)
 find_package(Boost QUIET COMPONENTS thread REQUIRED)
 include_directories(${Boost_INCLUDE_DIRS})
 
 add_library(${PROJECT_NAME} SHARED ${HEADER_FILES} ${SOURCE_FILES} ${README_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-DSOFA_BUILD_SENSABLEEMULATIONPLUGIN")
-target_link_libraries(${PROJECT_NAME} SofaComponentGeneral SofaHaptics ${Boost_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} SofaHaptics SofaOpenglVisual ${Boost_LIBRARIES})
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/..")
 
 # Seems to be required by boost::asio

diff --git a/applications/plugins/SensableEmulation/NewOmniDriverEmu.h b/applications/plugins/SensableEmulation/NewOmniDriverEmu.h
@@ -23,10 +23,6 @@
 #define SOFA_COMPONENT_CONTROLLER_OMNIEMU_H
 
 //Sensable include
-//#include <HD/hd.h>
-//#include <HDU/hdu.h>
-//#include <HDU/hduError.h>
-//#include <HDU/hduVector.h>
 #include <sofa/helper/LCPcalc.h>
 #include <sofa/defaulttype/SolidTypes.h>