From 6ae037c7e7fbba22149fddfe213ad78558b6f5f3 Mon Sep 17 00:00:00 2001 From: Hayodea Hakol Date: Sat, 4 Jan 2025 11:36:50 -0400 Subject: [PATCH] Director: now has a goal. Goal inherits from Scene --- hcore/include/director/director.h | 3 +++ hcore/include/goal.h | 7 ++----- hcore/include/simulator/scene.h | 2 +- main.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hcore/include/director/director.h b/hcore/include/director/director.h index 5829718..8c5b409 100644 --- a/hcore/include/director/director.h +++ b/hcore/include/director/director.h @@ -2,6 +2,7 @@ #define DIRECTOR_H #include +#include namespace hk { namespace director { @@ -10,6 +11,8 @@ class Director { public: Director() = default; ~Director() = default; + + Goal purpose; }; } // namespace director diff --git a/hcore/include/goal.h b/hcore/include/goal.h index afdcd4b..d38222f 100644 --- a/hcore/include/goal.h +++ b/hcore/include/goal.h @@ -5,13 +5,10 @@ namespace hk { -class Goal { +class Goal : public simulator::Scene { public: - Goal(const simulator::Scene& scene) : scene(scene) {} + Goal() = default; ~Goal() = default; - -private: - simulator::Scene scene; }; } // namespace hk diff --git a/hcore/include/simulator/scene.h b/hcore/include/simulator/scene.h index ea3e15b..2300866 100644 --- a/hcore/include/simulator/scene.h +++ b/hcore/include/simulator/scene.h @@ -14,7 +14,7 @@ class Scene public: using Id = uint32_t; - Scene() : + Scene(void) : cursor(commands) {} ~Scene() = default; diff --git a/main.cpp b/main.cpp index e282edb..13bd0e6 100644 --- a/main.cpp +++ b/main.cpp @@ -2,7 +2,7 @@ int main(int argc, char **argv) { - Mind mind; + hk::Mind mind; return 0; }