X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FChunk.hpp;h=67794145290ea8adcbaef3dc00618f0122cb93d6;hb=242b87a5fb412f9006e4b7debc1408cf7ac83000;hp=8d6816c29b8f526527bbb8fb07688f74132c340c;hpb=6f94235a5b7c140852703e60c8a74760b8b61d99;p=blank.git

diff --git a/src/world/Chunk.hpp b/src/world/Chunk.hpp
index 8d6816c..6779414 100644
--- a/src/world/Chunk.hpp
+++ b/src/world/Chunk.hpp
@@ -3,9 +3,11 @@
 
 #include "Block.hpp"
 #include "BlockTypeRegistry.hpp"
-#include "../model/BlockModel.hpp"
-#include "../model/geometry.hpp"
+#include "../geometry/Location.hpp"
+#include "../geometry/primitive.hpp"
 
+#include <set>
+#include <vector>
 #include <glm/glm.hpp>
 #include <glm/gtx/transform.hpp>
 
@@ -13,156 +15,213 @@
 namespace blank {
 
 class BlockType;
+class Entity;
+class WorldCollision;
 
 /// cube of size 16 (256 tiles, 4096 blocks)
 class Chunk {
 
-public:
-	using Pos = glm::tvec3<int>;
-
 public:
 	explicit Chunk(const BlockTypeRegistry &) noexcept;
 
 	Chunk(Chunk &&) noexcept;
 	Chunk &operator =(Chunk &&) noexcept;
 
-	static constexpr int width = 16;
-	static constexpr int height = 16;
-	static constexpr int depth = 16;
-	static Pos Extent() noexcept { return { width, height, depth }; }
-	static constexpr int size = width * height * depth;
+	static constexpr int side = ExactLocation::scale;
+	static constexpr float fside = ExactLocation::fscale;
+	static constexpr int size = side * side * side;
+
+	static AABB Bounds() noexcept { return AABB{ { 0.0f, 0.0f, 0.0f }, ExactLocation::FExtent() }; }
+	static glm::vec3 Center() noexcept { return glm::vec3(8.0f); }
+	static float Radius() noexcept { return 27.71281292110203669632f; /* 16 * √3 */ }
 
-	static AABB Bounds() noexcept { return AABB{ { 0, 0, 0 }, Extent() }; }
+	/// get bounding box relative to given reference chunk
+	AABB RelativeBounds(const ExactLocation::Coarse &ref) const noexcept {
+		AABB bounds;
+		bounds.min = (position - ref) * ExactLocation::Extent();
+		bounds.max = bounds.min + ExactLocation::FExtent();
+		return bounds;
+	}
 
-	static constexpr bool InBounds(const Block::Pos &pos) noexcept {
+	static constexpr bool InBounds(const ExactLocation::Fine &pos) noexcept {
 		return
-			pos.x >= 0 && pos.x < width &&
-			pos.y >= 0 && pos.y < height &&
-			pos.z >= 0 && pos.z < depth;
+			pos.x >= 0.0f && pos.x < fside &&
+			pos.y >= 0.0f && pos.y < fside &&
+			pos.z >= 0.0f && pos.z < fside;
 	}
-	static constexpr bool InBounds(const Pos &pos) noexcept {
+	static constexpr bool InBounds(const RoughLocation::Fine &pos) noexcept {
 		return
-			pos.x >= 0 && pos.x < width &&
-			pos.y >= 0 && pos.y < height &&
-			pos.z >= 0 && pos.z < depth;
+			pos.x >= 0 && pos.x < side &&
+			pos.y >= 0 && pos.y < side &&
+			pos.z >= 0 && pos.z < side;
 	}
-	static constexpr int ToIndex(const Pos &pos) noexcept {
-		return pos.x + pos.y * width + pos.z * width * height;
+	static constexpr int ToIndex(const RoughLocation::Fine &pos) noexcept {
+		return pos.x + pos.y * side + pos.z * side * side;
 	}
 	static constexpr bool InBounds(int idx) noexcept {
 		return idx >= 0 && idx < size;
 	}
-	static Block::Pos ToCoords(int idx) noexcept {
-		return Block::Pos(
-			0.5f + (idx % width),
-			0.5f + ((idx / width) % height),
-			0.5f + (idx / (width * height))
+	static ExactLocation::Fine ToCoords(int idx) noexcept {
+		return ExactLocation::Fine(
+			0.5f + (idx % side),
+			0.5f + ((idx / side) % side),
+			0.5f + (idx / (side * side))
 		);
 	}
-	static Block::Pos ToCoords(const Pos &pos) noexcept {
-		return Block::Pos(pos) + 0.5f;
+	static ExactLocation::Fine ToCoords(const RoughLocation::Fine &pos) noexcept {
+		return ExactLocation::Fine(pos) + 0.5f;
 	}
-	static Pos ToPos(int idx) noexcept {
-		return Pos(
-			(idx % width),
-			((idx / width) % height),
-			(idx / (width * height))
+	static RoughLocation::Fine ToPos(int idx) noexcept {
+		return RoughLocation::Fine(
+			(idx % side),
+			((idx / side) % side),
+			(idx / (side * side))
 		);
 	}
-	glm::mat4 ToTransform(const Pos &pos, int idx) const noexcept;
+	/// get a chunk-local transform for block at given position and index
+	/// (position and index are redundant)
+	glm::mat4 ToTransform(const RoughLocation::Fine &position, int index) const noexcept;
+	/// same as above, but also apply offset to given reference
+	glm::mat4 ToTransform(const ExactLocation::Coarse &ref, const RoughLocation::Fine &pos, int idx) const noexcept;
+
+	ExactLocation::Fine ToSceneCoords(const ExactLocation::Coarse &base, const ExactLocation::Fine &pos) const noexcept {
+		return ExactLocation::Fine((position - base) * ExactLocation::Extent()) + pos;
+	}
 
-	static bool IsBorder(const Pos &pos) noexcept {
+	static bool IsBorder(const RoughLocation::Fine &pos) noexcept {
 		return
 			pos.x == 0 ||
-			pos.x == width - 1 ||
+			pos.x == side - 1 ||
 			pos.y == 0 ||
-			pos.y == height - 1 ||
+			pos.y == side - 1 ||
 			pos.z == 0 ||
-			pos.z == depth - 1;
+			pos.z == side - 1;
 	}
 	static constexpr bool IsBorder(int idx) noexcept {
 		return
-			idx < width * height ||                    // low Z plane
-			idx % width == 0 ||                          // low X plane
-			(idx / (width * height)) == depth - 1 || // high Z plane
-			idx % width == width - 1 ||                // high X plane
-			(idx / width) % height == 0 ||             // low Y plane
-			(idx / width) % height == height - 1;    // high Y plane
+			idx < side * side ||                 // low Z plane
+			idx % side == 0 ||                   // low X plane
+			(idx / (side * side)) == side - 1 || // high Z plane
+			idx % side == side - 1 ||            // high X plane
+			(idx / side) % side == 0 ||          // low Y plane
+			(idx / side) % side == side - 1;     // high Y plane
 	}
 
 	bool IsSurface(int index) const noexcept { return IsSurface(ToPos(index)); }
-	bool IsSurface(const Block::Pos &pos) const noexcept { return IsSurface(Pos(pos)); }
-	bool IsSurface(const Pos &pos) const noexcept;
+	bool IsSurface(const ExactLocation::Fine &pos) const noexcept { return IsSurface(RoughLocation::Fine(pos)); }
+	bool IsSurface(const RoughLocation::Fine &pos) const noexcept;
 
-	void SetNeighbor(Chunk &) noexcept;
+	void SetNeighbor(Block::Face, Chunk &) noexcept;
 	bool HasNeighbor(Block::Face f) const noexcept { return neighbor[f]; }
 	Chunk &GetNeighbor(Block::Face f) noexcept { return *neighbor[f]; }
 	const Chunk &GetNeighbor(Block::Face f) const noexcept { return *neighbor[f]; }
-	void ClearNeighbors() noexcept;
 	void Unlink() noexcept;
-	void Relink() noexcept;
 
 	// check which faces of a block at given index are obstructed (and therefore invisible)
-	Block::FaceSet Obstructed(const Pos &) const noexcept;
-
-	void Invalidate() noexcept { dirty = true; }
+	Block::FaceSet Obstructed(const RoughLocation::Fine &) const noexcept;
 
 	void SetBlock(int index, const Block &) noexcept;
-	void SetBlock(const Block::Pos &pos, const Block &block) noexcept { SetBlock(ToIndex(pos), block); }
-	void SetBlock(const Pos &pos, const Block &block) noexcept { SetBlock(ToIndex(pos), block); }
+	void SetBlock(const ExactLocation::Fine &pos, const Block &block) noexcept { SetBlock(ToIndex(pos), block); }
+	void SetBlock(const RoughLocation::Fine &pos, const Block &block) noexcept { SetBlock(ToIndex(pos), block); }
 
 	const Block &BlockAt(int index) const noexcept { return blocks[index]; }
-	const Block &BlockAt(const Block::Pos &pos) const noexcept { return BlockAt(ToIndex(pos)); }
-	const Block &BlockAt(const Pos &pos) const noexcept { return BlockAt(ToIndex(pos)); }
+	const Block &BlockAt(const ExactLocation::Fine &pos) const noexcept { return BlockAt(ToIndex(pos)); }
+	const Block &BlockAt(const RoughLocation::Fine &pos) const noexcept { return BlockAt(ToIndex(pos)); }
 
 	const BlockType &Type(const Block &b) const noexcept { return types->Get(b.type); }
 	const BlockType &Type(int index) const noexcept { return Type(BlockAt(index)); }
 
 	void SetLight(int index, int level) noexcept;
-	void SetLight(const Pos &pos, int level) noexcept { SetLight(ToIndex(pos), level); }
-	void SetLight(const Block::Pos &pos, int level) noexcept { SetLight(ToIndex(pos), level); }
+	void SetLight(const ExactLocation::Fine &pos, int level) noexcept { SetLight(ToIndex(pos), level); }
+	void SetLight(const RoughLocation::Fine &pos, int level) noexcept { SetLight(ToIndex(pos), level); }
 
 	int GetLight(int index) const noexcept;
-	int GetLight(const Pos &pos) const noexcept { return GetLight(ToIndex(pos)); }
-	int GetLight(const Block::Pos &pos) const noexcept { return GetLight(ToIndex(pos)); }
+	int GetLight(const ExactLocation::Fine &pos) const noexcept { return GetLight(ToIndex(pos)); }
+	int GetLight(const RoughLocation::Fine &pos) const noexcept { return GetLight(ToIndex(pos)); }
 
-	float GetVertexLight(const Pos &, const BlockModel::Position &, const Model::Normal &) const noexcept;
+	float GetVertexLight(const RoughLocation::Fine &, const BlockMesh::Position &, const EntityMesh::Normal &) const noexcept;
 
+	/// get gravity for one unit mass at given point
+	glm::vec3 GravityAt(const ExactLocation &) const noexcept;
+
+	/// check if given ray passes this chunk at all
+	/// given reference indicates the chunk offset of the ray in world space
 	bool Intersection(
 		const Ray &ray,
-		const glm::mat4 &M,
+		const ExactLocation::Coarse &reference,
 		float &dist
 	) const noexcept {
-		return blank::Intersection(ray, Bounds(), M, &dist);
+		return blank::Intersection(ray, RelativeBounds(reference), dist);
 	}
 
+	/// check if given ray intersects any block of this chunk
+	/// given reference indicates the chunk offset of the ray in world space
 	bool Intersection(
 		const Ray &,
-		const glm::mat4 &M,
-		int &blkid,
-		float &dist,
-		glm::vec3 &normal) const noexcept;
-
-	void Position(const Pos &pos) noexcept { position = pos; }
-	const Pos &Position() const noexcept { return position; }
-	glm::mat4 Transform(const Pos &offset) const noexcept {
-		return glm::translate((position - offset) * Extent());
+		const ExactLocation::Coarse &reference,
+		WorldCollision &) noexcept;
+
+	/// get all blocks intersecting given box
+	bool Intersection(
+		const AABB &box,
+		const glm::mat4 &Mbox,
+		const glm::mat4 &Mchunk,
+		std::vector<WorldCollision> &) noexcept;
+
+	bool Intersection(
+		const Entity &entity,
+		const glm::mat4 &Mentity,
+		const glm::mat4 &Mchunk,
+		std::vector<WorldCollision> &) noexcept;
+
+	void Position(const ExactLocation::Coarse &pos) noexcept { position = pos; }
+	const ExactLocation::Coarse &Position() const noexcept { return position; }
+
+	glm::mat4 Transform(const ExactLocation::Coarse &offset) const noexcept {
+		return glm::translate((position - offset) * ExactLocation::Extent());
 	}
 
-	void CheckUpdate() noexcept;
-	void Draw() noexcept;
+	void *BlockData() noexcept { return &blocks[0]; }
+	const void *BlockData() const noexcept { return &blocks[0]; }
+	static constexpr std::size_t BlockSize() noexcept { return offsetof(Chunk, position) - offsetof(Chunk, blocks); }
 
-private:
-	void Update() noexcept;
+	bool Generated() const noexcept { return generated; }
+	void SetGenerated() noexcept { generated = true; }
+	bool Lighted() const noexcept { return lighted; }
+	void ScanLights();
+
+	/// check for active blocks, should be called after
+	/// block data was modified by means other than SetBlock()
+	void ScanActive();
+
+	void Ref() noexcept { ++ref_count; }
+	void UnRef() noexcept { --ref_count; }
+	bool Referenced() const noexcept { return ref_count > 0; }
+
+	void Invalidate() noexcept { dirty_mesh = dirty_save = true; }
+	void InvalidateMesh() noexcept { dirty_mesh = true; }
+	void ClearMesh() noexcept { dirty_mesh = false; }
+	void ClearSave() noexcept { dirty_save = false; }
+	bool ShouldUpdateMesh() const noexcept { return dirty_mesh; }
+	bool ShouldUpdateSave() const noexcept { return dirty_save; }
+
+	void Update(BlockMesh &) noexcept;
 
 private:
 	const BlockTypeRegistry *types;
 	Chunk *neighbor[Block::FACE_COUNT];
+
+	std::set<int> gravity;
+
 	Block blocks[size];
 	unsigned char light[size];
-	BlockModel model;
-	Pos position;
-	bool dirty;
+	bool generated;
+	bool lighted;
+
+	ExactLocation::Coarse position;
+	int ref_count;
+	bool dirty_mesh;
+	bool dirty_save;
 
 };