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

diff --git a/src/world.hpp b/src/world.hpp
index 304c63a..b7ed84b 100644
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -2,6 +2,7 @@
 #define BLANK_WORLD_HPP_
 
 #include "model.hpp"
+#include "geometry.hpp"
 
 #include <vector>
 #include <GL/glew.h>
@@ -13,10 +14,15 @@ namespace blank {
 /// attributes of a type of block
 struct BlockType {
 
+	int id;
+
 	bool visible;
+	glm::vec3 color;
 
-	constexpr explicit BlockType(bool v = false)
-	: visible(v) { }
+	constexpr explicit BlockType(
+		bool v = false,
+		const glm::vec3 &color = { 1, 1, 1 })
+	: id(-1), visible(v), color(color) { }
 
 	static const BlockType DEFAULT;
 
@@ -35,6 +41,23 @@ struct BlockType {
 };
 
 
+class BlockTypeRegistry {
+
+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;
+
+};
+
+
 /// single 1x1x1 cube
 struct Block {
 
@@ -73,6 +96,8 @@ public:
 	Block &BlockAt(const glm::vec3 &pos) { return blocks[ToIndex(pos)]; }
 	const Block &BlockAt(const glm::vec3 &pos) const { return blocks[ToIndex(pos)]; }
 
+	bool Intersection(const Ray &, const glm::mat4 &M, int *blkid = nullptr, float *dist = nullptr) const;
+
 	void Draw();
 
 private: