fixed transp in Shader

edited SkyTexture

diff --git a/Weave/Game.cpp b/Weave/Game.cpp
index a79d0a364cb7a6555306b266cb9119773144faf8..551c37a61a4e1246e318cde2af4964025b4e0845 100644 (file)
--- 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 6f870c1d0ea57c8863fbb81238a443ea37f82fdc..0dec929e481264869535c7ac264eefc6460ca8d1 100644 (file)
--- 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 1d8048d96ca8160b6cc5cd96a7188ceb7dc28e42..aae33bc438479a359485f853c0301f24028ea6d2 100644 (file)
--- 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 695846a3d93be3b59bb8cf1843f579367b56b4a8..0061a7f9e776748c2ab56c3273a319ea5ae40f0c 100644 (file)
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 d70e4cb4a452a5358ac03d1ff591e13619773c3a..7bc586d81cb8a46ca9ee64642aca23bc0be36715 100644 (file)
Binary files a/textures/model_skybox_2D.png and b/textures/model_skybox_2D.png differ