added new universal sample Texture (old MM_enemy)

diff --git a/Weave/Game.cpp b/Weave/Game.cpp
index 657ceba7c0be32b852dce7b2818fac37133d9a63..544514014607cdc83ee821544c27947bd1245f3e 100644 (file)
--- a/Weave/Game.cpp
+++ b/Weave/Game.cpp
@@ -52,7 +52,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, .3f, 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_CUBE.jpg"));
        //SKYBOX! ----------------------------
 
        //Allg Shader
@@ -60,7 +60,7 @@ Game::Game() : playing(true)
 //     Shader* shaderSky = new Shader("skybox_VS.hlsl", "skybox_FS.hlsl");
 
        // load LVL
-       tmp_Scene->addObject(new SceneObject(shader1, scale(3.f * vec3(1.f,.3f,1.f)), "level_test.dae", "model_duck.png"));
+       tmp_Scene->addObject(new SceneObject(shader1, scale(3.f * vec3(1.f,.3f,1.f)), "level_test.dae", "sample_2D.png"));
 
 
        //Player

diff --git a/textures/sample_2D.png b/textures/sample_2D.png
new file mode 100644 (file)
index 0000000..f3da6ef
Binary files /dev/null and b/textures/sample_2D.png differ