X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fchunk.cpp;h=11c9d36bdaedee1682725db27c31d3341b89b305;hb=dbfcb12348b80e2582f710acb1e4ed0011889ba2;hp=a6decf70906408558fc68f08a790da5225c126b8;hpb=ede25c0a2f59e21521d1cd962e6ea9d78169ca12;p=blank.git

diff --git a/src/world/chunk.cpp b/src/world/chunk.cpp
index a6decf7..11c9d36 100644
--- a/src/world/chunk.cpp
+++ b/src/world/chunk.cpp
@@ -25,7 +25,6 @@ Chunk::Chunk(const BlockTypeRegistry &types) noexcept
 , neighbor{0}
 , blocks{}
 , light{0}
-, model()
 , position(0, 0, 0)
 , dirty_model(false)
 , dirty_save(false) {
@@ -34,7 +33,6 @@ Chunk::Chunk(const BlockTypeRegistry &types) noexcept
 
 Chunk::Chunk(Chunk &&other) noexcept
 : types(other.types)
-, model(std::move(other.model))
 , position(other.position)
 , dirty_model(other.dirty_model)
 , dirty_save(other.dirty_save) {
@@ -48,7 +46,6 @@ Chunk &Chunk::operator =(Chunk &&other) noexcept {
 	std::copy(other.neighbor, other.neighbor + sizeof(neighbor), neighbor);
 	std::copy(other.blocks, other.blocks + sizeof(blocks), blocks);
 	std::copy(other.light, other.light + sizeof(light), light);
-	model = std::move(other.model);
 	position = other.position;
 	dirty_model = other.dirty_save;
 	dirty_save = other.dirty_save;
@@ -429,24 +426,15 @@ bool Chunk::IsSurface(const Pos &pos) const noexcept {
 }
 
 
-void Chunk::Draw() noexcept {
-	if (ShouldUpdateModel()) {
-		Update();
-	}
-	model.Draw();
-}
-
-
 bool Chunk::Intersection(
 	const Ray &ray,
 	const glm::mat4 &M,
-	int &blkid,
-	float &dist,
-	glm::vec3 &normal
-) const noexcept {
+	WorldCollision &coll
+) noexcept {
 	int idx = 0;
-	blkid = -1;
-	dist = std::numeric_limits<float>::infinity();
+	coll.chunk = this;
+	coll.block = -1;
+	coll.depth = std::numeric_limits<float>::infinity();
 	for (int z = 0; z < depth; ++z) {
 		for (int y = 0; y < height; ++y) {
 			for (int x = 0; x < width; ++x, ++idx) {
@@ -457,20 +445,20 @@ bool Chunk::Intersection(
 				float cur_dist;
 				glm::vec3 cur_norm;
 				if (type.shape->Intersects(ray, M * ToTransform(Pos(x, y, z), idx), cur_dist, cur_norm)) {
-					if (cur_dist < dist) {
-						blkid = idx;
-						dist = cur_dist;
-						normal = cur_norm;
+					if (cur_dist < coll.depth) {
+						coll.block = idx;
+						coll.depth = cur_dist;
+						coll.normal = cur_norm;
 					}
 				}
 			}
 		}
 	}
 
-	if (blkid < 0) {
+	if (coll.block < 0) {
 		return false;
 	} else {
-		normal = glm::vec3(BlockAt(blkid).Transform() * glm::vec4(normal, 0.0f));
+		coll.normal = glm::vec3(BlockAt(coll.block).Transform() * glm::vec4(coll.normal, 0.0f));
 		return true;
 	}
 }
@@ -480,7 +468,7 @@ bool Chunk::Intersection(
 	const glm::mat4 &Mbox,
 	const glm::mat4 &Mchunk,
 	std::vector<WorldCollision> &col
-) const noexcept {
+) noexcept {
 	bool any = false;
 	float penetration;
 	glm::vec3 normal;
@@ -512,13 +500,7 @@ BlockModel::Buffer buf;
 
 }
 
-void Chunk::CheckUpdate() noexcept {
-	if (ShouldUpdateModel()) {
-		Update();
-	}
-}
-
-void Chunk::Update() noexcept {
+void Chunk::Update(BlockModel &model) noexcept {
 	int vtx_count = 0, idx_count = 0;
 	for (const auto &block : blocks) {
 		const Shape *shape = Type(block).shape;