X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcreature%2FSituation.hpp;h=f29d9b08b96b0e5c07c4bb588e5a1f0cfa896928;hb=6c1097479fd1ea41f0f76b91e67613822acf2e90;hp=d4a376a8d6f25cfdd853cf46ab729553ec353f0a;hpb=2025d49798b93180237b6ce62d3ff5d6ee8ebc6e;p=blobs.git

diff --git a/src/creature/Situation.hpp b/src/creature/Situation.hpp
index d4a376a..f29d9b0 100644
--- a/src/creature/Situation.hpp
+++ b/src/creature/Situation.hpp
@@ -1,7 +1,7 @@
 #ifndef BLOBS_CREATURE_SITUATION_HPP_
 #define BLOBS_CREATURE_SITUATION_HPP_
 
-#include "../graphics/glm.hpp"
+#include "../math/glm.hpp"
 
 
 namespace blobs {
@@ -14,24 +14,56 @@ namespace creature {
 
 class Situation {
 
+public:
+	struct State {
+		glm::dvec3 pos;
+		glm::dvec3 vel;
+		State(
+			const glm::dvec3 &pos = glm::dvec3(0.0),
+			const glm::dvec3 &vel = glm::dvec3(0.0))
+		: pos(pos), vel(vel) { }
+	};
+	struct Derivative {
+		glm::dvec3 vel;
+		glm::dvec3 acc;
+		Derivative(
+			const glm::dvec3 &vel = glm::dvec3(0.0),
+			const glm::dvec3 &acc = glm::dvec3(0.0))
+		: vel(vel), acc(acc) { }
+	};
+
 public:
 	Situation();
 	~Situation();
 
+	Situation(const Situation &) = delete;
+	Situation &operator =(const Situation &) = delete;
+
+	Situation(Situation &&) = delete;
+	Situation &operator =(Situation &&) = delete;
+
 public:
 	bool OnPlanet() const noexcept;
 	world::Planet &GetPlanet() const noexcept { return *planet; }
 	bool OnSurface() const noexcept;
 	int Surface() const noexcept { return surface; }
-	const glm::dvec3 &Position() const noexcept { return position; }
+	const glm::dvec3 &Position() const noexcept { return state.pos; }
+	bool OnTile() const noexcept;
+	glm::ivec2 SurfacePosition() const noexcept;
 	world::Tile &GetTile() const noexcept;
 	const world::TileType &GetTileType() const noexcept;
 
+	void SetState(const State &s) noexcept { state = s; }
+	const State &GetState() const noexcept { return state; }
+
+	const glm::dvec3 &Velocity() const noexcept { return state.vel; }
+	bool Moving() const noexcept { return glm::length2(state.vel) < 0.00000001; }
+	void Move(const glm::dvec3 &dp) noexcept;
 	void SetPlanetSurface(world::Planet &, int srf, const glm::dvec3 &pos) noexcept;
 
 public:
 	world::Planet *planet;
-	glm::dvec3 position;
+	State state;
 	int surface;
 	enum {
 		LOST,