diff options
author | rtk0c <[email protected]> | 2022-07-07 19:30:47 -0700 |
---|---|---|
committer | rtk0c <[email protected]> | 2022-07-07 19:30:47 -0700 |
commit | a98b0495a957ed15900c052bcad00b3c48367546 (patch) | |
tree | 10945d897ba6671c707e1c9866f235c0e630c08f /source/30-game | |
parent | 6839736b8283a59eb743e1f6058c7d266a3e7f36 (diff) |
Changeset: 79 Initial work on fixing codegen for the main project, add enum underlying type (EUT) scanning capability
Diffstat (limited to 'source/30-game')
-rw-r--r-- | source/30-game/GameObject.hpp | 2 | ||||
-rw-r--r-- | source/30-game/Level.hpp | 3 | ||||
-rw-r--r-- | source/30-game/Player.hpp | 6 | ||||
-rw-r--r-- | source/30-game/SceneThings.hpp | 8 |
4 files changed, 17 insertions, 2 deletions
diff --git a/source/30-game/GameObject.hpp b/source/30-game/GameObject.hpp index 56beb80..40c52e7 100644 --- a/source/30-game/GameObject.hpp +++ b/source/30-game/GameObject.hpp @@ -31,6 +31,8 @@ enum class GameObjectKind { class GameWorld; class GameObject { + BRUSSEL_CLASS(InheritanceHiearchy) + public: using Kind = Tags::GameObjectKind; using enum Tags::GameObjectKind; diff --git a/source/30-game/Level.hpp b/source/30-game/Level.hpp index 9114a64..c030b8e 100644 --- a/source/30-game/Level.hpp +++ b/source/30-game/Level.hpp @@ -3,6 +3,7 @@ #include "EditorCore.hpp" #include "GameObject.hpp" +#include <MacrosCodegen.hpp> #include <RcPtr.hpp> #include <Uid.hpp> @@ -80,6 +81,8 @@ private: }; class LevelWrapperObject : public GameObject { + BRUSSEL_CLASS() + private: RcPtr<Level> mLevel; diff --git a/source/30-game/Player.hpp b/source/30-game/Player.hpp index d003a25..5a6bab7 100644 --- a/source/30-game/Player.hpp +++ b/source/30-game/Player.hpp @@ -2,9 +2,11 @@ #include "GameObject.hpp" #include "Material.hpp" -#include "RcPtr.hpp" #include "Sprite.hpp" +#include <MacrosCodegen.hpp> +#include <RcPtr.hpp> + #define GLFW_INCLUDE_NONE #include <GLFW/glfw3.h> @@ -27,6 +29,8 @@ struct PlayerKeyBinds { }; class Player : public GameObject { + BRUSSEL_CLASS() + public: std::vector<GLFWkeyboard*> boundKeyboards; PlayerKeyBinds keybinds; diff --git a/source/30-game/SceneThings.hpp b/source/30-game/SceneThings.hpp index c261fbb..761eb59 100644 --- a/source/30-game/SceneThings.hpp +++ b/source/30-game/SceneThings.hpp @@ -4,17 +4,21 @@ #include "GameObject.hpp" #include "Renderer.hpp" +#include <MacrosCodegen.hpp> + #include <glm/glm.hpp> #include <vector> class SimpleGeometryObject : public GameObject { + BRUSSEL_CLASS() + private: RenderObject mRenderObject; glm::vec3 mSize; RgbaColor mXFaceColor; RgbaColor mYFaceColor; RgbaColor mZFaceColor; - mutable bool mNeedsRebuildMesh ; + mutable bool mNeedsRebuildMesh; public: SimpleGeometryObject(GameWorld* world); @@ -31,6 +35,8 @@ public: }; class BuildingObject : public GameObject { + BRUSSEL_CLASS() + private: RenderObject mRenderObject; |