special treatment for players

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

diff --git a/src/world/Entity.hpp b/src/world/Entity.hpp
index 25818c6f3da5666b671666a600ace04a9552e093..a3811427332628250761bad32210bc64103ea9de 100644 (file)
--- a/src/world/Entity.hpp
+++ b/src/world/Entity.hpp
@@ -1,10 +1,9 @@
 #ifndef BLANK_WORLD_ENTITY_HPP_
 #define BLANK_WORLD_ENTITY_HPP_
 
-#include "Block.hpp"
 #include "Chunk.hpp"
+#include "../model/CompositeInstance.hpp"
 #include "../model/geometry.hpp"
-#include "../model/EntityModel.hpp"
 
 #include <string>
 #include <glm/glm.hpp>
@@ -13,6 +12,7 @@
 
 namespace blank {
 
+class DirectionalLighting;
 class Shape;
 
 class Entity {
@@ -20,10 +20,8 @@ class Entity {
 public:
        Entity() noexcept;
 
-       bool HasShape() const noexcept { return shape; }
-       const Shape *GetShape() const noexcept { return shape; }
-       void SetShape(const Shape *, const glm::vec3 &color);
-       void SetShapeless() noexcept;
+       CompositeInstance &GetModel() noexcept { return model; }
+       const CompositeInstance &GetModel() const noexcept { return model; }
 
        const std::string &Name() const noexcept { return name; }
        void Name(const std::string &n) { name = n; }
@@ -35,56 +33,63 @@ public:
        void WorldCollidable(bool b) noexcept { world_collision = b; }
 
        const glm::vec3 &Velocity() const noexcept { return velocity; }
-       void Velocity(const glm::vec3 &) noexcept;
+       void Velocity(const glm::vec3 &v) noexcept { velocity = v; }
 
-       const Block::Pos &Position() const noexcept { return position; }
-       void Position(const Chunk::Pos &, const Block::Pos &) noexcept;
-       void Position(const Block::Pos &) noexcept;
+       const glm::vec3 &Position() const noexcept { return model.Position(); }
+       void Position(const Chunk::Pos &, const glm::vec3 &) noexcept;
+       void Position(const glm::vec3 &) noexcept;
        void Move(const glm::vec3 &delta) noexcept;
 
        const Chunk::Pos ChunkCoords() const noexcept { return chunk; }
 
        glm::vec3 AbsolutePosition() const noexcept {
-               return glm::vec3(chunk * Chunk::Extent()) + position;
+               return glm::vec3(chunk * Chunk::Extent()) + Position();
        }
        glm::vec3 AbsoluteDifference(const Entity &other) const noexcept {
-               return glm::vec3((chunk - other.chunk) * Chunk::Extent()) + position - other.position;
+               return glm::vec3((chunk - other.chunk) * Chunk::Extent()) + Position() - other.Position();
        }
 
-       const glm::quat &AngularVelocity() const noexcept { return angular_velocity; }
-       void AngularVelocity(const glm::quat &) noexcept;
+       /// direction is rotation axis, magnitude is speed in rad/ms
+       const glm::vec3 &AngularVelocity() const noexcept { return angular_velocity; }
+       void AngularVelocity(const glm::vec3 &v) noexcept { angular_velocity = v; }
 
-       const glm::mat4 &Rotation() const noexcept { return rotation; }
-       void Rotation(const glm::mat4 &) noexcept;
+       const glm::quat &Orientation() const noexcept { return model.Orientation(); }
+       void Orientation(const glm::quat &o) noexcept { model.Orientation(o); }
        void Rotate(const glm::quat &delta) noexcept;
 
+       glm::mat4 ChunkTransform(const Chunk::Pos &chunk_offset) const noexcept;
        glm::mat4 Transform(const Chunk::Pos &chunk_offset) const noexcept;
        Ray Aim(const Chunk::Pos &chunk_offset) const noexcept;
 
-       void Remove() noexcept { remove = true; }
-       bool CanRemove() const noexcept { return remove; }
+       void Ref() noexcept { ++ref_count; }
+       void UnRef() noexcept { --ref_count; }
+       void Kill() noexcept { dead = true; }
+       bool Referenced() const noexcept { return ref_count > 0; }
+       bool Dead() const noexcept { return dead; }
+       bool CanRemove() const noexcept { return dead && ref_count <= 0; }
 
        void Update(int dt) noexcept;
 
-       void Draw() noexcept;
+       void Render(const glm::mat4 &M, DirectionalLighting &prog) noexcept {
+               if (model) model.Render(M, prog);
+       }
 
 private:
-       const Shape *shape;
-       EntityModel model;
+       CompositeInstance model;
 
        std::string name;
 
        AABB bounds;
 
        glm::vec3 velocity;
-       Block::Pos position;
        Chunk::Pos chunk;
 
-       glm::quat angular_velocity;
-       glm::mat4 rotation;
+       glm::vec3 angular_velocity;
+
+       int ref_count;
 
        bool world_collision;
-       bool remove;
+       bool dead;
 
 };