From 3ae3c84a39fca735c46418a3a8850b51c1026b4b Mon Sep 17 00:00:00 2001 From: Fabian Klemp Date: Mon, 9 Mar 2015 16:01:03 +0100 Subject: [PATCH] Changed a few material parameters. --- data/levels/Compositions.xml | 8 ++++---- data/levels/Level1.xml | 2 +- loader.cc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/levels/Compositions.xml b/data/levels/Compositions.xml index 3dd1df3..491c720 100644 --- a/data/levels/Compositions.xml +++ b/data/levels/Compositions.xml @@ -629,7 +629,7 @@ 0.13 0.6 0.4 - 2.0 + 1.0 None true @@ -641,7 +641,7 @@ 0.13 0.6 0.4 - 2.0 + 1.0 Box 1.2 6 @@ -702,7 +702,7 @@ 0.13 0.6 0.4 - 2.0 + 1.0 TriangleMesh 0.555 0.5 @@ -715,7 +715,7 @@ 0.13 0.6 0.4 - 2.0 + 1.0 TriangleMesh 0.555 0.5 diff --git a/data/levels/Level1.xml b/data/levels/Level1.xml index 74c5b5f..7c87d8f 100644 --- a/data/levels/Level1.xml +++ b/data/levels/Level1.xml @@ -13092,7 +13092,7 @@ 0.13 0.8 0.2 - 3.0 + 1.0 diff --git a/loader.cc b/loader.cc index e2a3bf6..4a8ee97 100644 --- a/loader.cc +++ b/loader.cc @@ -145,7 +145,7 @@ void Loader::load(std::string filePath, Level* level, std::string compositionsPa water_vao->bind(); water_vao->setMode(GL_TRIANGLES); water_vao->attachAllAttributes(water_ab); - Material water_material = Material(waterTexture, 0.1f, 0.2f, 0.8f, 5.0f, true); + Material water_material = Material(waterTexture, 0.13f, 0.5f, 0.5f, 10.0f, true); Object* water_object = new Object(water_vao, water_material, glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 0.0f, 0.0f), true); level->setWaterPlane(water_object); }