From 7cd0623cc763af39641f834481e82511124c9229 Mon Sep 17 00:00:00 2001 From: LockedLunatic Date: Tue, 28 Jun 2016 07:54:58 +0200 Subject: [PATCH] door and lever textures brought back level winzone added --- Weave/Stage.cpp | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/Weave/Stage.cpp b/Weave/Stage.cpp index c115668..37bd9d9 100644 --- a/Weave/Stage.cpp +++ b/Weave/Stage.cpp @@ -76,22 +76,22 @@ Stage::Stage(int num) current_world->addObject(new SceneObject(translate(vec3(-3.f, .4f, 0.f)), vec4(3.0f, 0.5f, 0.4f, 1.5f), "duck_col", "default_2D.png")); //current_world->addObject(new SceneObject(translate(vec3(-5.f, .4f, 0.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "boar", "model_boar_2D.png")); - door1 = new Door(translate(vec3(92.f, -12.f, -4.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "door", "default_2D.png"); + door1 = new Door(translate(vec3(92.f, -12.f, -4.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "door", "model_door_2D.png"); current_world->addObject(door1); door1->setAnimationLoop(false); door1->timeresistant = true; - door2 = new Door(translate(vec3(7.0f, 0.0f, -5.0f)), vec4(3.0f, 1.f, -1.4f, 1.5f), "door", "default_2D.png"); + door2 = new Door(translate(vec3(7.0f, 0.0f, -5.0f)), vec4(3.0f, 1.f, -1.4f, 1.5f), "door", "model_door_2D.png"); current_world->addObject(door2); door2->setAnimationLoop(false); - lever1 = new Lever(translate(vec3(-47.03945f, 8.03048f, 10.50753f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "default_2D.png"); + lever1 = new Lever(translate(vec3(-47.03945f, 8.03048f, 10.50753f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "model_lever_2D.png"); current_world->addObject(lever1); lever1->setAnimationLoop(false); lever1->setup(door2); //lever2 = new Lever(translate(vec3(86.f, -18.f, 5.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "model_duck_2D.png"); - lever2 = new Lever(translate(vec3(-5.f, 0.f, -5.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "default_2D.png"); + lever2 = new Lever(translate(vec3(-5.f, 0.f, -5.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "model_lever_2D.png"); current_world->addObject(lever2); lever2->setAnimationLoop(false); lever2->timeresistant = true; @@ -124,16 +124,16 @@ Stage::Stage(int num) current_world->setLookAt(tmp_playerObject); - lever1 = new Lever(translate(vec3(2.55167f, 2.51451f, -5.54817f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "default_2D.png"); + lever1 = new Lever(translate(vec3(2.55167f, 2.51451f, -5.54817f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "model_lever_2D.png"); current_world->addObject(lever1); lever1->setAnimationLoop(false); - door1 = new Door(translate(vec3(-9.78039f, -1.06029f, -6.46377f)) * rotate(1.5708f, vec3(0, 1, 0)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Door", "default_2D.png"); + door1 = new Door(translate(vec3(-9.78039f, -1.06029f, -6.46377f)) * rotate(1.5708f, vec3(0, 1, 0)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Door", "model_door_2D.png"); current_world->addObject(door1); door1->setup(1.5708f, vec3(0, 1, 0), 1); lever1->setup(door1); - door2 = new Door(translate(vec3(-2.58412f, -1.06029f, -6.46377f)) * rotate(-1.5708f, vec3(0, 1, 0)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Door", "default_2D.png"); + door2 = new Door(translate(vec3(-2.58412f, -1.06029f, -6.46377f)) * rotate(-1.5708f, vec3(0, 1, 0)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Door", "model_door_2D.png"); current_world->addObject(door2); door2->setup(-1.5708f, vec3(0, 1, 0), 1); lever1->setup(door2); @@ -157,8 +157,13 @@ Stage::Stage(int num) current_world->addObject(new Boar(translate(vec3(23.64995f, 0.1f, -2.53362f)) * rotate(1.9f, vec3(0, 1, 0)))); current_world->addObject(new Boar(translate(vec3(16.71088f, 0.1f, 0.83976f)) * rotate(-1.6f, vec3(0, 1, 0)))); - - current_world->addObject(new EventBox(translate(vec3(0.f, .4f, 0.f)), EB_WINZONE)); + for (int i = -9; i < -2; i++) + { + for (int j = -1; j < 3; j++) + { + current_world->addObject(new EventBox(translate(vec3((float) i, (float) j, -7.5f)), EB_WINZONE)); + } + } break; case 2: srand((int)time(NULL)); // Hauptfenster @@ -176,16 +181,16 @@ Stage::Stage(int num) current_world->setLookAt(tmp_playerObject); - lever1 = new Lever(translate(vec3(2.55167f, 2.51451f, -5.54817f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "default_2D.png"); + lever1 = new Lever(translate(vec3(2.55167f, 2.51451f, -5.54817f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "model_lever_2D.png"); current_world->addObject(lever1); lever1->setAnimationLoop(false); - door1 = new Door(translate(vec3(-9.78039f, -1.06029f, -6.46377f)) * rotate(1.5708f, vec3(0, 1, 0)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Door", "default_2D.png"); + door1 = new Door(translate(vec3(-9.78039f, -1.06029f, -6.46377f)) * rotate(1.5708f, vec3(0, 1, 0)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Door", "model_door_2D.png"); current_world->addObject(door1); door1->setup(1.5708f, vec3(0, 1, 0), 1); lever1->setup(door1); - door2 = new Door(translate(vec3(-2.58412f, -1.06029f, -6.46377f)) * rotate(-1.5708f, vec3(0, 1, 0)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Door", "default_2D.png"); + door2 = new Door(translate(vec3(-2.58412f, -1.06029f, -6.46377f)) * rotate(-1.5708f, vec3(0, 1, 0)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Door", "model_door_2D.png"); current_world->addObject(door2); door2->setup(-1.5708f, vec3(0, 1, 0), 1); lever1->setup(door2); -- 2.47.3