From: LockedLunatic <locked.lunatic@aon.at>
Date: Wed, 13 May 2015 14:33:44 +0000 (+0200)
Subject: transparency enabled
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=add65353568dcffe7e3261dc12edb8c7d7da0efd;p=cgue_weave.git

transparency enabled
---

diff --git a/Weave/Game.cpp b/Weave/Game.cpp
index 4098fa0..a79d0a3 100644
--- a/Weave/Game.cpp
+++ b/Weave/Game.cpp
@@ -69,7 +69,7 @@ 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.jpg"));
+	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/Graphix/Graphix.cpp b/Weave/Graphix/Graphix.cpp
index ba41ceb..7451986 100644
--- a/Weave/Graphix/Graphix.cpp
+++ b/Weave/Graphix/Graphix.cpp
@@ -69,8 +69,8 @@ void Graphix::init()
 	glEnable(GL_CULL_FACE);
 	glShadeModel(GL_SMOOTH);
 
-	//glEnable(GL_BLEND);
-	//glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glEnable(GL_BLEND);
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
 	shader_BBox = new Shader("basic_VS.hlsl", "basic_FS.hlsl");
 }
diff --git a/Weave/Scene/Sky.cpp b/Weave/Scene/Sky.cpp
index dd98bbd..6f870c1 100644
--- a/Weave/Scene/Sky.cpp
+++ b/Weave/Scene/Sky.cpp
@@ -6,7 +6,7 @@
 #include "../GLM.h"
 
 
-Sky::Sky() : SceneObject(new Shader("skybox_VS.hlsl","basicTexture_FS.hlsl"), scale(vec3(20.f)), vec4(1.f), Model::getSkyBoxModel(), "model_skybox_2D_2.png")
+Sky::Sky() : SceneObject(new Shader("skybox_VS.hlsl","basicTexture_FS.hlsl"), scale(vec3(20.f)), vec4(1.f), Model::getSkyBoxModel(), "skybox_2D.jpg")
 {
 	modelMat[3][3] = 0;
 }
diff --git a/models/SkyBox.blend b/models/SkyBox.blend
index f20ec97..e6cc23e 100644
Binary files a/models/SkyBox.blend and b/models/SkyBox.blend differ
diff --git a/models/SkyBox.blend1 b/models/SkyBox.blend1
index d3948a4..f20ec97 100644
Binary files a/models/SkyBox.blend1 and b/models/SkyBox.blend1 differ
diff --git a/models/SkyBox.dae b/models/SkyBox.dae
index 95fc6f0..af3ee70 100644
--- a/models/SkyBox.dae
+++ b/models/SkyBox.dae
@@ -3,10 +3,10 @@
   <asset>
     <contributor>
       <author>Blender User</author>
-      <authoring_tool>Blender 2.73.0 commit date:2015-01-20, commit time:18:16, hash:bbf09d9</authoring_tool>
+      <authoring_tool>Blender 2.70.0 commit date:2014-04-10, commit time:11:49, hash:f93bc76</authoring_tool>
     </contributor>
-    <created>2015-05-12T23:50:25</created>
-    <modified>2015-05-12T23:50:25</modified>
+    <created>2015-05-13T15:32:07</created>
+    <modified>2015-05-13T15:32:07</modified>
     <unit name="meter" meter="1"/>
     <up_axis>Z_UP</up_axis>
   </asset>
@@ -58,7 +58,7 @@
           </technique_common>
         </source>
         <source id="Cube-mesh-normals">
-          <float_array id="Cube-mesh-normals-array" count="36">1 0 0 -1 0 0 -2.98023e-7 1 -1.13249e-6 0 -1.01328e-6 -1 2.38418e-7 -1 7.7486e-7 -2.38419e-7 6.55651e-7 1 1 0 0 -1 0 -1.19209e-7 2.38419e-7 1 -5.96046e-7 3.57628e-7 -6.55651e-7 -1 1.19209e-7 -1 6.55651e-7 -3.57628e-7 7.7486e-7 1</float_array>
+          <float_array id="Cube-mesh-normals-array" count="36">1 0 0 -1 0 -1.19209e-7 -2.98023e-7 1 -1.13249e-6 0 -1.01328e-6 -1 2.38418e-7 -1 7.7486e-7 -2.38419e-7 7.7486e-7 1 1 0 0 -1 0 0 2.38419e-7 1 -5.96046e-7 3.57628e-7 -6.55651e-7 -1 1.19209e-7 -1 6.55651e-7 -3.57628e-7 6.55651e-7 1</float_array>
           <technique_common>
             <accessor source="#Cube-mesh-normals-array" count="12" stride="3">
               <param name="X" type="float"/>
@@ -68,7 +68,7 @@
           </technique_common>
         </source>
         <source id="Cube-mesh-map-0">
-          <float_array id="Cube-mesh-map-0-array" count="72">0.496875 0.668125 0.246875 0.668125 0.246875 0.338125 0.996875 0.3381249 0.996875 0.668125 0.746875 0.668125 0.246875 0.338125 0.2468749 0.008125007 0.4968749 0.008125007 0.246875 0.668125 -0.003124952 0.6681251 -0.003124952 0.3381251 0.246875 0.668125 0.496875 0.668125 0.4968751 0.998125 0.746875 0.668125 0.496875 0.668125 0.496875 0.338125 0.496875 0.338125 0.496875 0.668125 0.246875 0.338125 0.746875 0.338125 0.996875 0.3381249 0.746875 0.668125 0.496875 0.338125 0.246875 0.338125 0.4968749 0.008125007 0.246875 0.338125 0.246875 0.668125 -0.003124952 0.3381251 0.2468751 0.9981251 0.246875 0.668125 0.4968751 0.998125 0.746875 0.338125 0.746875 0.668125 0.496875 0.338125</float_array>
+          <float_array id="Cube-mesh-map-0-array" count="72">0.5000046 0.6666664 0.2500046 0.6666664 0.2500046 0.3333417 0.7500046 0.3333417 1.000005 0.3333417 1.000005 0.6666663 0.2500046 0.3333417 0.2500046 1.72555e-5 0.5000046 1.72555e-5 0.2500046 0.6666664 4.58956e-6 0.6666664 4.58956e-6 0.3333418 0.2500046 0.6666664 0.5000046 0.6666664 0.5000047 0.9999909 0.7500046 0.3333417 0.7500046 0.6666664 0.5000046 0.6666664 0.5000046 0.3333417 0.5000046 0.6666664 0.2500046 0.3333417 0.7500046 0.6666664 0.7500046 0.3333417 1.000005 0.6666663 0.5000046 0.3333417 0.2500046 0.3333417 0.5000046 1.72555e-5 0.2500046 0.3333417 0.2500046 0.6666664 4.58956e-6 0.3333418 0.2500047 0.9999909 0.2500046 0.6666664 0.5000047 0.9999909 0.5000046 0.3333417 0.7500046 0.3333417 0.5000046 0.6666664</float_array>
           <technique_common>
             <accessor source="#Cube-mesh-map-0-array" count="36" stride="2">
               <param name="S" type="float"/>
@@ -84,7 +84,7 @@
           <input semantic="NORMAL" source="#Cube-mesh-normals" offset="1"/>
           <input semantic="TEXCOORD" source="#Cube-mesh-map-0" offset="2" set="0"/>
           <vcount>3 3 3 3 3 3 3 3 3 3 3 3 </vcount>
-          <p>3 0 0 2 0 1 1 0 2 5 1 3 6 1 4 7 1 5 1 2 6 5 2 7 4 2 8 2 3 9 6 3 10 5 3 11 2 4 12 3 4 13 7 4 14 7 5 15 3 5 16 0 5 17 0 6 18 3 6 19 1 6 20 4 7 21 5 7 22 7 7 23 0 8 24 1 8 25 4 8 26 1 9 27 2 9 28 5 9 29 6 10 30 2 10 31 7 10 32 4 11 33 7 11 34 0 11 35</p>
+          <p>3 0 0 2 0 1 1 0 2 4 1 3 5 1 4 6 1 5 1 2 6 5 2 7 4 2 8 2 3 9 6 3 10 5 3 11 2 4 12 3 4 13 7 4 14 4 5 15 7 5 16 3 5 17 0 6 18 3 6 19 1 6 20 7 7 21 4 7 22 6 7 23 0 8 24 1 8 25 4 8 26 1 9 27 2 9 28 5 9 29 6 10 30 2 10 31 7 10 32 0 11 33 4 11 34 3 11 35</p>
         </polylist>
       </mesh>
     </geometry>