diff options
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/Physics.hpp | 30 | ||||
| -rw-r--r-- | src/components/Position.hpp | 13 |
2 files changed, 37 insertions, 6 deletions
diff --git a/src/components/Physics.hpp b/src/components/Physics.hpp index 378e87f..cb4d08a 100644 --- a/src/components/Physics.hpp +++ b/src/components/Physics.hpp @@ -25,8 +25,38 @@ struct Physics : Component<Physics> { public: bool standing = true; + bool gravity = true; + glm::vec2 corners[4] = { + glm::vec2(-0.5, -0.5), // lower left + glm::vec2( 0.5, -0.5), // lower right + glm::vec2(-0.5, 0.5), // upper left + glm::vec2( 0.5, 0.5) // upper right + }; + Physics FromLua([[maybe_unused]] sol::object ref) { + if (ref.get_type() == sol::type::table) { + sol::table tab = ref; + + if (tab["gravity"].get_type() == sol::type::boolean) + this->gravity = tab["gravity"]; + + if (tab["hitbox"].get_type() == sol::type::table) { + sol::table hitbox = tab["hitbox"]; + if (hitbox["ll"] == sol::type::table) + corners[0] = Script::to<glm::vec2>(hitbox["ll"]); + if (hitbox["lr"] == sol::type::table) + corners[1] = Script::to<glm::vec2>(hitbox["lr"]); + if (hitbox["ul"] == sol::type::table) + corners[2] = Script::to<glm::vec2>(hitbox["ul"]); + if (hitbox["ur"] == sol::type::table) + corners[3] = Script::to<glm::vec2>(hitbox["ur"]); + } + } else { + throw std::string( + "Physics component table formatted incorrectly" + ); + } return *this; } diff --git a/src/components/Position.hpp b/src/components/Position.hpp index fc5cb9a..bfa4b41 100644 --- a/src/components/Position.hpp +++ b/src/components/Position.hpp @@ -24,23 +24,24 @@ struct Position : Component<Position> { public: - float x, y; + float x, y, z; - Position(float _x = 0, float _y = 0) : - x(_x), y(_y) {} + Position(float _x = 0, float _y = 0, float _z = 0) : + x(_x), y(_y), z(_z) {} Position FromLua(sol::object ref) { - glm::vec2 vec = Script::to<glm::vec2>(ref); + glm::vec3 vec = Script::to<glm::vec3>(ref); this->x = vec.x; this->y = vec.y; + this->z = vec.z; return *this; } - glm::vec2 vec() + glm::vec3 vec() { - return glm::vec2(x, y); + return glm::vec3(x, y, z); } void serialize(cereal::JSONOutputArchive& ar) final { |