From: Peter Schaefer Date: Thu, 23 Apr 2015 20:54:00 +0000 (+0200) Subject: fixed GLenum (SkyBox Texture wasn't bind) X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=3895c57ca131101fa29bf0ad4503ab788fc9ec66;p=cgue_weave.git fixed GLenum (SkyBox Texture wasn't bind) --- diff --git a/Weave/Game.cpp b/Weave/Game.cpp index f7fd43d..da5dd47 100644 --- a/Weave/Game.cpp +++ b/Weave/Game.cpp @@ -50,7 +50,7 @@ Game::Game() : playing(true) shader_skybox = new Shader("skybox_VS.hlsl", "skybox_FS.hlsl"); //texture_skybox = new Texture("skybox_CUBE.jpg"); - tmp_Scene->addObject(new SceneObject(shader_skybox, scale(3.f * vec3(1.f, .5f, 1.f)), new SkyBox(), "skybox_CUBE.jpg")); + tmp_Scene->addObject(new SceneObject(shader_skybox, scale(3.f * vec3(1.f, .5f, 1.f)), new SkyBox(), "")); //SKYBOX! ---------------------------- //Allg Shader @@ -103,7 +103,7 @@ Game::Game() : playing(true) //ein Gegner //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(-3.f, .4f, 0.f))*scale(vec3(3.f)), "cow/cow.dae", "model_cow.jpg")); + tmp_Scene->addObject(new SceneObject(shader1, translate(vec3(-3.f, .4f, 0.f))*scale(vec3(3.f)), "cow/cow.dae", "model_cow_2D.jpg")); //import("level_test.dae", tmp_Scene, shader1); diff --git a/textures/model_cow.jpg b/textures/model_cow.jpg deleted file mode 100644 index 8dc0f2f..0000000 Binary files a/textures/model_cow.jpg and /dev/null differ diff --git a/textures/model_cow_2D.jpg b/textures/model_cow_2D.jpg new file mode 100644 index 0000000..8dc0f2f Binary files /dev/null and b/textures/model_cow_2D.jpg differ diff --git a/textures/model_duck.png b/textures/model_duck.png deleted file mode 100644 index dee1721..0000000 Binary files a/textures/model_duck.png and /dev/null differ diff --git a/textures/model_duck_2D.png b/textures/model_duck_2D.png new file mode 100644 index 0000000..dee1721 Binary files /dev/null and b/textures/model_duck_2D.png differ