From: Peter Schaefer <schaeferpm@gmail.com>
Date: Tue, 26 Apr 2016 19:02:15 +0000 (+0200)
Subject: disable Bloom
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=19434b979154b908983373e16b0d88b5c3692e00;p=cgue_weave.git

disable Bloom
disable Light Classes (noch nicht fertig)
---

diff --git a/CGUE2015_Weave.sln b/CGUE2015_Weave.sln
index 300f1ec..f5a4387 100644
--- a/CGUE2015_Weave.sln
+++ b/CGUE2015_Weave.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25029.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weave", "Weave\Weave.vcxproj", "{A2F0B06D-880C-4B90-9D4B-8B174418E1BE}"
 EndProject
diff --git a/Weave/Scene/Scene.cpp b/Weave/Scene/Scene.cpp
index 8951e76..bb11227 100644
--- a/Weave/Scene/Scene.cpp
+++ b/Weave/Scene/Scene.cpp
@@ -78,6 +78,7 @@ lookat(_lookat)
 
 	render->clearBuffer();
 
+	Graphix::disableEffects(EF_BLOOM);
 }
 
 
@@ -232,6 +233,10 @@ void Scene::draw() const
 		render->useBuffer();
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	}
+	else
+	{
+		render->clearBuffer();
+	}
 
 	/*DRAW SCENE*/
 	Shader::getShader(SH_BASICTEXTURE)->useShader();
@@ -239,6 +244,7 @@ void Scene::draw() const
 	Shader::getShader(SH_LIGHTING)->useShader();
 	drawSceneObjects();
 
+
 	GLboolean horizontal = true, firstit = true;
 	if (Graphix::testEffect(EF_BLOOM))
 	{
@@ -358,7 +364,7 @@ void Scene::setView(unsigned int x, unsigned int y, unsigned int width, unsigned
 void Scene::bindShader()
 {
 	/*SceneObject*/
-	ShaderTarget shader[] = {SH_BASIC,SH_BASICTEXTURE,SH_LIGHTING, SH_SHADOWDIR};
+	ShaderTarget shader[] = {SH_BASIC,SH_BASICTEXTURE,SH_LIGHTING, SH_SHADOWDIR, SH_NORMALS};
 	for (int s = 0; s < NELEMS(shader); s++)
 	{
 		for (auto i = SceneObjects.cbegin(); i != SceneObjects.cend(); ++i)
diff --git a/Weave/Weave.vcxproj b/Weave/Weave.vcxproj
index deb901f..f6da46d 100644
--- a/Weave/Weave.vcxproj
+++ b/Weave/Weave.vcxproj
@@ -97,9 +97,6 @@
     <ClCompile Include="Game.cpp" />
     <ClCompile Include="GLM.cpp" />
     <ClCompile Include="Graphix\Graphix.cpp" />
-    <ClCompile Include="Graphix\Lights\AmbientLight.cpp" />
-    <ClCompile Include="Graphix\Lights\DirectionalLight.cpp" />
-    <ClCompile Include="Graphix\Lights\Light.cpp" />
     <ClCompile Include="Graphix\Model\Animation.cpp" />
     <ClCompile Include="Graphix\Model\BBox.cpp" />
     <ClCompile Include="Graphix\Model\IAnimMesh.cpp" />
@@ -108,7 +105,6 @@
     <ClCompile Include="Graphix\Model\Model.cpp" />
     <ClCompile Include="Graphix\Model\Plane.cpp" />
     <ClCompile Include="Graphix\Model\SkyBox.cpp" />
-    <ClCompile Include="Graphix\Lights\PointLight.cpp" />
     <ClCompile Include="Graphix\Textures\dBufferObject.cpp" />
     <ClCompile Include="Graphix\Textures\fBufferObject.cpp" />
     <ClCompile Include="Graphix\Textures\rBufferObject.cpp" />
@@ -128,10 +124,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Average.h" />
-    <ClInclude Include="Graphix\Lights.h" />
-    <ClInclude Include="Graphix\Lights\AmbientLight.h" />
-    <ClInclude Include="Graphix\Lights\DirectionalLight.h" />
-    <ClInclude Include="Graphix\Lights\Light.h" />
     <ClInclude Include="Graphix\Textures\BufferObject.h" />
     <ClInclude Include="Graphix\Debug.h" />
     <ClInclude Include="Graphix\Model.h" />
@@ -148,7 +140,6 @@
     <ClInclude Include="Graphix\Model\Model.h" />
     <ClInclude Include="Graphix\Model\Plane.h" />
     <ClInclude Include="Graphix\Model\SkyBox.h" />
-    <ClInclude Include="Graphix\Lights\PointLight.h" />
     <ClInclude Include="Graphix\Textures.h" />
     <ClInclude Include="Graphix\Textures\dBufferObject.h" />
     <ClInclude Include="Graphix\Textures\fBufferObject.h" />
diff --git a/Weave/Weave.vcxproj.filters b/Weave/Weave.vcxproj.filters
index cb0dc41..820ddde 100644
--- a/Weave/Weave.vcxproj.filters
+++ b/Weave/Weave.vcxproj.filters
@@ -102,18 +102,6 @@
     <ClCompile Include="Graphix\Textures\dBufferObject.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Graphix\Lights\PointLight.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Graphix\Lights\Light.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Graphix\Lights\DirectionalLight.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Graphix\Lights\AmbientLight.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Fps.h">
@@ -218,20 +206,5 @@
     <ClInclude Include="Graphix\Textures\dBufferObject.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Graphix\Lights.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Graphix\Lights\PointLight.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Graphix\Lights\Light.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Graphix\Lights\DirectionalLight.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Graphix\Lights\AmbientLight.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/shader/basic_FS.hlsl b/shader/basic_FS.hlsl
index 3dc3838..d1ebf62 100644
--- a/shader/basic_FS.hlsl
+++ b/shader/basic_FS.hlsl
@@ -1,5 +1,5 @@
 //Fragment Shader
-#version 330
+#version 330 core
 
 layout(location = 0) out vec4 FragColor;