From: Peter Schaefer <schaeferpm@gmail.com>
Date: Sat, 16 May 2015 14:54:42 +0000 (+0200)
Subject: fixed transp in Shader
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=4b9a5548e18fbe3b3f8b74aa5c9c78f0439940df;p=cgue_weave.git

fixed transp in Shader
edited SkyTexture
---

diff --git a/Weave/Game.cpp b/Weave/Game.cpp
index a79d0a3..551c37a 100644
--- a/Weave/Game.cpp
+++ b/Weave/Game.cpp
@@ -69,10 +69,11 @@ Game::Game() : playing(true)
 	//current_world->addObject(new SceneObject(shader1, translate(vec3(-3.f, .4f, 0.f))*scale(vec3(3.f)), "cow/cow.dae", "model_cow_2D.jpg"));
 	current_world->addObject(new SceneObject(shader1, translate(vec3(-3.f, .4f, 0.f))*scale(vec3(.32f)), vec4(3.0f, 0.5f, 0.4f, 1.5f), "duck.dae", "model_duck_2D.png"));
 	current_world->addObject(new SceneObject(shader1, translate(vec3(-5.f, .4f, 0.f))*scale(vec3(.32f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "duck.dae", "model_duck_2D.png"));
-	current_world->addObject(new SceneObject(shader1, translate(vec3(-5.f, 3.f, 0.f))*scale(vec3(.32f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "SkyBox.dae", "model_skybox_2D.png"));
 
-	current_world->addObject(new EventBox(translate(vec3(3.f, .4f, 0.f)),EB_LOSTZONE));
-	current_world->addObject(new EventBox(translate(vec3(3.f, .4f, -15.f)), EB_WINZONE));
+	current_world->addObject(new SceneObject(shader1, translate(vec3(-5.f, 3.f, 0.f))*scale(vec3(.32f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "SkyBox.dae", "model_SkyBox_2D.png"));
+
+	//current_world->addObject(new EventBox(translate(vec3(3.f, .4f, 0.f)),EB_LOSTZONE));
+	//current_world->addObject(new EventBox(translate(vec3(3.f, .4f, -15.f)), EB_WINZONE));
 
 }
 
diff --git a/Weave/Scene/Sky.cpp b/Weave/Scene/Sky.cpp
index 6f870c1..0dec929 100644
--- a/Weave/Scene/Sky.cpp
+++ b/Weave/Scene/Sky.cpp
@@ -6,7 +6,8 @@
 #include "../GLM.h"
 
 
-Sky::Sky() : SceneObject(new Shader("skybox_VS.hlsl","basicTexture_FS.hlsl"), scale(vec3(20.f)), vec4(1.f), Model::getSkyBoxModel(), "skybox_2D.jpg")
+
+Sky::Sky() : SceneObject(new Shader("skybox_VS.hlsl","basicTexture_FS.hlsl"), scale(vec3(20.f)), vec4(1.f), Model::getSkyBoxModel(), "model_skybox_2D.png")
 {
 	modelMat[3][3] = 0;
 }
diff --git a/shader/basicTexture_FS.hlsl b/shader/basicTexture_FS.hlsl
index 1d8048d..aae33bc 100644
--- a/shader/basicTexture_FS.hlsl
+++ b/shader/basicTexture_FS.hlsl
@@ -9,5 +9,5 @@ uniform sampler2D uColorTexture;
  
 void main()
 {
-	FragmentColor = vec4(texture(uColorTexture, fUVs).rgb, 0.7);
+	FragmentColor = texture(uColorTexture, fUVs);
 }
\ No newline at end of file
diff --git a/textures/model_skybox_2D.jpg b/textures/model_skybox_2D.jpg
index 695846a..0061a7f 100644
Binary files a/textures/model_skybox_2D.jpg and b/textures/model_skybox_2D.jpg differ
diff --git a/textures/model_skybox_2D.png b/textures/model_skybox_2D.png
index d70e4cb..7bc586d 100644
Binary files a/textures/model_skybox_2D.png and b/textures/model_skybox_2D.png differ