[tests] Update standalone to work with the refactor

Author: jcelerier

CMakeLists.txt

@@ -8,6 +8,7 @@ project(
 
 ### Library options ###
 option(PUARA_GESTURES_ENABLE_TESTING "Enable building and running Puara gestures tests" ON)
+option(PUARA_GESTURES_ENABLE_STANDALONE "Enable building and running Puara standalone" ON)
 
 ### Dependencies ###
 if(POLICY CMP0167)
@@ -58,3 +59,8 @@ if(PUARA_GESTURES_ENABLE_TESTING)
   target_link_libraries(testing_roll PRIVATE puara_gestures)
   target_link_libraries(testing_tilt PRIVATE puara_gestures)
 endif()
+
+### Example ###
+if(PUARA_GESTURES_ENABLE_STANDALONE)
+  add_subdirectory(standalone)
+endif()

standalone/CMakeLists.txt

@@ -20,9 +20,10 @@ set(OSSIA_OVERRIDE_PROTOCOLS "OSC;OSCQuery")
 
 FetchContent_Declare(
   libossia
-  GIT_REPOSITORY "https://github.com/OSSIA/libossia"
+  GIT_REPOSITORY "https://github.com/ossia/libossia"
   GIT_TAG master
   GIT_PROGRESS true
+  GIT_SHALLOW 1
 )
 FetchContent_MakeAvailable(libossia)
 
@@ -43,26 +44,12 @@ FetchContent_MakeAvailable(Eigen)
 
 file(GLOB_RECURSE PUARA_SOURCE ../descriptors/*.cpp ../descriptors/*.h)
 
-add_library(puara-gestures STATIC ${PUARA_SOURCE})
-target_link_libraries(puara-gestures PUBLIC
-    Eigen3::Eigen
-    Boost::boost
-)
-
 # Project setup
-add_executable(puara-gestures-standalone)
-
-target_sources(puara-gestures-standalone
-  PRIVATE
-  main.cpp
+add_executable(puara-gestures-standalone
+    main.cpp
 )
 target_link_libraries(puara-gestures-standalone
   PRIVATE
     ossia
-    puara-gestures
-)
-target_include_directories(puara-gestures-standalone
-  PRIVATE
-  ${libossia_SOURCE_DIR}/ossia/include
-  ${libossia_SOURCE_DIR}/ossia
+    puara_gestures
 )

standalone/main.cpp

@@ -11,21 +11,17 @@
 
 // clang-format -i *.h
 
-#include "../puara_gestures.h"
-
-#include <ossia/network/generic/generic_device.hpp>
-#include <ossia/network/osc/osc.hpp>
-
 #include <ossia/network/base/parameter_data.hpp>
 #include <ossia/network/common/debug.hpp>
+#include <ossia/network/generic/generic_device.hpp>
+#include <ossia/network/osc/osc.hpp>
+#include <puara/gestures.h>
 
+#include <chrono>
 #include <iostream>
 #include <sstream>
-
-#include <vector>
-#include <chrono>
 #include <thread>
-#include "../descriptors/IMU_Sensor_Fusion/imu_orientation.h"
+#include <vector>
 
 std::string client_ip = "127.0.0.1";
 int client_port = 9000;
@@ -42,10 +38,6 @@ puara_gestures::Shake3D shake;
 puara_gestures::Jab3D jab;
 puara_gestures::utils::LeakyIntegrator leakyintegrator;
 IMU_Orientation orientation;
-puara_gestures::testing_roll rollTest;
-puara_gestures::testing_tilt tiltTest;
-
-#include <vector>
 
 // struct Coord3D {
 //     double x, y, z;
@@ -75,13 +67,12 @@ int main(int argc, char* argv[]) {
         leakyintegrator.integrate(accelerometer[0]);
     });
 
-    //rollTest.test();
-    tiltTest.test();
-
-//     while(true) {
-//         puara_gestures::Coord3D shakeout = shake.current_value();
-//         puara_gestures::Coord3D jabout = jab.current_value();
-//         std::cout << "Shake X: " << shakeout.x << ", Jab X: " << jabout.x << ", Integrator: " << leakyintegrator.current_value << std::endl;
-//         std::this_thread::sleep_for(std::chrono::milliseconds(10));
-//   };
+    while(true)
+    {
+      puara_gestures::Coord3D shakeout = shake.current_value();
+      puara_gestures::Coord3D jabout = jab.current_value();
+      std::cout << "Shake X: " << shakeout.x << ", Jab X: " << jabout.x
+                << ", Integrator: " << leakyintegrator.current_value << std::endl;
+      std::this_thread::sleep_for(std::chrono::milliseconds(10));
+    };
 }