X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FEntity.hpp;h=f60bf4cc6e01c2537a8c3c0927292e867a743e79;hb=39df551265bff648c1ac166043bb4b046122cc8d;hp=83c1f6fb0889b88697365e34a129b15aa7dc076f;hpb=b7d09e1e35ef90282c97509e0020b20db3c7ea9f;p=blank.git

diff --git a/src/world/Entity.hpp b/src/world/Entity.hpp
index 83c1f6f..f60bf4c 100644
--- 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 {
@@ -21,42 +22,72 @@ public:
 
 	bool HasShape() const noexcept { return shape; }
 	const Shape *GetShape() const noexcept { return shape; }
-	void SetShape(const Shape *, const glm::vec3 &color);
+	void SetShape(const Shape *, const glm::vec3 &color, float texture);
 	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; }
 
-	const glm::quat &AngularVelocity() const noexcept { return angular_velocity; }
-	void AngularVelocity(const glm::quat &) noexcept;
+	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;
+	}
+
+	/// direction is rotation axis, magnitude is speed in rad/ms
+	const glm::vec3 &AngularVelocity() const noexcept { return angular_velocity; }
+	void AngularVelocity(const glm::vec3 &) noexcept;
 
-	const glm::mat4 &Rotation() const noexcept { return rotation; }
-	void Rotation(const glm::mat4 &) noexcept;
+	const glm::quat &Rotation() const noexcept { return rotation; }
+	void Rotation(const glm::quat &) noexcept;
 	void Rotate(const glm::quat &delta) 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 Update(int dt) noexcept;
 
-	void Draw() noexcept;
+	void Draw() noexcept {
+		model.Draw();
+	}
 
 private:
 	const Shape *shape;
-	Model model;
+	EntityModel 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;
+	glm::quat rotation;
+
+	bool world_collision;
+	bool remove;
 
 };