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

diff --git a/src/world.hpp b/src/world.hpp
index 83fd3e8..ce44c7c 100644
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -3,6 +3,7 @@
 
 #include "geometry.hpp"
 #include "model.hpp"
+#include "noise.hpp"
 #include "shape.hpp"
 
 #include <list>
@@ -32,7 +33,7 @@ struct BlockType {
 	: id(-1), visible(v), shape(shape), color(color), outline_color(outline_color) { }
 
 	static const BlockType DEFAULT;
-	static const CuboidShape DEFAULT_SHAPE;
+	static const NullShape DEFAULT_SHAPE;
 
 
 	void FillVBO(
@@ -69,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]; }
 
@@ -111,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())
 		);
 	}
 
@@ -184,8 +187,12 @@ private:
 private:
 	BlockTypeRegistry blockType;
 	CuboidShape blockShape;
+	StairShape stairShape;
 	CuboidShape slabShape;
 
+	SimplexNoise blockNoise;
+	SimplexNoise colorNoise;
+
 	std::list<Chunk> chunks;
 
 };