fix return type for Entity::Transform()

[blank.git] / src / world / Entity.hpp

diff --git a/src/world/Entity.hpp b/src/world/Entity.hpp
index b3eb1f4360e57c5f95fd14039cd4669eacd33ee8..e38e0b449e79bf41eae31c4800a7bc10ad04d6ea 100644 (file)
--- a/src/world/Entity.hpp
+++ b/src/world/Entity.hpp
@@ -2,7 +2,9 @@
 #define BLANK_WORLD_ENTITY_HPP_
 
 #include "Chunk.hpp"
+#include "EntityDerivative.hpp"
 #include "EntityState.hpp"
+#include "Steering.hpp"
 #include "../geometry/primitive.hpp"
 #include "../model/Instance.hpp"
 
@@ -17,6 +19,7 @@ namespace blank {
 class DirectionalLighting;
 class EntityController;
 class Shape;
+class World;
 
 class Entity {
 
@@ -30,6 +33,9 @@ public:
        Entity(const Entity &) noexcept;
        Entity &operator =(const Entity &) = delete;
 
+       Steering &GetSteering() noexcept { return steering; }
+       const Steering &GetSteering() const noexcept { return steering; }
+
        bool HasController() const noexcept { return ctrl; }
        // entity takes over ownership of controller
        void SetController(EntityController *c) noexcept;
@@ -89,7 +95,7 @@ public:
        void SetHead(float pitch, float yaw) noexcept;
 
        /// get a transform for this entity's coordinate space
-       const glm::mat4 Transform() const noexcept { return model_transform; }
+       const glm::mat4 &Transform() const noexcept { return model_transform; }
        /// get a transform for this entity's coordinate space relative to reference chunk
        glm::mat4 Transform(const glm::ivec3 &reference) const noexcept;
        /// get a transform for this entity's view space relative to reference chunk
@@ -114,13 +120,14 @@ public:
        bool Dead() const noexcept { return dead; }
        bool CanRemove() const noexcept { return dead && ref_count <= 0; }
 
-       void Update(float dt);
+       void Update(World &, float dt);
 
        void Render(const glm::mat4 &M, DirectionalLighting &prog) noexcept {
                if (model) model.Render(M, prog);
        }
 
 private:
+       void UpdatePhysics(World &, float dt);
        void UpdateTransforms() noexcept;
        void UpdateHeading() noexcept;
        void UpdateModel(float dt) noexcept;
@@ -130,7 +137,16 @@ public:
 private:
        void OrientHead(float dt) noexcept;
 
+       EntityDerivative CalculateStep(
+               World &,
+               const EntityState &cur,
+               float dt,
+               const EntityDerivative &prev
+       ) const;
+
+
 private:
+       Steering steering;
        EntityController *ctrl;
        Instance model;
 
@@ -152,6 +168,9 @@ private:
 
        // TODO: I'd prefer a drag solution
        float max_vel;
+       // TODO: split max_force into (local) axes?
+       //       e.g. players may want to disable vertical thrust under certain
+       //       conditions (e.g. "walking" ^^)
        float max_force;
 
        int ref_count;