Skip to content

Commit

Permalink
Add getures
Browse files Browse the repository at this point in the history
  • Loading branch information
jcelerier committed Aug 13, 2024
1 parent 7a8721e commit 6dcf308
Show file tree
Hide file tree
Showing 13 changed files with 237 additions and 73 deletions.
52 changes: 43 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,59 @@ endif()

project(score_addon_puara LANGUAGES CXX)

add_library(score_addon_puara
3rdparty/puara-gestures/descriptors/IMU_Sensor_Fusion/imu_orientation.cpp
)

avnd_score_plugin_init(
BASE_TARGET score_addon_puara
)

avnd_score_plugin_add(
BASE_TARGET score_addon_puara
SOURCES
Puara/Puara.hpp
Puara/PuaraModel.hpp
Puara/PuaraModel.cpp
Puara/PuaraUi.hpp
3rdparty/puara-gestures/descriptors/IMU_Sensor_Fusion/imu_orientation.cpp
TARGET puara
MAIN_CLASS Puara
NAMESPACE Example
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
)

target_include_directories(score_addon_puara
PRIVATE 3rdparty/puara-gestures 3rdparty/puara-gestures/descriptors)
PRIVATE
3rdparty/puara-gestures
3rdparty/puara-gestures/descriptors
)

avnd_score_plugin_finalize(
BASE_TARGET score_addon_puara
Expand Down
9 changes: 9 additions & 0 deletions Puara/Jab.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#include "Jab.hpp"
namespace puara_gestures::objects
{
void Jab::operator()(halp::tick t)
{
// TODO
// outputs.output = impl.jab(inputs.accel, inputs.gyro, inputs.mag, 0.1);
}
}
40 changes: 40 additions & 0 deletions Puara/Jab.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#pragma once

#include <halp/audio.hpp>
#include <halp/controls.hpp>
#include <halp/meta.hpp>

#include <puara-jab.h>

namespace puara_gestures::objects
{
class Jab
{
public:
halp_meta(name, "Jab")
halp_meta(category, "Gestures")
halp_meta(c_name, "puara_jab")
halp_meta(uuid, "70cf4250-d66e-4a78-824f-4b51fb3d0075")

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<"Output", float> output;
} outputs;

halp::setup setup;
void prepare(halp::setup info) { setup = info; }

using tick = halp::tick;
void operator()(halp::tick t);

puara_gestures::Jab impl;
};

}
4 changes: 0 additions & 4 deletions Puara/Puara.hpp

This file was deleted.

9 changes: 0 additions & 9 deletions Puara/PuaraModel.cpp

This file was deleted.

51 changes: 0 additions & 51 deletions Puara/PuaraModel.hpp

This file was deleted.

Empty file removed Puara/PuaraUi.hpp
Empty file.
8 changes: 8 additions & 0 deletions Puara/Roll.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#include "Roll.hpp"
namespace puara_gestures::objects
{
void Roll::operator()(halp::tick t)
{
outputs.output = impl.roll(inputs.accel, inputs.gyro, inputs.mag, 0.1);
}
}
40 changes: 40 additions & 0 deletions Puara/Roll.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#pragma once

#include <halp/audio.hpp>
#include <halp/controls.hpp>
#include <halp/meta.hpp>

#include <puara-roll.h>

namespace puara_gestures::objects
{
class Roll
{
public:
halp_meta(name, "Roll")
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<"Output", float> output;
} outputs;

halp::setup setup;
void prepare(halp::setup info) { setup = info; }

using tick = halp::tick;
void operator()(halp::tick t);

puara_gestures::Roll impl;
};

}
9 changes: 9 additions & 0 deletions Puara/Shake.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#include "Shake.hpp"
namespace puara_gestures::objects
{
void Shake::operator()(halp::tick t)
{
// TODO
// outputs.output = impl.shake(inputs.accel, inputs.gyro, inputs.mag, 0.1);
}
}
40 changes: 40 additions & 0 deletions Puara/Shake.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#pragma once

#include <halp/audio.hpp>
#include <halp/controls.hpp>
#include <halp/meta.hpp>

#include <puara-shake.h>

namespace puara_gestures::objects
{
class Shake
{
public:
halp_meta(name, "Shake")
halp_meta(category, "Gestures")
halp_meta(c_name, "puara_shake")
halp_meta(uuid, "ecb5dc46-164c-46a0-a01e-90e3c3bd7527")

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<"Output", float> output;
} outputs;

halp::setup setup;
void prepare(halp::setup info) { setup = info; }

using tick = halp::tick;
void operator()(halp::tick t);

puara_gestures::Shake impl;
};

}
8 changes: 8 additions & 0 deletions Puara/Tilt.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#include "Tilt.hpp"
namespace puara_gestures::objects
{
void Tilt::operator()(halp::tick t)
{
outputs.output = impl.tilt(inputs.accel, inputs.gyro, inputs.mag, 0.1);
}
}
40 changes: 40 additions & 0 deletions Puara/Tilt.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#pragma once

#include <halp/audio.hpp>
#include <halp/controls.hpp>
#include <halp/meta.hpp>

#include <puara-tilt.h>

namespace puara_gestures::objects
{
class Tilt
{
public:
halp_meta(name, "Tilt")
halp_meta(category, "Gestures")
halp_meta(c_name, "puara_tilt")
halp_meta(uuid, "13fd4da6-3ebb-48dd-ac81-3de0aced5d32")

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<"Output", float> output;
} outputs;

halp::setup setup;
void prepare(halp::setup info) { setup = info; }

using tick = halp::tick;
void operator()(halp::tick t);

puara_gestures::Tilt impl;
};

}

0 comments on commit 6dcf308

Please sign in to comment.