X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld.hpp;h=6fabe9a0725e69b63a93797bb673788ca60abb6b;hb=d6435142245c019523b9385048d6d79bdd2565f2;hp=9f29ab4ee4ff09b579689765b96872a2eb5f8766;hpb=5700ea3c08ea5e4a5c743f0413b65dc8eebfd220;p=blank.git

diff --git a/src/world.hpp b/src/world.hpp
index 9f29ab4..6fabe9a 100644
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -1,8 +1,9 @@
 #ifndef BLANK_WORLD_HPP_
 #define BLANK_WORLD_HPP_
 
-#include "model.hpp"
 #include "geometry.hpp"
+#include "model.hpp"
+#include "shape.hpp"
 
 #include <list>
 #include <vector>
@@ -18,14 +19,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 })
-	: id(-1), visible(v), color(color) { }
+		const glm::vec3 &color = { 1, 1, 1 },
+		const Shape *shape = &DEFAULT_SHAPE,
+		const glm::vec3 &outline_color = { -1, -1, -1 })
+	: id(-1), visible(v), shape(shape), color(color), outline_color(outline_color) { }
 
 	static const BlockType DEFAULT;
+	static const CuboidShape DEFAULT_SHAPE;
 
 
 	void FillVBO(
@@ -37,6 +44,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();
 	}
 
 };
@@ -50,6 +69,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]; }
 
@@ -164,6 +185,10 @@ private:
 
 private:
 	BlockTypeRegistry blockType;
+	CuboidShape blockShape;
+	StairShape stairShape;
+	CuboidShape slabShape;
+
 	std::list<Chunk> chunks;
 
 };