simple preloader

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

diff --git a/src/world/Entity.hpp b/src/world/Entity.hpp
index 83c1f6fb0889b88697365e34a129b15aa7dc076f..25818c6f3da5666b671666a600ace04a9552e093 100644 (file)
--- a/src/world/Entity.hpp
+++ b/src/world/Entity.hpp
@@ -3,15 +3,16 @@
 
 #include "Block.hpp"
 #include "Chunk.hpp"
-#include "../model/Model.hpp"
+#include "../model/geometry.hpp"
+#include "../model/EntityModel.hpp"
 
+#include <string>
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
 
 
 namespace blank {
 
-class Ray;
 class Shape;
 
 class Entity {
@@ -24,15 +25,32 @@ public:
        void SetShape(const Shape *, const glm::vec3 &color);
        void SetShapeless() noexcept;
 
+       const std::string &Name() const noexcept { return name; }
+       void Name(const std::string &n) { name = n; }
+
+       const AABB &Bounds() const noexcept { return bounds; }
+       void Bounds(const AABB &b) noexcept { bounds = b; }
+
+       bool WorldCollidable() const noexcept { return world_collision; }
+       void WorldCollidable(bool b) noexcept { world_collision = b; }
+
        const glm::vec3 &Velocity() const noexcept { return velocity; }
        void Velocity(const glm::vec3 &) noexcept;
 
        const Block::Pos &Position() const noexcept { return position; }
+       void Position(const Chunk::Pos &, const Block::Pos &) noexcept;
        void Position(const Block::Pos &) 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;
+       }
+       glm::vec3 AbsoluteDifference(const Entity &other) const noexcept {
+               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;
 
@@ -43,13 +61,20 @@ public:
        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 Update(int dt) noexcept;
 
        void Draw() noexcept;
 
 private:
        const Shape *shape;
-       Model model;
+       EntityModel model;
+
+       std::string name;
+
+       AABB bounds;
 
        glm::vec3 velocity;
        Block::Pos position;
@@ -58,6 +83,9 @@ private:
        glm::quat angular_velocity;
        glm::mat4 rotation;
 
+       bool world_collision;
+       bool remove;
+
 };
 
 }