X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorldCollision.hpp;h=3c81595b714d9bd94104048633950a98da9a4a1a;hb=d2fa8ca97d291508ce3812fb052a8255d3190d00;hp=eb2e5e2871a334bfe02e1bd0be24a5c48572af98;hpb=32909aa3224ec0ed5656721178eb6ad31cd047df;p=blank.git

diff --git a/src/world/WorldCollision.hpp b/src/world/WorldCollision.hpp
index eb2e5e2..3c81595 100644
--- a/src/world/WorldCollision.hpp
+++ b/src/world/WorldCollision.hpp
@@ -1,24 +1,44 @@
 #ifndef BLANK_WORLD_WORLDCOLLISION_HPP_
 #define BLANK_WORLD_WORLDCOLLISION_HPP_
 
+#include "BlockType.hpp"
+#include "Chunk.hpp"
+
 #include <glm/glm.hpp>
 
 
 namespace blank {
 
-class Chunk;
-
 struct WorldCollision {
 
-	const Chunk *chunk;
+	Chunk *chunk;
 	int block;
 
 	float depth;
 	glm::vec3 normal;
 
-	WorldCollision(const Chunk *c, int b, float d, const glm::vec3 &n)
+	WorldCollision()
+	: chunk(nullptr), block(-1), depth(0.0f), normal(0.0f) { }
+	WorldCollision(Chunk *c, int b, float d, const glm::vec3 &n)
 	: chunk(c), block(b), depth(d), normal(n) { }
 
+	/// check if an actual collision
+	operator bool() const noexcept { return chunk; }
+
+	// following only valid if test true
+	Chunk &GetChunk() noexcept { return *chunk; }
+	const Chunk &GetChunk() const noexcept { return *chunk; }
+	const Block &GetBlock() const noexcept { return GetChunk().BlockAt(block); }
+	const BlockType &GetType() const noexcept { return GetChunk().Type(GetBlock()); }
+
+	void SetBlock(const Block &b) noexcept { GetChunk().SetBlock(block, b); }
+
+	bool Blocks() const noexcept { return chunk->Type(block).collide_block; }
+
+	glm::vec3 BlockPos() const noexcept { return Chunk::ToPos(block); }
+	glm::vec3 BlockCoords() const noexcept { return Chunk::ToCoords(block); }
+	glm::mat4 BlockTransform() const noexcept { return GetChunk().ToTransform(BlockPos(), block); }
+
 };
 
 }