X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fchunk.cpp;h=52d17c055319464479f8d1d7b248044de024cf52;hb=9c1f7b20394808f7ec7a6cadd9e0dd665c6f6bd5;hp=a485bfbb7d37c61eab4f80c091f1b78659c29b01;hpb=b35ce3a6423c554b34b37362c5550bd705e63a1d;p=blank.git

diff --git a/src/chunk.cpp b/src/chunk.cpp
index a485bfb..52d17c0 100644
--- a/src/chunk.cpp
+++ b/src/chunk.cpp
@@ -6,21 +6,25 @@
 
 namespace blank {
 
-Chunk::Chunk()
-: blocks(Size())
+Chunk::Chunk(const BlockTypeRegistry &types)
+: types(&types)
+, blocks()
 , model()
+, position(0, 0, 0)
 , dirty(false) {
 
 }
 
 Chunk::Chunk(Chunk &&other)
-: blocks(std::move(other.blocks))
+: types(other.types)
+, blocks(std::move(other.blocks))
 , model(std::move(other.model))
 , dirty(other.dirty) {
 
 }
 
 Chunk &Chunk::operator =(Chunk &&other) {
+	types = other.types;
 	blocks = std::move(other.blocks);
 	model = std::move(other.model);
 	dirty = other.dirty;
@@ -28,6 +32,11 @@ Chunk &Chunk::operator =(Chunk &&other) {
 }
 
 
+void Chunk::Allocate() {
+	blocks.resize(Size());
+}
+
+
 void Chunk::Draw() {
 	if (dirty) {
 		Update();
@@ -43,8 +52,7 @@ bool Chunk::Intersection(
 	float *dist,
 	glm::vec3 *normal) const {
 	{ // rough check
-		const AABB bb{{0, 0, 0}, {Width(), Height(), Depth()}};
-		if (!blank::Intersection(ray, bb, M)) {
+		if (!blank::Intersection(ray, Bounds(), M)) {
 			return false;
 		}
 	}
@@ -61,13 +69,13 @@ bool Chunk::Intersection(
 	for (int z = 0; z < Depth(); ++z) {
 		for (int y = 0; y < Height(); ++y) {
 			for (int x = 0; x < Width(); ++x, ++id) {
-				if (!blocks[id].type->visible) {
+				if (!Type(blocks[id]).visible) {
 					continue;
 				}
 				float cur_dist;
 				glm::vec3 cur_norm;
-				glm::vec3 pos(float(x) + 0.5f, float(y) + 0.5f, float(z) + 0.5f);
-				if (blocks[id].type->shape->Intersects(ray, glm::translate(M, pos), cur_dist, cur_norm)) {
+				Block::Pos pos(float(x) + 0.5f, float(y) + 0.5f, float(z) + 0.5f);
+				if (Type(blocks[id]).shape->Intersects(ray, glm::translate(M, pos), cur_dist, cur_norm)) {
 					if (cur_dist < closest_dist) {
 						closest_id = id;
 						closest_dist = cur_dist;
@@ -94,29 +102,30 @@ bool Chunk::Intersection(
 	return true;
 }
 
-void Chunk::Position(const glm::vec3 &pos) {
+void Chunk::Position(const Pos &pos) {
 	position = pos;
 }
 
-glm::mat4 Chunk::Transform(const glm::vec3 &offset) const {
+glm::mat4 Chunk::Transform(const Pos &offset) const {
 	return glm::translate((position - offset) * Extent());
 }
 
 
-int Chunk::VertexCount() const {
-	int count = 0;
+void Chunk::Update() {
+	int vtx_count = 0, idx_count = 0;
 	for (const auto &block : blocks) {
-		count += block.type->shape->VertexCount();
+		const Shape *shape = Type(block).shape;
+		vtx_count += shape->VertexCount();
+		idx_count += shape->VertexIndexCount();
 	}
-	return count;
-}
-
-void Chunk::Update() {
 	model.Clear();
-	model.Reserve(VertexCount());
+	model.Reserve(vtx_count, idx_count);
 
+	Model::Index vtx_counter = 0;
 	for (size_t i = 0; i < Size(); ++i) {
-		blocks[i].type->FillModel(ToCoords(i), model);
+		const BlockType &type = Type(blocks[i]);
+		type.FillModel(model, ToCoords(i), vtx_counter);
+		vtx_counter += type.shape->VertexCount();
 	}
 
 	model.Invalidate();