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

diff --git a/src/world.hpp b/src/world.hpp
index 9fb0779..ce44c7c 100644
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -1,8 +1,10 @@
 #ifndef BLANK_WORLD_HPP_
 #define BLANK_WORLD_HPP_
 
-#include "model.hpp"
 #include "geometry.hpp"
+#include "model.hpp"
+#include "noise.hpp"
+#include "shape.hpp"
 
 #include <list>
 #include <vector>
@@ -18,16 +20,20 @@ struct BlockType {
 	int id;
 
 	bool visible;
+
+	const Shape *shape;
 	glm::vec3 color;
 	glm::vec3 outline_color;
 
-	constexpr explicit BlockType(
+	explicit BlockType(
 		bool v = false,
 		const glm::vec3 &color = { 1, 1, 1 },
+		const Shape *shape = &DEFAULT_SHAPE,
 		const glm::vec3 &outline_color = { -1, -1, -1 })
-	: id(-1), visible(v), color(color), outline_color(outline_color) { }
+	: id(-1), visible(v), shape(shape), color(color), outline_color(outline_color) { }
 
 	static const BlockType DEFAULT;
+	static const NullShape DEFAULT_SHAPE;
 
 
 	void FillVBO(
@@ -64,6 +70,8 @@ public:
 public:
 	int Add(const BlockType &);
 
+	size_t Size() const { return types.size(); }
+
 	BlockType *operator [](int id) { return &types[id]; }
 	const BlockType *Get(int id) const { return &types[id]; }
 
@@ -106,16 +114,16 @@ public:
 			pos.z >= 0 && pos.z < Depth();
 	}
 	static constexpr int ToIndex(const glm::vec3 &pos) {
-		return pos.x + pos.y * Width() + pos.z * Width() * Height();
+		return int(pos.x) + int(pos.y) * Width() + int(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(),
-			(idx / Width()) % Height(),
-			idx / (Width() * Height())
+			0.5f + idx % Width(),
+			0.5f + (idx / Width()) % Height(),
+			0.5f + idx / (Width() * Height())
 		);
 	}
 
@@ -178,6 +186,13 @@ private:
 
 private:
 	BlockTypeRegistry blockType;
+	CuboidShape blockShape;
+	StairShape stairShape;
+	CuboidShape slabShape;
+
+	SimplexNoise blockNoise;
+	SimplexNoise colorNoise;
+
 	std::list<Chunk> chunks;
 
 };