game loads Player.dae (wrong positions)

diff --git a/Weave/Game.cpp b/Weave/Game.cpp
index 80fac065151c8c66b35460bd214652c85cb51bd1..d4c58174337b951ce8f237b93509aa081f1da8a4 100644 (file)
--- 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);