X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld.hpp;h=9fb07798c3f976569d4052cb916dc359d702adca;hb=e7a968ef0ae496d1d45d63a25df59db31f9b966f;hp=b7ed84bd5a71fbfa60415b70c9e84b74b72d8739;hpb=4d0ef1687987a0801469c7262f81efd36636605a;p=blank.git

diff --git a/src/world.hpp b/src/world.hpp
index b7ed84b..9fb0779 100644
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -4,6 +4,7 @@
 #include "model.hpp"
 #include "geometry.hpp"
 
+#include <list>
 #include <vector>
 #include <GL/glew.h>
 #include <glm/glm.hpp>
@@ -18,11 +19,13 @@ struct BlockType {
 
 	bool visible;
 	glm::vec3 color;
+	glm::vec3 outline_color;
 
 	constexpr explicit BlockType(
 		bool v = false,
-		const glm::vec3 &color = { 1, 1, 1 })
-	: id(-1), visible(v), color(color) { }
+		const glm::vec3 &color = { 1, 1, 1 },
+		const glm::vec3 &outline_color = { -1, -1, -1 })
+	: id(-1), visible(v), color(color), outline_color(outline_color) { }
 
 	static const BlockType DEFAULT;
 
@@ -36,6 +39,18 @@ struct BlockType {
 
 	void FillModel(const glm::vec3 &pos, Model &m) const {
 		FillVBO(pos, m.vertices, m.colors, m.normals);
+		m.Invalidate();
+	}
+
+
+	void FillOutlineVBO(
+		std::vector<glm::vec3> &vertices,
+		std::vector<glm::vec3> &colors
+	) const;
+
+	void FillOutlineModel(OutlineModel &m) const {
+		FillOutlineVBO(m.vertices, m.colors);
+		m.Invalidate();
 	}
 
 };
@@ -75,14 +90,27 @@ class Chunk {
 public:
 	Chunk();
 
+	Chunk(Chunk &&);
+	Chunk &operator =(Chunk &&);
+
 	static constexpr int Width() { return 16; }
 	static constexpr int Height() { return 16; }
 	static constexpr int Depth() { return 16; }
+	static glm::vec3 Extent() { return glm::vec3(Width(), Height(), Depth()); }
 	static constexpr int Size() { return Width() * Height() * Depth(); }
 
+	static constexpr bool InBounds(const glm::vec3 &pos) {
+		return
+			pos.x >= 0 && pos.x < Width() &&
+			pos.y >= 0 && pos.y < Height() &&
+			pos.z >= 0 && pos.z < Depth();
+	}
 	static constexpr int ToIndex(const glm::vec3 &pos) {
 		return pos.x + pos.y * Width() + pos.z * Width() * Height();
 	}
+	static constexpr bool InBounds(int idx) {
+		return idx >= 0 && idx < Size();
+	}
 	static glm::vec3 ToCoords(int idx) {
 		return glm::vec3(
 			idx % Width(),
@@ -93,10 +121,21 @@ public:
 
 	void Invalidate() { dirty = true; }
 
-	Block &BlockAt(const glm::vec3 &pos) { return blocks[ToIndex(pos)]; }
-	const Block &BlockAt(const glm::vec3 &pos) const { return blocks[ToIndex(pos)]; }
+	Block &BlockAt(int index) { return blocks[index]; }
+	const Block &BlockAt(int index) const { return blocks[index]; }
+	Block &BlockAt(const glm::vec3 &pos) { return BlockAt(ToIndex(pos)); }
+	const Block &BlockAt(const glm::vec3 &pos) const { return BlockAt(ToIndex(pos)); }
 
-	bool Intersection(const Ray &, const glm::mat4 &M, int *blkid = nullptr, float *dist = nullptr) const;
+	bool Intersection(
+		const Ray &,
+		const glm::mat4 &M,
+		int *blkid = nullptr,
+		float *dist = nullptr,
+		glm::vec3 *normal = nullptr) const;
+
+	void Position(const glm::vec3 &);
+	const glm::vec3 &Position() const { return position; }
+	const glm::mat4 &Transform() const { return transform; }
 
 	void Draw();
 
@@ -107,10 +146,42 @@ private:
 private:
 	std::vector<Block> blocks;
 	Model model;
+	glm::vec3 position;
+	glm::mat4 transform;
 	bool dirty;
 
 };
 
+
+class World {
+
+public:
+	World();
+
+	void Generate();
+
+	bool Intersection(
+		const Ray &,
+		const glm::mat4 &M,
+		Chunk **chunk = nullptr,
+		int *blkid = nullptr,
+		float *dist = nullptr,
+		glm::vec3 *normal = nullptr);
+
+	BlockTypeRegistry &BlockTypes() { return blockType; }
+	std::list<Chunk> &LoadedChunks() { return chunks; }
+
+	Chunk &Next(const Chunk &, const glm::vec3 &dir);
+
+private:
+	Chunk &Generate(const glm::vec3 &);
+
+private:
+	BlockTypeRegistry blockType;
+	std::list<Chunk> chunks;
+
+};
+
 }
 
 #endif