X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.cpp;h=b398e9c20e4e032e7c6b9d59df18a39746e7239a;hb=ac8765b510707d77cac9620778f40ddf3a4ad2a2;hp=8c957a78a815f348fb423f86c8840e6c35deea7f;hpb=482114e156e91729f2529ea6bb1fe98dacdee97f;p=blank.git

diff --git a/src/app.cpp b/src/app.cpp
index 8c957a7..b398e9c 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -17,12 +17,12 @@ Application::Application()
 , move_velocity(0.003f)
 , pitch_sensitivity(-0.0025f)
 , yaw_sensitivity(-0.001f)
-, testBlockType(true)
+, blockType()
 , cam()
 , chunk()
 , light_position(17.0f, 17.0f, 17.0f)
 , light_color(1.0f, 1.0f, 1.0f)
-, light_power(100.0f)
+, light_power(250.0f)
 , m_handle(0)
 , v_handle(0)
 , mv_handle(0)
@@ -107,12 +107,27 @@ Application::Application()
 
 	cam.Position(glm::vec3(0, 4, 4));
 
-	chunk.BlockAt(glm::vec3(0, 0, 0)) = Block(&testBlockType);
-	chunk.BlockAt(glm::vec3(1, 0, 0)) = Block(&testBlockType);
-	chunk.BlockAt(glm::vec3(1, 1, 0)) = Block(&testBlockType);
-	chunk.BlockAt(glm::vec3(1, 1, 1)) = Block(&testBlockType);
-	chunk.BlockAt(glm::vec3(2, 1, 1)) = Block(&testBlockType);
-	chunk.BlockAt(glm::vec3(2, 2, 1)) = Block(&testBlockType);
+	blockType.Add(BlockType(true, glm::vec3(1, 1, 1)));
+	blockType.Add(BlockType(true, glm::vec3(1, 0, 0)));
+	blockType.Add(BlockType(true, glm::vec3(0, 1, 0)));
+	blockType.Add(BlockType(true, glm::vec3(0, 0, 1)));
+
+	chunk.BlockAt(glm::vec3(0, 0, 0)) = Block(blockType[4]);
+	chunk.BlockAt(glm::vec3(0, 0, 1)) = Block(blockType[1]);
+	chunk.BlockAt(glm::vec3(1, 0, 0)) = Block(blockType[2]);
+	chunk.BlockAt(glm::vec3(1, 0, 1)) = Block(blockType[3]);
+	chunk.BlockAt(glm::vec3(2, 0, 0)) = Block(blockType[4]);
+	chunk.BlockAt(glm::vec3(2, 0, 1)) = Block(blockType[1]);
+	chunk.BlockAt(glm::vec3(3, 0, 0)) = Block(blockType[2]);
+	chunk.BlockAt(glm::vec3(3, 0, 1)) = Block(blockType[3]);
+	chunk.BlockAt(glm::vec3(2, 0, 2)) = Block(blockType[4]);
+	chunk.BlockAt(glm::vec3(2, 0, 3)) = Block(blockType[1]);
+	chunk.BlockAt(glm::vec3(3, 0, 2)) = Block(blockType[2]);
+	chunk.BlockAt(glm::vec3(3, 0, 3)) = Block(blockType[3]);
+	chunk.BlockAt(glm::vec3(1, 1, 0)) = Block(blockType[1]);
+	chunk.BlockAt(glm::vec3(1, 1, 1)) = Block(blockType[4]);
+	chunk.BlockAt(glm::vec3(2, 1, 1)) = Block(blockType[3]);
+	chunk.BlockAt(glm::vec3(2, 2, 1)) = Block(blockType[2]);
 	chunk.Invalidate();
 
 	m_handle = program.UniformLocation("M");