X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FPlanet.hpp;h=237159994c47da1c9dbd1e23bd235ffd2214cbb0;hb=cd80d7cfcac3c58d601db2ab4e0381dd77c06f44;hp=991985f968173e2eb98f0ddac4b4e3fcdaa9984f;hpb=b795a1df619349d45c3b0ca73e61e68ff483221c;p=blobs.git

diff --git a/src/world/Planet.hpp b/src/world/Planet.hpp
index 991985f..2371599 100644
--- a/src/world/Planet.hpp
+++ b/src/world/Planet.hpp
@@ -5,10 +5,11 @@
 
 #include "Set.hpp"
 #include "Tile.hpp"
-#include "../graphics/glm.hpp"
 #include "../graphics/SimpleVAO.hpp"
+#include "../math/glm.hpp"
 
 #include <cassert>
+#include <memory>
 #include <vector>
 #include <GL/glew.h>
 
@@ -34,25 +35,40 @@ public:
 	Planet &operator =(Planet &&) = delete;
 
 public:
+	/// surface normal
+	glm::dvec3 NormalAt(const glm::dvec3 &p) const noexcept { return normalize(p); }
+	/// height over surface
+	double ElevationAt(const glm::dvec3 &p) const noexcept { return length(p) - Radius(); }
+	/// distance to planet center
+	double DistanceAt(const glm::dvec3 &p) const noexcept { return 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;
+
+	/// 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);
-		assert(0 <= x && x <= sidelength);
-		assert(0 <= y && y <= sidelength);
+		assert(0 <= x && x < sidelength);
+		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();
@@ -62,26 +78,16 @@ public:
 		return 6 * TilesPerSurface();
 	}
 
-	glm::dvec3 TileCenter(int surface, int x, int y) const noexcept;
-
-	void Atmosphere(int a) noexcept { atmosphere = a; }
-	int Atmosphere() const noexcept { return atmosphere; }
-	bool HasAtmosphere() const noexcept { return atmosphere >= 0; }
-
-	void BuildVAO(const Set<TileType> &);
-	void Draw(app::Assets &, graphics::Viewport &) override;
-
 private:
 	int sidelength;
 	std::vector<Tile> tiles;
 
-	int atmosphere;
-
 	struct Attributes {
 		glm::vec3 position;
+		glm::vec3 normal;
 		glm::vec3 tex_coord;
 	};
-	graphics::SimpleVAO<Attributes, unsigned int> vao;
+	std::unique_ptr<graphics::SimpleVAO<Attributes, unsigned int>> vao;
 
 };