X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fblock.cpp;h=dea52672359cc61c4756fbf826b90196320b8a2f;hb=4ef32c5a4a5bdb6da8383f66d8265715eb2ed4f9;hp=50ade3901fd65aebdf96ef29ebd2499fc6ffbf41;hpb=75e72685a7398d2e30d51fadeaacde849518e188;p=blank.git

diff --git a/src/block.cpp b/src/block.cpp
index 50ade39..dea5267 100644
--- a/src/block.cpp
+++ b/src/block.cpp
@@ -51,7 +51,9 @@ BlockType::BlockType(bool v, const glm::vec3 &col, const Shape *s)
 , color(col)
 , outline_color(-1, -1, -1)
 , id(0)
+, luminosity(0)
 , visible(v)
+, block_light(false)
 , fill({ false, false, false, false, false, false }) {
 
 }
@@ -59,7 +61,7 @@ BlockType::BlockType(bool v, const glm::vec3 &col, const Shape *s)
 namespace {
 
 const Block::Face face_map[Block::FACE_COUNT * Block::TURN_COUNT][Block::FACE_COUNT] = {
-	{ Block::FACE_UP,    Block::FACE_DOWN,  Block::FACE_RIGHT, Block::FACE_LEFT,  Block::FACE_FRONT, Block::FACE_BACK,  }, // face: up,    turn: none x
+	{ Block::FACE_UP,    Block::FACE_DOWN,  Block::FACE_RIGHT, Block::FACE_LEFT,  Block::FACE_FRONT, Block::FACE_BACK,  }, // face: up,    turn: none
 	{ Block::FACE_UP,    Block::FACE_DOWN,  Block::FACE_FRONT, Block::FACE_BACK,  Block::FACE_LEFT,  Block::FACE_RIGHT, }, // face: up,    turn: left
 	{ Block::FACE_UP,    Block::FACE_DOWN,  Block::FACE_LEFT,  Block::FACE_RIGHT, Block::FACE_BACK,  Block::FACE_FRONT, }, // face: up,    turn: around
 	{ Block::FACE_UP,    Block::FACE_DOWN,  Block::FACE_BACK,  Block::FACE_FRONT, Block::FACE_RIGHT, Block::FACE_LEFT,  }, // face: up,    turn: right
@@ -100,6 +102,15 @@ void BlockType::FillModel(
 	buf.colors.insert(buf.colors.end(), shape->VertexCount(), color);
 }
 
+void BlockType::FillBlockModel(
+	BlockModel::Buffer &buf,
+	const glm::mat4 &transform,
+	BlockModel::Index idx_offset
+) const {
+	shape->Vertices(buf.vertices, buf.indices, transform, idx_offset);
+	buf.colors.insert(buf.colors.end(), shape->VertexCount(), color);
+}
+
 void BlockType::FillOutlineModel(
 	OutlineModel &model,
 	const glm::vec3 &pos_offset,