disable Bloom

disable Light Classes (noch nicht fertig)

diff --git a/CGUE2015_Weave.sln b/CGUE2015_Weave.sln
index 300f1ecae90a5436fda382b3cdcbf7cecc13e56f..f5a4387b50d15b09e381873101e5bf441903c69e 100644 (file)
--- 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 8951e769eb8be322f4815115b0e943cf26aabcfa..bb112272f40b878f20d1ee2cc270cd1661b4bd9a 100644 (file)
--- 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 deb901f41966f16bc428c950131b99abd5720eda..f6da46dc85c0e00b3d8a16a2a9e72f454f306828 100644 (file)
--- a/Weave/Weave.vcxproj
+++ b/Weave/Weave.vcxproj
@@ -97,9 +97,6 @@
     <ClCompile Include="Game.cpp" />\r
     <ClCompile Include="GLM.cpp" />\r
     <ClCompile Include="Graphix\Graphix.cpp" />\r
-    <ClCompile Include="Graphix\Lights\AmbientLight.cpp" />\r
-    <ClCompile Include="Graphix\Lights\DirectionalLight.cpp" />\r
-    <ClCompile Include="Graphix\Lights\Light.cpp" />\r
     <ClCompile Include="Graphix\Model\Animation.cpp" />\r
     <ClCompile Include="Graphix\Model\BBox.cpp" />\r
     <ClCompile Include="Graphix\Model\IAnimMesh.cpp" />\r
@@ -108,7 +105,6 @@
     <ClCompile Include="Graphix\Model\Model.cpp" />\r
     <ClCompile Include="Graphix\Model\Plane.cpp" />\r
     <ClCompile Include="Graphix\Model\SkyBox.cpp" />\r
-    <ClCompile Include="Graphix\Lights\PointLight.cpp" />\r
     <ClCompile Include="Graphix\Textures\dBufferObject.cpp" />\r
     <ClCompile Include="Graphix\Textures\fBufferObject.cpp" />\r
     <ClCompile Include="Graphix\Textures\rBufferObject.cpp" />\r
@@ -128,10 +124,6 @@
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="Average.h" />\r
-    <ClInclude Include="Graphix\Lights.h" />\r
-    <ClInclude Include="Graphix\Lights\AmbientLight.h" />\r
-    <ClInclude Include="Graphix\Lights\DirectionalLight.h" />\r
-    <ClInclude Include="Graphix\Lights\Light.h" />\r
     <ClInclude Include="Graphix\Textures\BufferObject.h" />\r
     <ClInclude Include="Graphix\Debug.h" />\r
     <ClInclude Include="Graphix\Model.h" />\r
@@ -148,7 +140,6 @@
     <ClInclude Include="Graphix\Model\Model.h" />\r
     <ClInclude Include="Graphix\Model\Plane.h" />\r
     <ClInclude Include="Graphix\Model\SkyBox.h" />\r
-    <ClInclude Include="Graphix\Lights\PointLight.h" />\r
     <ClInclude Include="Graphix\Textures.h" />\r
     <ClInclude Include="Graphix\Textures\dBufferObject.h" />\r
     <ClInclude Include="Graphix\Textures\fBufferObject.h" />\r

diff --git a/Weave/Weave.vcxproj.filters b/Weave/Weave.vcxproj.filters
index cb0dc4189059e7803068052a904b7a846d2b862a..820ddde9fbad787eaee8e185ab568af2a68190df 100644 (file)
--- a/Weave/Weave.vcxproj.filters
+++ b/Weave/Weave.vcxproj.filters
@@ -102,18 +102,6 @@
     <ClCompile Include="Graphix\Textures\dBufferObject.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Graphix\Lights\PointLight.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Graphix\Lights\Light.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Graphix\Lights\DirectionalLight.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Graphix\Lights\AmbientLight.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="Fps.h">\r
@@ -218,20 +206,5 @@
     <ClInclude Include="Graphix\Textures\dBufferObject.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Graphix\Lights.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Graphix\Lights\PointLight.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Graphix\Lights\Light.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Graphix\Lights\DirectionalLight.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Graphix\Lights\AmbientLight.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/shader/basic_FS.hlsl b/shader/basic_FS.hlsl
index 3dc38386431ae03cedbad4264e55c51b4a9b7206..d1ebf6247616cc6920c19e8690e1e8f7897388b2 100644 (file)
--- 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;