From 4a02f370783bf3e1ade9b73d41fd53bf4c76f1af Mon Sep 17 00:00:00 2001 From: Peter Schaefer Date: Wed, 15 Apr 2015 00:55:48 +0200 Subject: [PATCH] game loads Player.dae (wrong positions) --- Weave/Game.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Weave/Game.cpp b/Weave/Game.cpp index 80fac06..d4c5817 100644 --- a/Weave/Game.cpp +++ b/Weave/Game.cpp @@ -82,12 +82,12 @@ Game::Game() : playing(true) // //cout << ((float)(rand() % (size*steps * 2)) / steps - size) << ((float)(rand() % (size*steps * 2)) / steps - size) << ((float)(rand() % (size*steps * 2)) / steps - size) << endl; //} //ein Gegner - tmp_Scene->addObject(new SceneObject(shader1, glm::mat4(1.0f), "duck.dae", "model_duck.png")); + tmp_Scene->addObject(new SceneObject(shader1, glm::mat4(1.0f), "Player.dae", "model_player.png")); //tmp_Scene->addObject(new SceneObject(shader1, translate(vec3(-1.f, 2.f, -2.f)), "../models/box/box.dae", "../Textures/sky_withstars.png")); //tmp_Scene->addObject(new SceneObject(shader1, translate(vec3(1.f, 3.f, -2.f)), "../models/cow/cow.dae", "../models/cow/texture.jpg")); // load LVL - //tmp_Scene->addObject(new SceneObject(shader1, glm::mat4(1.0f), "level_test.dae", "model_duck.png")); +// tmp_Scene->addObject(new SceneObject(shader1, glm::mat4(1.0f), "level_test.dae", "model_duck.png")); //import("level_test.dae", tmp_Scene, shader1); -- 2.47.3