From a94429fd9d804a3f56cc568c5986ae827316c582 Mon Sep 17 00:00:00 2001
From: lanariel <lanariel.silver@gmail.com>
Date: Thu, 21 Nov 2013 10:02:17 +0100
Subject: [PATCH] Fixed Unresolved Externals from Hiarchy Flattening

---
 Code/OysterGraphics/Core/Core.h                 |  2 +-
 .../{Basic.cpp => BasicPreparations.cpp}        |  0
 .../Render/Preparations/Preparations.h          | 17 +++++++++++------
 .../Rendering/{Basic.cpp => BasicRender.cpp}    |  0
 Code/OysterGraphics/Render/Rendering/Render.h   |  2 +-
 Code/OysterGraphics/Resources/Resources.h       |  9 +++++++--
 .../HLSL/SimpleDebug/DebugCameraVertex.hlsl     |  1 +
 7 files changed, 21 insertions(+), 10 deletions(-)
 rename Code/OysterGraphics/Render/Preparations/{Basic.cpp => BasicPreparations.cpp} (100%)
 rename Code/OysterGraphics/Render/Rendering/{Basic.cpp => BasicRender.cpp} (100%)

diff --git a/Code/OysterGraphics/Core/Core.h b/Code/OysterGraphics/Core/Core.h
index 28d47e31..bc93777f 100644
--- a/Code/OysterGraphics/Core/Core.h
+++ b/Code/OysterGraphics/Core/Core.h
@@ -7,7 +7,7 @@
 #include "CoreIncludes.h"
 #include <sstream>
 #include "Buffer.h"
-#include "OysterMath.h";
+#include "OysterMath.h"
 
 namespace Oyster
 {
diff --git a/Code/OysterGraphics/Render/Preparations/Basic.cpp b/Code/OysterGraphics/Render/Preparations/BasicPreparations.cpp
similarity index 100%
rename from Code/OysterGraphics/Render/Preparations/Basic.cpp
rename to Code/OysterGraphics/Render/Preparations/BasicPreparations.cpp
diff --git a/Code/OysterGraphics/Render/Preparations/Preparations.h b/Code/OysterGraphics/Render/Preparations/Preparations.h
index 2badbdd4..6dc9f58f 100644
--- a/Code/OysterGraphics/Render/Preparations/Preparations.h
+++ b/Code/OysterGraphics/Render/Preparations/Preparations.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#ifndef Preparations_h
+#define Preparations_h
+
 #include "..\..\Core\Core.h"
 
 namespace Oyster
@@ -10,12 +13,12 @@ namespace Oyster
 		{
 			namespace Preparations
 			{
-				static class Basic
+				class Basic
 				{
 				public:
 					
-					/// @brief Binds the backbuffer as a RenderTargetView with or without the default DepthStencil
-					//! Binds the backbuffer as a RenderTargetView with or without the default DepthStencil
+					/// @brief Binds the backbuffer as a RenderTargetView with the default DepthStencil
+					//! Binds the backbuffer as a RenderTargetView with the default DepthStencil
 
 					static void BindBackBufferRTV();
 					/** @brief Binds the backbuffer as a RenderTargetView with the specified DepthStencil*/
@@ -25,7 +28,7 @@ namespace Oyster
 					/** @brief Binds the backbuffer as a UnorderedAccessView*/
 					static void BindBackBufferUAV();
 
-					/** @brief Binds the specified RenderTargetViews with or without the default DepthStencil*/
+					/** @brief Binds the specified RenderTargetViews with the default DepthStencil*/
 					static void BindRTV(ID3D11RenderTargetView* RTVs[], int size, bool UseDepthStencil = true);
 					/** @brief Binds the specified RenderTargetViews with the specified DepthStencil*/
 					static void BindRTV(ID3D11RenderTargetView* RTVs[], int size,ID3D11DepthStencilView* depthStencil);
@@ -33,7 +36,7 @@ namespace Oyster
 					/** @brief Binds the specified UnorderedAccessViews*/
 					static void BindUAV(ID3D11UnorderedAccessView* UAVs[], int size);
 
-					/** @brief Clear the BackBuffer and if true the default DepthStencil*/
+					/** @brief Clear the BackBuffer and the default DepthStencil*/
 					static void ClearBackBuffer(Oyster::Math::Float4 Color);
 
 					/** @brief Clear the specified RenderTargetViews*/
@@ -47,4 +50,6 @@ namespace Oyster
 			}
 		}
 	}
-}
\ No newline at end of file
+}
+
+#endif
\ No newline at end of file
diff --git a/Code/OysterGraphics/Render/Rendering/Basic.cpp b/Code/OysterGraphics/Render/Rendering/BasicRender.cpp
similarity index 100%
rename from Code/OysterGraphics/Render/Rendering/Basic.cpp
rename to Code/OysterGraphics/Render/Rendering/BasicRender.cpp
diff --git a/Code/OysterGraphics/Render/Rendering/Render.h b/Code/OysterGraphics/Render/Rendering/Render.h
index 22229078..3ba623e3 100644
--- a/Code/OysterGraphics/Render/Rendering/Render.h
+++ b/Code/OysterGraphics/Render/Rendering/Render.h
@@ -12,7 +12,7 @@ namespace Oyster
 		{
 			namespace Rendering
 			{
-				static class Basic
+				class Basic
 				{
 				public:
 					class Resources
diff --git a/Code/OysterGraphics/Resources/Resources.h b/Code/OysterGraphics/Resources/Resources.h
index 5dac3c5e..75653480 100644
--- a/Code/OysterGraphics/Resources/Resources.h
+++ b/Code/OysterGraphics/Resources/Resources.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#ifndef Reources_h
+#define Reources_h
+
 #include <map>
 #include "..\Core\Core.h"
 
@@ -9,7 +12,7 @@ namespace Oyster
 	{
 		namespace Render
 		{
-			static class Resources
+			class Resources
 			{
 				const Core::ShaderManager::ShaderEffect basic;
 				const Buffer ModelData;
@@ -18,4 +21,6 @@ namespace Oyster
 			};
 		}
 	}
-}
\ No newline at end of file
+}
+
+#endif
\ No newline at end of file
diff --git a/Code/OysterGraphics/Shader/HLSL/SimpleDebug/DebugCameraVertex.hlsl b/Code/OysterGraphics/Shader/HLSL/SimpleDebug/DebugCameraVertex.hlsl
index e2123062..fa3b224f 100644
--- a/Code/OysterGraphics/Shader/HLSL/SimpleDebug/DebugCameraVertex.hlsl
+++ b/Code/OysterGraphics/Shader/HLSL/SimpleDebug/DebugCameraVertex.hlsl
@@ -9,6 +9,7 @@ cbuffer PerModel : register(b1)
 	matrix World;
 }
 
+
 float4 main( float4 pos : POSITION ) : SV_POSITION
 {
 	matrix VP = mul(View, Projection);