Make a larger gesture recognizer object

ossia · Oct 31, 2024 · 22af354 · 22af354
1 parent 096f474
commit 22af354
Show file tree

Hide file tree

Showing 9 changed files with 125 additions and 63 deletions.
diff --git a/3rdparty/puara-gestures b/3rdparty/puara-gestures
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,69 +9,75 @@ if(NOT TARGET score_plugin_avnd)
 endif()
 
 project(score_addon_puara LANGUAGES CXX)
-avnd_score_plugin_init(
-  BASE_TARGET score_addon_puara
-)
-
-target_sources(score_addon_puara PRIVATE
-    3rdparty/puara-gestures/descriptors/IMU_Sensor_Fusion/imu_orientation.cpp
-#    3rdparty/puara-gestures/descriptors/puara-utils.cpp
-)
-
-avnd_score_plugin_add(
-  BASE_TARGET score_addon_puara
-  SOURCES
-    Puara/LeakyIntegrator.hpp
-  TARGET puara
-  MAIN_CLASS LeakyIntegrator
-  NAMESPACE Puara
-)
 
-avnd_score_plugin_add(
-  BASE_TARGET score_addon_puara
-  SOURCES
-    Puara/Roll.hpp
-    Puara/Roll.cpp
-  TARGET puara_roll
-  MAIN_CLASS Roll
-  NAMESPACE puara_gestures::objects
-)
+set(PUARA_GESTURES_ENABLE_TESTING OFF)
+add_subdirectory(3rdparty/puara-gestures SYSTEM)
 
-avnd_score_plugin_add(
+avnd_score_plugin_init(
   BASE_TARGET score_addon_puara
-  SOURCES
-    Puara/Tilt.hpp
-    Puara/Tilt.cpp
-  TARGET puara_tilt
-  MAIN_CLASS Tilt
-  NAMESPACE puara_gestures::objects
 )
 
-avnd_score_plugin_add(
-  BASE_TARGET score_addon_puara
-  SOURCES
-    Puara/Jab.hpp
-    Puara/Jab.cpp
-  TARGET puara_jab
-  MAIN_CLASS Jab
-  NAMESPACE puara_gestures::objects
-)
+target_link_libraries(score_addon_puara PRIVATE puara_gestures)
 
 avnd_score_plugin_add(
   BASE_TARGET score_addon_puara
   SOURCES
-    Puara/Shake.hpp
-    Puara/Shake.cpp
-  TARGET puara_shake
-  MAIN_CLASS Shake
+    Puara/GestureRecognizer.hpp
+    Puara/GestureRecognizer.cpp
+  TARGET puara
+  MAIN_CLASS GestureRecognizer
   NAMESPACE puara_gestures::objects
 )
-
-target_include_directories(score_addon_puara
-  PRIVATE
-    3rdparty/puara-gestures
-    3rdparty/puara-gestures/descriptors
-)
+#
+#
+# avnd_score_plugin_add(
+#   BASE_TARGET score_addon_puara
+#   SOURCES
+#     Puara/LeakyIntegrator.hpp
+#   TARGET puara
+#   MAIN_CLASS LeakyIntegrator
+#   NAMESPACE Puara
+# )
+#
+# avnd_score_plugin_add(
+#   BASE_TARGET score_addon_puara
+#   SOURCES
+#     Puara/Roll.hpp
+#     Puara/Roll.cpp
+#   TARGET puara_roll
+#   MAIN_CLASS Roll
+#   NAMESPACE puara_gestures::objects
+# )
+#
+# avnd_score_plugin_add(
+#   BASE_TARGET score_addon_puara
+#   SOURCES
+#     Puara/Tilt.hpp
+#     Puara/Tilt.cpp
+#   TARGET puara_tilt
+#   MAIN_CLASS Tilt
+#   NAMESPACE puara_gestures::objects
+# )
+#
+# avnd_score_plugin_add(
+#   BASE_TARGET score_addon_puara
+#   SOURCES
+#     Puara/Jab.hpp
+#     Puara/Jab.cpp
+#   TARGET puara_jab
+#   MAIN_CLASS Jab
+#   NAMESPACE puara_gestures::objects
+# )
+#
+# avnd_score_plugin_add(
+#   BASE_TARGET score_addon_puara
+#   SOURCES
+#     Puara/Shake.hpp
+#     Puara/Shake.cpp
+#   TARGET puara_shake
+#   MAIN_CLASS Shake
+#   NAMESPACE puara_gestures::objects
+# )
 
 avnd_score_plugin_finalize(
   BASE_TARGET score_addon_puara

diff --git a/Puara/GestureRecognizer.cpp b/Puara/GestureRecognizer.cpp
@@ -0,0 +1,17 @@
+#include "GestureRecognizer.hpp"
+namespace puara_gestures::objects
+{
+void GestureRecognizer::operator()(halp::tick t)
+{
+  const double period = t.frames / setup.rate;
+
+  auto [ax, ay, az] = inputs.accel.value;
+  jab.update(ax, ay, az);
+  shake.update(ax, ay, az);
+
+  outputs.jab = jab.current_value();
+  outputs.shake = shake.current_value();
+  outputs.tilt = tilt.tilt(inputs.accel, inputs.gyro, inputs.mag, period);
+  outputs.roll = roll.roll(inputs.accel, inputs.gyro, inputs.mag, period);
+}
+}
diff --git a/Puara/GestureRecognizer.hpp b/Puara/GestureRecognizer.hpp
@@ -0,0 +1,44 @@
+#pragma once
+#include <halp/audio.hpp>
+#include <halp/controls.hpp>
+#include <halp/meta.hpp>
+#include <puara/gestures.h>
+
+namespace puara_gestures::objects
+{
+class GestureRecognizer
+{
+public:
+  halp_meta(name, "Gesture recognizer")
+  halp_meta(category, "Gestures")
+  halp_meta(c_name, "puara_roll")
+  halp_meta(uuid, "3135b5e0-39a6-4151-8ae4-a657d577eab8")
+
+  struct ins
+  {
+    halp::val_port<"Acceleration", puara_gestures::Coord3D> accel;
+    halp::val_port<"Gyrosocope", puara_gestures::Coord3D> gyro;
+    halp::val_port<"Magnetometer", puara_gestures::Coord3D> mag;
+  } inputs;
+
+  struct
+  {
+    halp::val_port<"Jab", puara_gestures::Coord3D> jab;
+    halp::val_port<"Shake", puara_gestures::Coord3D> shake;
+    halp::val_port<"Tilt", float> tilt;
+    halp::val_port<"Roll", float> roll;
+  } outputs;
+
+  halp::setup setup;
+  void prepare(halp::setup info) { setup = info; }
+
+  using tick = halp::tick;
+  void operator()(halp::tick t);
+
+  puara_gestures::Jab3D jab;
+  puara_gestures::Shake3D shake;
+  puara_gestures::Tilt tilt;
+  puara_gestures::Roll roll;
+};
+
+}
diff --git a/Puara/Jab.hpp b/Puara/Jab.hpp
@@ -3,8 +3,7 @@
 #include <halp/audio.hpp>
 #include <halp/controls.hpp>
 #include <halp/meta.hpp>
-
-#include <puara-jab.h>
+#include <puara/descriptors/jab.h>
 
 namespace puara_gestures::objects
 {

diff --git a/Puara/LeakyIntegrator.hpp b/Puara/LeakyIntegrator.hpp
@@ -3,8 +3,7 @@
 #include <halp/audio.hpp>
 #include <halp/controls.hpp>
 #include <halp/meta.hpp>
-
-#include <descriptors/puara-utils.h>
+#include <puara/utils/leakyintegrator.h>
 
 namespace Puara
 {

diff --git a/Puara/Roll.hpp b/Puara/Roll.hpp
@@ -3,8 +3,7 @@
 #include <halp/audio.hpp>
 #include <halp/controls.hpp>
 #include <halp/meta.hpp>
-
-#include <puara-roll.h>
+#include <puara/descriptors/roll.h>
 
 namespace puara_gestures::objects
 {

diff --git a/Puara/Shake.hpp b/Puara/Shake.hpp
@@ -3,8 +3,7 @@
 #include <halp/audio.hpp>
 #include <halp/controls.hpp>
 #include <halp/meta.hpp>
-
-#include <puara-shake.h>
+#include <puara/descriptors/shake.h>
 
 namespace puara_gestures::objects
 {

diff --git a/Puara/Tilt.hpp b/Puara/Tilt.hpp
@@ -3,8 +3,7 @@
 #include <halp/audio.hpp>
 #include <halp/controls.hpp>
 #include <halp/meta.hpp>
-
-#include <puara-tilt.h>
+#include <puara/descriptors/tilt.h>
 
 namespace puara_gestures::objects
 {
+ −		.DS_Store
+41 −0		.github/workflows/cmake.yml
+4 −1		.gitignore
+1 −1		.gitmodules
+0 −0		3rdparty/IMU_Sensor_Fusion
+60 −0		CMakeLists.txt
+0 −87		descriptors/puara-gestures.code-workspace
+1 −1		include/puara/descriptors/button.h
+2 −5		include/puara/descriptors/jab.h
+6 −9		include/puara/descriptors/roll.h
+2 −4		include/puara/descriptors/shake.h
+2 −5		include/puara/descriptors/tilt.h
+0 −2		include/puara/descriptors/touch.h
+6 −15		include/puara/gestures.h
+0 −0		include/puara/structs.h
+8 −7		include/puara/utils.h
+1 −1		include/puara/utils/calibration.h
+1 −1		include/puara/utils/circularbuffer.h
+2 −0		include/puara/utils/leakyintegrator.h
+1 −1		include/puara/utils/maprange.h
+2 −1		include/puara/utils/rollingminmax.h
+4 −1		include/puara/utils/smooth.h
+1 −1		include/puara/utils/threshold.h
+2 −0		include/puara/utils/wrap.h
+5 −2		src/puara_gestures.cpp
+ −		standalone/.DS_Store
+0 −127		testing_roll.h
+0 −123		testing_tilt.h
+114 −0		tests/testing_roll.cpp
+109 −0		tests/testing_tilt.cpp