From e7974db3245e551bf8feda18abdc071ba5ff8bee Mon Sep 17 00:00:00 2001 From: Hayodea Hakol Date: Tue, 22 Jul 2025 02:03:09 -0400 Subject: [PATCH] Add Marionette --- configure.ac | 1 + hcore/Makefile.am | 3 +- hcore/include/marionette/body/body.h | 17 ++++++++ hcore/include/marionette/body/bodyMap.h | 16 +++++--- hcore/include/marionette/body/bodyMessage.h | 40 ++++++++++--------- hcore/include/marionette/body/limb.h | 28 ++++++++----- hcore/include/marionette/body/map.h | 23 +++++++++++ .../marionette/body/{bodyPart.h => part.h} | 20 ++++++---- hcore/include/marionette/marionette.h | 14 +++++++ hcore/marionette/Makefile.am | 4 ++ hcore/marionette/marionette.cpp | 9 +++++ 11 files changed, 131 insertions(+), 44 deletions(-) create mode 100644 hcore/include/marionette/body/body.h create mode 100644 hcore/include/marionette/body/map.h rename hcore/include/marionette/body/{bodyPart.h => part.h} (66%) create mode 100644 hcore/include/marionette/marionette.h create mode 100644 hcore/marionette/Makefile.am create mode 100644 hcore/marionette/marionette.cpp diff --git a/configure.ac b/configure.ac index 2e2a876..164c6d1 100644 --- a/configure.ac +++ b/configure.ac @@ -78,6 +78,7 @@ AC_CONFIG_FILES([ Makefile hcore/Makefile hcore/deviceManager/Makefile hcore/senseApis/Makefile + hcore/marionette/Makefile commonLibs/Makefile commonLibs/xcbXorg/Makefile ]) diff --git a/hcore/Makefile.am b/hcore/Makefile.am index 5910b3c..42b0fe5 100644 --- a/hcore/Makefile.am +++ b/hcore/Makefile.am @@ -1,6 +1,5 @@ -SUBDIRS = deviceManager senseApis +SUBDIRS = deviceManager senseApis marionette AM_CPPFLAGS+= -I"$(top_srcdir)/hcore/include" noinst_LIBRARIES = libhcore.a libhcore_a_SOURCES = mind.cpp opts.cpp componentThread.cpp - diff --git a/hcore/include/marionette/body/body.h b/hcore/include/marionette/body/body.h new file mode 100644 index 0000000..aa2385a --- /dev/null +++ b/hcore/include/marionette/body/body.h @@ -0,0 +1,17 @@ +#ifndef _BODY_H +#define _BODY_H + +namespace mrntt { +namespace body { + +class Body +{ +public: + Body() = default; + ~Body() = default; +}; + +} // namespace body +} // namespace mrntt + +#endif // _BODY_H diff --git a/hcore/include/marionette/body/bodyMap.h b/hcore/include/marionette/body/bodyMap.h index a969488..af980c1 100644 --- a/hcore/include/marionette/body/bodyMap.h +++ b/hcore/include/marionette/body/bodyMap.h @@ -1,17 +1,23 @@ -#ifndef _BODY_MAP_H -#define _BODY_MAP_H +#ifndef MRNTT_BODY_BODYMAP_H +#define MRNTT_BODY_BODYMAP_H #include #include - #include +namespace mrntt { +namespace body { + class BodyMap { public: BodyMap() = default; ~BodyMap() = default; - std::set limbs; +public: + std::set limbs; }; -#endif // _BODY_MAP_H +} // namespace body +} // namespace mrntt + +#endif // MRNTT_BODY_BODYMAP_H diff --git a/hcore/include/marionette/body/bodyMessage.h b/hcore/include/marionette/body/bodyMessage.h index d78afd7..4ce8b30 100644 --- a/hcore/include/marionette/body/bodyMessage.h +++ b/hcore/include/marionette/body/bodyMessage.h @@ -1,11 +1,14 @@ -#ifndef BODY_MESSAGE_H -#define BODY_MESSAGE_H +#ifndef MRNTT_BODY_BODYMESSAGE_H +#define MRNTT_BODY_BODYMESSAGE_H #include #include #include -#include +#include + +namespace mrntt { +namespace body { class BodyMessage { @@ -14,7 +17,7 @@ public: ~BodyMessage() = default; }; -class BodySpotImpactEntry +class SpotImpactEntry { public: enum class ReportType @@ -26,10 +29,10 @@ public: COLD }; - BodySpotImpactEntry(uint32_t _spot, ReportType _type, uint32_t _value) + SpotImpactEntry(uint32_t _spot, ReportType _type, uint32_t _value) : spot(_spot), type(_type), value(_value) {} - ~BodySpotImpactEntry() = default; + ~SpotImpactEntry() = default; public: uint32_t spot; @@ -37,28 +40,27 @@ public: uint32_t value; }; -class BodySpotImpactInd -: public BodyMessage +class SpotImpactInd : public BodyMessage { public: - BodySpotImpactInd(BodyPart &_part) : part(_part) {} - ~BodySpotImpactInd() = default; + SpotImpactInd(Part &_part) : part(_part) {} + ~SpotImpactInd() = default; public: - BodyPart ∂ - std::vector entries; + Part ∂ + std::vector entries; }; -class BodyPartMsg -: public BodyMessage +class PartMsg : public BodyMessage { public: - BodyPartMsg(const BodyPart& _part) - :part(_part) - {} + PartMsg(const Part& _part) : part(_part) {} public: - const BodyPart& part; + const Part& part; }; -#endif // BODY_MESSAGE_H \ No newline at end of file +} // namespace body +} // namespace mrntt + +#endif // MRNTT_BODY_BODYMESSAGE_H \ No newline at end of file diff --git a/hcore/include/marionette/body/limb.h b/hcore/include/marionette/body/limb.h index adb5b79..8223100 100644 --- a/hcore/include/marionette/body/limb.h +++ b/hcore/include/marionette/body/limb.h @@ -1,28 +1,34 @@ -#ifndef BODY_LIMB_H -#define BODY_LIMB_H +#ifndef MRNTT_BODY_LIMB_H +#define MRNTT_BODY_LIMB_H #include #include #include -#include +#include -class BodyLimb +namespace mrntt { +namespace body { + +class Limb { public: - BodyLimb(uint32_t _id) : id(_id) {} - BodyLimb(uint32_t _id, - const std::string& _name, const std::string& _desc, - const std::string& _loc) + Limb(uint32_t _id) : id(_id) {} + Limb(uint32_t _id, + const std::string& _name, const std::string& _desc, + const std::string& _loc) : id(_id), name(_name), description(_desc), location(_loc) {} - ~BodyLimb() = default; + ~Limb() = default; public: uint32_t id; std::string name, description, location; - std::set parts; + std::set parts; }; -#endif // BODY_LIMB_H +} // namespace body +} // namespace mrntt + +#endif // MRNTT_BODY_LIMB_H diff --git a/hcore/include/marionette/body/map.h b/hcore/include/marionette/body/map.h new file mode 100644 index 0000000..cb52eed --- /dev/null +++ b/hcore/include/marionette/body/map.h @@ -0,0 +1,23 @@ +#ifndef _BODY_MAP_H +#define _BODY_MAP_H + +#include +#include + +#include + +namespace mrntt { +namespace body { + +class BodyMap { +public: + BodyMap() = default; + ~BodyMap() = default; + + std::set limbs; +}; + +} // namespace body +} // namespace mrntt + +#endif // _BODY_MAP_H diff --git a/hcore/include/marionette/body/bodyPart.h b/hcore/include/marionette/body/part.h similarity index 66% rename from hcore/include/marionette/body/bodyPart.h rename to hcore/include/marionette/body/part.h index 3b01c83..22cc39b 100644 --- a/hcore/include/marionette/body/bodyPart.h +++ b/hcore/include/marionette/body/part.h @@ -7,14 +7,17 @@ #include -class BodySpot +namespace mrntt { +namespace body { + +class Spot { public: - BodySpot(uint32_t _id, std::string _description) + Spot(uint32_t _id, std::string _description) : id(_id), description(_description) {} - ~BodySpot() = default; + ~Spot() = default; public: uint32_t id; @@ -22,21 +25,24 @@ public: std::set interoceptors; }; -class BodyPart +class Part { public: - BodyPart(uint32_t _partId, std::string _partName, + Part(uint32_t _partId, std::string _partName, std::string _partDesc, std::string _partLoc) : id(_partId), name(_partName), description(_partDesc), location(_partLoc) {} - ~BodyPart() = default; + ~Part() = default; public: const uint32_t id; std::string name, description, location; - std::set spots; + std::set spots; }; +} // namespace body +} // namespace mrntt + #endif // BODYPART_H diff --git a/hcore/include/marionette/marionette.h b/hcore/include/marionette/marionette.h new file mode 100644 index 0000000..638c18d --- /dev/null +++ b/hcore/include/marionette/marionette.h @@ -0,0 +1,14 @@ +#ifndef _MARIONETTE_H +#define _MARIONETTE_H + +#include + +namespace mrntt { + +class Marionette +{ +}; + +} // namespace mrntt + +#endif // _MARIONETTE_H diff --git a/hcore/marionette/Makefile.am b/hcore/marionette/Makefile.am new file mode 100644 index 0000000..c9cda19 --- /dev/null +++ b/hcore/marionette/Makefile.am @@ -0,0 +1,4 @@ +AM_CPPFLAGS+= -I"$(top_srcdir)/hcore/include" + +noinst_LIBRARIES = libmarionette.a +libmarionette_a_SOURCES = marionette.cpp diff --git a/hcore/marionette/marionette.cpp b/hcore/marionette/marionette.cpp new file mode 100644 index 0000000..5e79951 --- /dev/null +++ b/hcore/marionette/marionette.cpp @@ -0,0 +1,9 @@ + +namespace mrntt { + +int main(int argc, char *argv[]) +{ + return 0; +} + +} // namespace mrntt \ No newline at end of file