X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld.hpp;h=b5c4a29cc66688f9c7a10b0a9150c71122c37718;hb=3072e2cd49ad1614100d1a1c73afe6a4888fb875;hp=58f7a25faeea7e8c8a622cf65d247a0bb022bf99;hpb=ac8765b510707d77cac9620778f40ddf3a4ad2a2;p=blank.git

diff --git a/src/world.hpp b/src/world.hpp
index 58f7a25..b5c4a29 100644
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -1,110 +1,55 @@
 #ifndef BLANK_WORLD_HPP_
 #define BLANK_WORLD_HPP_
 
-#include "model.hpp"
-
-#include <vector>
-#include <GL/glew.h>
+#include "block.hpp"
+#include "chunk.hpp"
+#include "entity.hpp"
+#include "generator.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();
-
-public:
-	int Add(const BlockType &);
-
-	BlockType *operator [](int id) { return &types[id]; }
-	const BlockType *Get(int id) const { return &types[id]; }
-
-private:
-	std::vector<BlockType> types;
-
-};
+	World();
 
+	bool Intersection(
+		const Ray &,
+		const glm::mat4 &M,
+		Chunk **chunk = nullptr,
+		int *blkid = nullptr,
+		float *dist = nullptr,
+		glm::vec3 *normal = nullptr);
 
-/// single 1x1x1 cube
-struct Block {
+	BlockTypeRegistry &BlockTypes() { return blockType; }
 
-	const BlockType *type;
+	Entity &Player() { return *player; }
+	Entity &AddEntity() { entities.emplace_back(); return entities.back(); }
 
-	constexpr explicit Block(const BlockType *t = &BlockType::DEFAULT)
-	: type(t) { }
-
-};
+	Chunk &PlayerChunk();
+	Chunk &Next(const Chunk &to, const glm::tvec3<int> &dir);
 
+	void Update(int dt);
 
-/// 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)]; }
-
-	void Draw();
+	void Render(DirectionalLighting &);
 
 private:
-	int VertexCount() const;
-	void Update();
+	BlockTypeRegistry blockType;
+	CuboidShape blockShape;
+	StairShape stairShape;
+	CuboidShape slabShape;
 
-private:
-	std::vector<Block> blocks;
-	Model model;
-	bool dirty;
+	Generator generate;
+	ChunkLoader chunks;
+
+	Entity *player;
+	std::list<Entity> entities;
 
 };