split according to parent heading

[blobs.git] / src / creature / Situation.hpp

diff --git a/src/creature/Situation.hpp b/src/creature/Situation.hpp
index 4d635f5e8ba223ba94225df3b2701ccd4767485c..8df8a7a4c8867dc07f0743d61a8654fd12285aa0 100644 (file)
--- a/src/creature/Situation.hpp
+++ b/src/creature/Situation.hpp
@@ -53,10 +53,8 @@ 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 state.pos; }
-       bool OnTile() const noexcept;
-       glm::ivec2 SurfacePosition() const noexcept;
+       glm::dvec3 SurfaceNormal() const noexcept;
        world::Tile &GetTile() const noexcept;
        const world::TileType &GetTileType() const noexcept;
 
@@ -64,20 +62,20 @@ public:
        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.000001; }
+       bool Moving() const noexcept { return glm::length2(state.vel) > 0.00001; }
        void Move(const glm::dvec3 &dp) noexcept;
        void Accelerate(const glm::dvec3 &dv) noexcept;
        void EnforceConstraints(State &) noexcept;
+       void CheckWrap() noexcept;
 
        void Heading(const glm::dvec3 &h) noexcept { state.dir = h; }
        const glm::dvec3 &Heading() const noexcept { return state.dir; }
 
-       void SetPlanetSurface(world::Planet &, int srf, const glm::dvec3 &pos) noexcept;
+       void SetPlanetSurface(world::Planet &, const glm::dvec3 &pos) noexcept;
 
 public:
        world::Planet *planet;
        State state;
-       int surface;
        enum {
                LOST,
                PLANET_SURFACE,