hooray for könig lookup

[blobs.git] / src / world / Planet.hpp

diff --git a/src/world/Planet.hpp b/src/world/Planet.hpp
index 2274d045aed749e9d4b65a4f0eceb075b508db34..2034b8dc4c787b4f30e6a52eb87389402e1c1f95 100644 (file)
--- a/src/world/Planet.hpp
+++ b/src/world/Planet.hpp
@@ -5,8 +5,8 @@
 
 #include "Set.hpp"
 #include "Tile.hpp"
-#include "../graphics/glm.hpp"
 #include "../graphics/SimpleVAO.hpp"
+#include "../math/glm.hpp"
 
 #include <cassert>
 #include <memory>
@@ -35,16 +35,33 @@ public:
        Planet &operator =(Planet &&) = delete;
 
 public:
+       /// surface normal
+       glm::dvec3 NormalAt(const glm::dvec3 &p) const noexcept { return glm::normalize(p); }
+       /// height over surface
+       double ElevationAt(const glm::dvec3 &p) const noexcept { return glm::length(p) - Radius(); }
+       /// distance to planet center
+       double DistanceAt(const glm::dvec3 &p) const noexcept { return glm::length(p); }
+
+       /// get ground tile
+       Tile &TileAt(const glm::dvec3 &) noexcept;
+       const Tile &TileAt(const glm::dvec3 &) const noexcept;
+       const TileType &TileTypeAt(const glm::dvec3 &) const noexcept;
+
        /// Get the tile at given surface and coordinates.
-       Tile &TileAt(int surface, int x, int y) {
-               return tiles[IndexOf(surface, x, y)];
-       }
-       const Tile &TileAt(int surface, int x, int y) const {
-               return tiles[IndexOf(surface, x, y)];
-       }
+       Tile &TileAt(int surface, int x, int y) noexcept;
+       const Tile &TileAt(int surface, int x, int y) const noexcept;
+       const TileType &TypeAt(int surface, int x, int y) const noexcept;
 
-       const TileType &TypeAt(int surface, int x, int y) const;
+       /// The length in tiles of the side of each surface.
+       int SideLength() const { return sidelength; }
+
+       // center point of tile on surface at elevation
+       glm::dvec3 TileCenter(int surface, int x, int y, double elevation = 0.0) const noexcept;
+
+       void BuildVAO(const Set<TileType> &);
+       void Draw(app::Assets &, graphics::Viewport &) override;
 
+private:
        /// Convert coordinates into a tile index.
        int IndexOf(int surface, int x, int y) const {
                assert(0 <= surface && surface <= 5);
@@ -52,10 +69,6 @@ public:
                assert(0 <= y && y < sidelength);
                return surface * TilesPerSurface() + y * SideLength() + x;
        }
-       /// The length of the side of each surface.
-       int SideLength() const {
-               return sidelength;
-       }
        /// The number of tiles of one surface.
        int TilesPerSurface() const {
                return SideLength() * SideLength();
@@ -65,25 +78,13 @@ public:
                return 6 * TilesPerSurface();
        }
 
-       double TileToPosition(int t) const noexcept { return double(t) - Radius(); }
-       int PositionToTile(double p) const noexcept { return int(p + Radius()); }
-
-       // tile coordinates of position on surface
-       glm::ivec2 SurfacePosition(int surface, const glm::dvec3 &) const noexcept;
-       // height of point over surface
-       double SurfaceElevation(int surface, const glm::dvec3 &) const noexcept;
-       // center point of tile on surface at elevation
-       glm::dvec3 TileCenter(int surface, int x, int y, double elevation = 0.0) const noexcept;
-
-       void BuildVAO(const Set<TileType> &);
-       void Draw(app::Assets &, graphics::Viewport &) override;
-
 private:
        int sidelength;
        std::vector<Tile> tiles;
 
        struct Attributes {
                glm::vec3 position;
+               glm::vec3 normal;
                glm::vec3 tex_coord;
        };
        std::unique_ptr<graphics::SimpleVAO<Attributes, unsigned int>> vao;