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

diff --git a/src/world.hpp b/src/world.hpp
index b7ed84b..8ef2b21 100644
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -1,113 +1,61 @@
 #ifndef BLANK_WORLD_HPP_
 #define BLANK_WORLD_HPP_
 
-#include "model.hpp"
-#include "geometry.hpp"
-
-#include <vector>
-#include <GL/glew.h>
+#include "block.hpp"
+#include "chunk.hpp"
+#include "entity.hpp"
+#include "noise.hpp"
+#include "shader.hpp"
+#include "shape.hpp"
+
+#include <list>
 #include <glm/glm.hpp>
 
 
 namespace blank {
 
-/// attributes of a type of block
-struct BlockType {
-
-	int id;
-
-	bool visible;
-	glm::vec3 color;
-
-	constexpr explicit BlockType(
-		bool v = false,
-		const glm::vec3 &color = { 1, 1, 1 })
-	: id(-1), visible(v), color(color) { }
-
-	static const BlockType DEFAULT;
-
-
-	void FillVBO(
-		const glm::vec3 &pos,
-		std::vector<glm::vec3> &vertices,
-		std::vector<glm::vec3> &colors,
-		std::vector<glm::vec3> &normals
-	) const;
-
-	void FillModel(const glm::vec3 &pos, Model &m) const {
-		FillVBO(pos, m.vertices, m.colors, m.normals);
-	}
-
-};
-
-
-class BlockTypeRegistry {
+class World {
 
 public:
-	BlockTypeRegistry();
+	World();
 
-public:
-	int Add(const BlockType &);
+	void Generate(const glm::tvec3<int> &from, const glm::tvec3<int> &to);
 
-	BlockType *operator [](int id) { return &types[id]; }
-	const BlockType *Get(int id) const { return &types[id]; }
+	bool Intersection(
+		const Ray &,
+		const glm::mat4 &M,
+		Chunk **chunk = nullptr,
+		int *blkid = nullptr,
+		float *dist = nullptr,
+		glm::vec3 *normal = nullptr);
 
-private:
-	std::vector<BlockType> types;
+	BlockTypeRegistry &BlockTypes() { return blockType; }
+	std::list<Chunk> &LoadedChunks() { return loaded; }
 
-};
+	Entity &Player() { return player; }
 
+	Chunk &Next(const Chunk &, const glm::vec3 &dir);
 
-/// single 1x1x1 cube
-struct Block {
+	void Update(int dt);
 
-	const BlockType *type;
+	void Render(DirectionalLighting &);
 
-	constexpr explicit Block(const BlockType *t = &BlockType::DEFAULT)
-	: type(t) { }
-
-};
-
-
-/// cube of size 16 (256 tiles, 4096 blocks)
-class Chunk {
-
-public:
-	Chunk();
-
-	static constexpr int Width() { return 16; }
-	static constexpr int Height() { return 16; }
-	static constexpr int Depth() { return 16; }
-	static constexpr int Size() { return Width() * Height() * Depth(); }
-
-	static constexpr int ToIndex(const glm::vec3 &pos) {
-		return pos.x + pos.y * Width() + pos.z * Width() * Height();
-	}
-	static glm::vec3 ToCoords(int idx) {
-		return glm::vec3(
-			idx % Width(),
-			(idx / Width()) % Height(),
-			idx / (Width() * Height())
-		);
-	}
-
-	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)]; }
+private:
+	void Generate(Chunk &);
 
-	bool Intersection(const Ray &, const glm::mat4 &M, int *blkid = nullptr, float *dist = nullptr) const;
+private:
+	BlockTypeRegistry blockType;
+	CuboidShape blockShape;
+	StairShape stairShape;
+	CuboidShape slabShape;
 
-	void Draw();
+	SimplexNoise blockNoise;
+	SimplexNoise colorNoise;
 
-private:
-	int VertexCount() const;
-	void Update();
+	Entity player;
 
-private:
-	std::vector<Block> blocks;
-	Model model;
-	bool dirty;
+	std::list<Chunk> loaded;
+	std::list<Chunk> to_generate;
 
 };