diff --git a/Blenderfiles/brazier.blend b/Blenderfiles/brazier.blend index 3a838db..3e0289e 100644 Binary files a/Blenderfiles/brazier.blend and b/Blenderfiles/brazier.blend differ diff --git a/data/levels/Compositions.xml b/data/levels/Compositions.xml index 63e5ab4..179e0f8 100644 --- a/data/levels/Compositions.xml +++ b/data/levels/Compositions.xml @@ -81,6 +81,23 @@ + + + 81 + false + + torch.obj + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 1.0 + 0.0 + + + 85 @@ -465,13 +482,30 @@ brazier.obj 0.0 - 5.0 + 2 + 0.0 + 0.0 + 0.0 + 0.0 + 3.0 + 0.0 + + + + + + 250 + false + + hint.obj + 0.0 + 0.1 0.0 0.0 0.0 0.0 1.5 - 3.0 + 0.0 @@ -479,6 +513,7 @@ + @@ -641,3 +676,16 @@ 0.5 true + + + hint.obj + hintTexture.png + 0.1 + 0.6 + 0.4 + 2.0 + TriangleMesh + 0.555 + 0.5 + true + diff --git a/data/levels/Level1.png b/data/levels/Level1.png index cb6af04..e4ec2da 100644 Binary files a/data/levels/Level1.png and b/data/levels/Level1.png differ diff --git a/data/levels/Level1.xcf b/data/levels/Level1.xcf index 8efaf64..ba766a6 100644 Binary files a/data/levels/Level1.xcf and b/data/levels/Level1.xcf differ diff --git a/data/levels/Level1.xml b/data/levels/Level1.xml index 94d5ab5..16ca875 100644 --- a/data/levels/Level1.xml +++ b/data/levels/Level1.xml @@ -1,3 +1,32 @@ + + 1.0 + 0.0 + 0.0 + 0.0 + false + -91.500000 + 0.0 + 216.500000 + 0 + 142 + 250 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + 1.0 0.0 @@ -9,7 +38,7 @@ 54.500000 0 140 - 245 + 81 - 0 @@ -38,7 +67,7 @@ 26.500000 0 139 - 245 + 81 - 0 @@ -67,7 +96,7 @@ 54.500000 0 138 - 245 + 81 - 0 @@ -96,7 +125,7 @@ 26.500000 0 137 - 245 + 81 - 0 diff --git a/data/levels/Level1Backup.xml b/data/levels/Level1Backup.xml index 76335e2..0b55d71 100644 --- a/data/levels/Level1Backup.xml +++ b/data/levels/Level1Backup.xml @@ -1,3 +1,148 @@ + + 1.0 + 0.0 + 0.0 + 0.0 + false + -91.500000 + 0.0 + 216.500000 + 0 + 141 + 150 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -6.500000 + 0.0 + 54.500000 + 0 + 140 + 81 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -6.500000 + 0.0 + 26.500000 + 0 + 139 + 81 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -53.500000 + 0.0 + 54.500000 + 0 + 138 + 81 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -53.500000 + 0.0 + 26.500000 + 0 + 137 + 81 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + 1.0 0.0 diff --git a/data/levels/heightmapLvl1.png b/data/levels/heightmapLvl1.png index 4b55671..3836bcb 100644 Binary files a/data/levels/heightmapLvl1.png and b/data/levels/heightmapLvl1.png differ diff --git a/data/levels/heightmapLvl1.xcf b/data/levels/heightmapLvl1.xcf index a92b22e..babe3a1 100644 Binary files a/data/levels/heightmapLvl1.xcf and b/data/levels/heightmapLvl1.xcf differ diff --git a/graphics.cc b/graphics.cc index f2dcc7e..19d4e14 100644 --- a/graphics.cc +++ b/graphics.cc @@ -183,6 +183,7 @@ void Graphics::render(double time) glm::vec3 upvectors[6] = {glm::vec3(0.0f, -1.0f, 0.0f),glm::vec3(0.0f, -1.0f, 0.0f),glm::vec3(0.0f, 0.0f, -1.0f), glm::vec3(0.0f, 0.0f, -1.0f),glm::vec3(0.0f, -1.0f, 0.0f),glm::vec3(0.0f, -1.0f, 0.0f)}; + framebuffer_cube->bind(); for (unsigned int i_pointlight = 0; i_pointlightuse(); glViewport(0, 0, windowSize.x, windowSize.y);