From 0a3d68a407204856daf9abf44035eb6e6b3be17e Mon Sep 17 00:00:00 2001
From: lanariel <lanariel.silver@gmail.com>
Date: Thu, 9 Jan 2014 01:08:49 +0100
Subject: [PATCH] Small bug fix and include new SSAO shader

---
 Code/OysterGraphics/OysterGraphics.vcxproj | 13 +++++++++++--
 Code/Tester/MainTest.cpp                   |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Code/OysterGraphics/OysterGraphics.vcxproj b/Code/OysterGraphics/OysterGraphics.vcxproj
index 659d9087..d2196e4e 100644
--- a/Code/OysterGraphics/OysterGraphics.vcxproj
+++ b/Code/OysterGraphics/OysterGraphics.vcxproj
@@ -182,7 +182,6 @@
     <ClCompile Include="Render\Preparations\BasicPreparations.cpp" />
     <ClCompile Include="Render\Rendering\BasicRender.cpp" />
     <ClCompile Include="Render\Resources\Deffered.cpp" />
-    <ClCompile Include="Render\Resources\Debug.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Core\Core.h" />
@@ -196,7 +195,6 @@
     <ClInclude Include="Render\Rendering\Render.h" />
     <ClInclude Include="Definitions\GraphicalDefinition.h" />
     <ClInclude Include="Render\Resources\Deffered.h" />
-    <ClInclude Include="Render\Resources\Debug.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Misc\Misc.vcxproj">
@@ -219,6 +217,16 @@
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
     </FxCompile>
+    <FxCompile Include="Shader\HLSL\Deffered Shaders\PostPass.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
+    </FxCompile>
     <FxCompile Include="Shader\HLSL\Deffered Shaders\VertexGatherData.hlsl">
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Vertex</ShaderType>
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Vertex</ShaderType>
@@ -268,6 +276,7 @@
     <None Include="Shader\HLSL\Deffered Shaders\GBufferHeader.hlsli" />
     <None Include="Shader\HLSL\Deffered Shaders\LightCalc.hlsli" />
     <None Include="Shader\HLSL\Deffered Shaders\PosManipulation.hlsli" />
+    <None Include="Shader\HLSL\Deffered Shaders\SSAO.hlsli" />
     <None Include="Shader\HLSL\SimpleDebug\Debug.hlsl" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/Code/Tester/MainTest.cpp b/Code/Tester/MainTest.cpp
index cfa3b8b6..e3284c0b 100644
--- a/Code/Tester/MainTest.cpp
+++ b/Code/Tester/MainTest.cpp
@@ -171,7 +171,7 @@ HRESULT InitDirect3D()
 		return E_FAIL;
 	}
 	
-	m =  Oyster::Graphics::API::CreateModel(L"christmastree");
+	m =  Oyster::Graphics::API::CreateModel(L"orca_dummy");
 	m2 = Oyster::Graphics::API::CreateModel(L"worldDummy");
 	m2->WorldMatrix = Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3::null,Oyster::Math::Float3(0,5,0),Oyster::Math::Float3::null);
 	m3 = Oyster::Graphics::API::CreateModel(L"worldDummy");