X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FEntity.hpp;h=f60bf4cc6e01c2537a8c3c0927292e867a743e79;hb=34a7fafb4c2d4ed95eb990eda5c02d5c79d3411b;hp=25818c6f3da5666b671666a600ace04a9552e093;hpb=aefc5482b27e3d259b6c9f3f1e4cdd9ef2e6a8d2;p=blank.git

diff --git a/src/world/Entity.hpp b/src/world/Entity.hpp
index 25818c6..f60bf4c 100644
--- a/src/world/Entity.hpp
+++ b/src/world/Entity.hpp
@@ -22,7 +22,7 @@ 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; }
@@ -51,11 +51,12 @@ public:
 		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 &) 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;
@@ -66,7 +67,9 @@ public:
 
 	void Update(int dt) noexcept;
 
-	void Draw() noexcept;
+	void Draw() noexcept {
+		model.Draw();
+	}
 
 private:
 	const Shape *shape;
@@ -80,8 +83,8 @@ private:
 	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;