X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FEntity.hpp;h=7e85591c89150f1c22e6a20604cca20a7c6eccca;hb=4da2ae6f12d7cf4594edb2d560c5c112e9bcd094;hp=bf5fbe9db56bac383afcdcdac74c1e105120f99d;hpb=d38be21d103052761505d58a6d13e30a896dde01;p=blank.git diff --git a/src/world/Entity.hpp b/src/world/Entity.hpp index bf5fbe9..7e85591 100644 --- a/src/world/Entity.hpp +++ b/src/world/Entity.hpp @@ -15,7 +15,6 @@ namespace blank { class DirectionalLighting; -struct EntityDerivative; class Shape; class Entity { @@ -57,7 +56,7 @@ public: return state.Diff(other.state); } - /// direction is rotation axis, magnitude is speed in rad/ms + /// direction is rotation axis, magnitude is speed in rad/s const glm::vec3 &AngularVelocity() const noexcept { return state.ang_vel; } void AngularVelocity(const glm::vec3 &v) noexcept { state.ang_vel = v; } @@ -80,20 +79,10 @@ public: bool Dead() const noexcept { return dead; } bool CanRemove() const noexcept { return dead && ref_count <= 0; } - void Update(int dt) noexcept; - void Render(const glm::mat4 &M, DirectionalLighting &prog) noexcept { if (model) model.Render(M, prog); } -private: - EntityDerivative CalculateStep( - const EntityState &cur, - float dt, - const EntityDerivative &prev - ) const noexcept; - glm::vec3 ControlForce(const EntityState &) const noexcept; - private: Instance model;