From 3895c57ca131101fa29bf0ad4503ab788fc9ec66 Mon Sep 17 00:00:00 2001 From: Peter Schaefer Date: Thu, 23 Apr 2015 22:54:00 +0200 Subject: [PATCH] fixed GLenum (SkyBox Texture wasn't bind) --- Weave/Game.cpp | 4 ++-- textures/{model_cow.jpg => model_cow_2D.jpg} | Bin textures/{model_duck.png => model_duck_2D.png} | Bin 3 files changed, 2 insertions(+), 2 deletions(-) rename textures/{model_cow.jpg => model_cow_2D.jpg} (100%) rename textures/{model_duck.png => model_duck_2D.png} (100%) 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_2D.jpg similarity index 100% rename from textures/model_cow.jpg rename to textures/model_cow_2D.jpg diff --git a/textures/model_duck.png b/textures/model_duck_2D.png similarity index 100% rename from textures/model_duck.png rename to textures/model_duck_2D.png -- 2.47.3