From a6c65efceea12a22492f9bce1a7a681ea22786e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20F=C3=BCndgens?= Date: Fri, 5 Dec 2014 16:36:31 +0100 Subject: [PATCH] Changed model and texture names to not start with capital letters. --- Levels/Geometry/{Block.obj => block.obj} | 0 Levels/Geometry/{Column.obj => column.obj} | 0 .../{MarbleSmooth.obj => marbleSmooth.obj} | 0 Levels/ObjectSetups/Compositions.xml | 62 ++++++++++++++++-- ...ockTexture.png => movableBlockTexture.png} | Bin level.cc | 10 +-- 6 files changed, 61 insertions(+), 11 deletions(-) rename Levels/Geometry/{Block.obj => block.obj} (100%) rename Levels/Geometry/{Column.obj => column.obj} (100%) rename Levels/Geometry/{MarbleSmooth.obj => marbleSmooth.obj} (100%) rename Levels/Textures/{MovableBlockTexture.png => movableBlockTexture.png} (100%) diff --git a/Levels/Geometry/Block.obj b/Levels/Geometry/block.obj similarity index 100% rename from Levels/Geometry/Block.obj rename to Levels/Geometry/block.obj diff --git a/Levels/Geometry/Column.obj b/Levels/Geometry/column.obj similarity index 100% rename from Levels/Geometry/Column.obj rename to Levels/Geometry/column.obj diff --git a/Levels/Geometry/MarbleSmooth.obj b/Levels/Geometry/marbleSmooth.obj similarity index 100% rename from Levels/Geometry/MarbleSmooth.obj rename to Levels/Geometry/marbleSmooth.obj diff --git a/Levels/ObjectSetups/Compositions.xml b/Levels/ObjectSetups/Compositions.xml index 4e69e2b..dfc5e4e 100644 --- a/Levels/ObjectSetups/Compositions.xml +++ b/Levels/ObjectSetups/Compositions.xml @@ -1,7 +1,7 @@ 20 - MarbleSmooth.obj + marbleSmooth.obj 0.0 0.0 0.0 @@ -12,7 +12,7 @@ 40 - Block.obj + block.obj 0.0 1.0 2.0 @@ -23,7 +23,7 @@ 60 - Column.obj + column.obj 0.0 0.0 0.0 @@ -54,21 +54,21 @@ 99 - Column.obj + column.obj 0.0 0.0 0.0 1.0 - Column.obj + column.obj 2.0 0.0 0.0 1.0 - Block.obj + block.obj 1.0 3.0 0.0 @@ -93,3 +93,53 @@ 1.0 + + + + + marbleSmooth.obj + + + + + + + + block.obj + + + + + + + + column.obj + + + + + + + + torch.obj + + + + + + + + switch_inner.obj + + + + + + + + switch_outer.obj + + + + + diff --git a/Levels/Textures/MovableBlockTexture.png b/Levels/Textures/movableBlockTexture.png similarity index 100% rename from Levels/Textures/MovableBlockTexture.png rename to Levels/Textures/movableBlockTexture.png diff --git a/level.cc b/level.cc index dd90070..680cad6 100644 --- a/level.cc +++ b/level.cc @@ -82,7 +82,7 @@ void Level::load() { std::string modelPath = charModelPath; float scale; object->FirstChildElement("scale")->QueryFloatText(&scale); - Model model = Model(modelPath, scale); + //Model model = Model(modelPath, scale); } XMLElement* light = compositionType->FirstChildElement("light"); @@ -95,7 +95,7 @@ void Level::load() { //add player - Model marbleModel = Model("MarbleSmooth.obj", 0.75f); + Model marbleModel = Model("marbleSmooth.obj", 0.75f); Material marbleMaterial = Material("marbleTexture_small.png", 0.1f, 0.5f, 0.5f, 3.0f); Object* object = new Object(marbleModel, marbleMaterial, glm::vec3(2.0f, 10.0f, 2.0f), glm::vec3(0.0f, 0.0f, 0.0f)); @@ -118,7 +118,7 @@ void Level::load() { glm::vec3(0.0f, 1.0472f, 0.0f)); objects.push_back(torchObject); - Model blockModel = Model("Block.obj", 1.0f); + Model blockModel = Model("block.obj", 1.0f); Material blockMaterial = Material("blockTexture_small.png", 0.1f, 0.6, 0.4f, 2.0f); Object* blockObject = new Object(blockModel, blockMaterial, glm::vec3(0.0f, 10.0f, 0.0f), glm::vec3(0.0f, 0.0f, 0.0f)); @@ -132,8 +132,8 @@ void Level::load() { physicObjects.push_back(blockObject2); physics.addBox(1,3.0f,1,*blockObject2,2,physicObjects.size()); - Model columnModel = Model("Column.obj", 1.0f); - Material columnMaterial = Material("ColumnTexture2.png", 0.1f, 0.6, 0.4f, 2.0f); + Model columnModel = Model("column.obj", 1.0f); + Material columnMaterial = Material("columnTexture2.png", 0.1f, 0.6, 0.4f, 2.0f); Object* columnObject = new Object(columnModel, columnMaterial, glm::vec3(-2.0f, 7.0f, -2.0f), glm::vec3(0.0f, 0.0f, 0.0f)); objects.push_back(columnObject);