X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorldCollision.hpp;h=65cba9de58f5140b664dc2fbbd7e80fed8717957;hb=1bc2f230105ad6e1ee8d999ddc079cd85d244bf9;hp=ebf01c17cd0362bfda3f1ba15f674367b8205bc2;hpb=955fbb45dedb570520fc45d2ce69f420bed2ad08;p=blank.git

diff --git a/src/world/WorldCollision.hpp b/src/world/WorldCollision.hpp
index ebf01c1..65cba9d 100644
--- a/src/world/WorldCollision.hpp
+++ b/src/world/WorldCollision.hpp
@@ -11,18 +11,35 @@ namespace blank {
 
 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 BlockCoords() const noexcept { return Chunk::ToCoords(block); }
+	const ExactLocation::Coarse &ChunkPos() const noexcept { return GetChunk().Position(); }
+
+	RoughLocation::Fine BlockPos() const noexcept { return Chunk::ToPos(block); }
+	ExactLocation::Fine BlockCoords() const noexcept { return Chunk::ToCoords(block); }
+	glm::mat4 BlockTransform() const noexcept { return GetChunk().ToTransform(BlockPos(), block); }
 
 };