Renamed OpenGL/Direct3D9 implemntation and shader directories.

CMakeLists.txt

@@ -96,12 +96,12 @@ endmacro ()
 if (USE_OPENGL)
     macro (add_shader NAME)
         add_custom_command (
-            OUTPUT ../../Bin/CoreData/Shaders/OGL/${NAME}.vert
-            COMMAND ../../Bin/GLShaderProcessor ${NAME}.xml ../../Bin/CoreData/Shaders/OGL
+            OUTPUT ../../Bin/CoreData/Shaders/GLSL/${NAME}.vert
+            COMMAND ../../Bin/GLShaderProcessor ${NAME}.xml ../../Bin/CoreData/Shaders/GLSL
             DEPENDS GLShaderProcessor ${NAME}.vert ${NAME}.frag Uniforms.vert Transform.vert ScreenPos.vert Uniforms.frag Samplers.frag Lighting.frag Fog.frag ${NAME}.xml
         )
-    
-        set (ALL_SHADERS ${ALL_SHADERS} ../../Bin/CoreData/Shaders/OGL/${NAME}.vert)
+        
+        set (ALL_SHADERS ${ALL_SHADERS} ../../Bin/CoreData/Shaders/GLSL/${NAME}.vert)
     endmacro ()
 else()
     macro (add_shader NAME)
@@ -110,13 +110,13 @@ else()
             COMMAND ../../Bin/ShaderCompiler ${NAME}.xml ../../Bin/CoreData/Shaders/SM2 SM2
             DEPENDS ShaderCompiler Uniforms.hlsl Samplers.hlsl Transform.hlsl ScreenPos.hlsl Lighting.hlsl Fog.hlsl ${NAME}.hlsl ${NAME}.xml
         )
-    
+        
         add_custom_command (
             OUTPUT ../../Bin/CoreData/Shaders/SM3/${NAME}.vs3
             COMMAND ../../Bin/ShaderCompiler ${NAME}.xml ../../Bin/CoreData/Shaders/SM3 SM3
             DEPENDS ShaderCompiler Uniforms.hlsl Samplers.hlsl Transform.hlsl ScreenPos.hlsl Lighting.hlsl Fog.hlsl ${NAME}.hlsl ${NAME}.xml
         )
-    
+        
         set (ALL_SHADERS ${ALL_SHADERS} ../../Bin/CoreData/Shaders/SM2/${NAME}.vs2 ../../Bin/CoreData/Shaders/SM3/${NAME}.vs3)
     endmacro ()
 endif ()
@@ -153,10 +153,10 @@ add_subdirectory (Tools/RampGenerator)
 add_subdirectory (Urho3D)
 
 if (USE_OPENGL)
-    add_subdirectory (SourceAssets/OGLShaders)
+    add_subdirectory (SourceAssets/GLSLShaders)
     add_subdirectory (ThirdParty/GLee)
     add_subdirectory (Tools/GLShaderProcessor)
 else ()
-    add_subdirectory (SourceAssets/D3D9Shaders)
+    add_subdirectory (SourceAssets/HLSLShaders)
     add_subdirectory (Tools/ShaderCompiler)
 endif ()

Engine/Graphics/CMakeLists.txt

@@ -6,8 +6,8 @@ file (GLOB CPP_FILES *.cpp)
 file (GLOB H_FILES *.h)
 
 if (USE_OPENGL)
-    file (GLOB IMPL_CPP_FILES OGL/*.cpp)
-    file (GLOB IMPL_H_FILES OGL/*.h)
+    file (GLOB IMPL_CPP_FILES OpenGL/*.cpp)
+    file (GLOB IMPL_H_FILES OpenGL/*.h)
     set (SOURCE_FILES ${CPP_FILES} ${H_FILES} ${IMPL_CPP_FILES} ${IMPL_H_FILES})
 
     # Include directories
@@ -19,8 +19,8 @@ if (USE_OPENGL)
     add_library (${TARGET_NAME} STATIC ${SOURCE_FILES})
     target_link_libraries (${TARGET_NAME} Container Core GLee Math Resource Scene opengl32.lib)
 else ()
-    file (GLOB IMPL_CPP_FILES D3D9/*.cpp)
-    file (GLOB IMPL_H_FILES D3D9/*.h)
+    file (GLOB IMPL_CPP_FILES Direct3D9/*.cpp)
+    file (GLOB IMPL_H_FILES Direct3D9/*.h)
     set (SOURCE_FILES ${CPP_FILES} ${H_FILES} ${IMPL_CPP_FILES} ${IMPL_H_FILES})
 
     # Include directories

Engine/Graphics/GPUObject.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #ifdef USE_OPENGL
-#include "OGL/OGLGPUObject.h"
+#include "OpenGL/OGLGPUObject.h"
 #else
-#include "D3D9/D3D9GPUObject.h"
+#include "Direct3D9/D3D9GPUObject.h"
 #endif

Engine/Graphics/Graphics.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #ifdef USE_OPENGL
-#include "OGL/OGLGraphics.h"
+#include "OpenGL/OGLGraphics.h"
 #else
-#include "D3D9/D3D9Graphics.h"
+#include "Direct3D9/D3D9Graphics.h"
 #endif

Engine/Graphics/GraphicsImpl.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #ifdef USE_OPENGL
-#include "OGL/OGLGraphicsImpl.h"
+#include "OpenGL/OGLGraphicsImpl.h"
 #else
-#include "D3D9/D3D9GraphicsImpl.h"
+#include "Direct3D9/D3D9GraphicsImpl.h"
 #endif

Engine/Graphics/IndexBuffer.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #ifdef USE_OPENGL
-#include "OGL/OGLIndexBuffer.h"
+#include "OpenGL/OGLIndexBuffer.h"
 #else
-#include "D3D9/D3D9IndexBuffer.h"
+#include "Direct3D9/D3D9IndexBuffer.h"
 #endif

Engine/Graphics/RenderSurface.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #ifdef USE_OPENGL
-#include "OGL/OGLRenderSurface.h"
+#include "OpenGL/OGLRenderSurface.h"
 #else
-#include "D3D9/D3D9RenderSurface.h"
+#include "Direct3D9/D3D9RenderSurface.h"
 #endif

Engine/Graphics/Renderer.cpp

@@ -707,7 +707,7 @@ void Renderer::Initialize()
     }
     #else
     {
-        shaderPath_ = "Shaders/OGL/";
+        shaderPath_ = "Shaders/GLSL/";
         vsFormat_ = ".vert";
         psFormat_ = ".frag";
     }

Engine/Graphics/Shader.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #ifdef USE_OPENGL
-#include "OGL/OGLShader.h"
+#include "OpenGL/OGLShader.h"
 #else
-#include "D3D9/D3D9Shader.h"
+#include "Direct3D9/D3D9Shader.h"
 #endif

Engine/Graphics/ShaderProgram.h

@@ -24,5 +24,5 @@
 #pragma once
 
 #ifdef USE_OPENGL
-#include "OGL/OGLShaderProgram.h"
+#include "OpenGL/OGLShaderProgram.h"
 #endif

Engine/Graphics/ShaderVariation.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #ifdef USE_OPENGL
-#include "OGL/OGLShaderVariation.h"
+#include "OpenGL/OGLShaderVariation.h"
 #else
-#include "D3D9/D3D9ShaderVariation.h"
+#include "Direct3D9/D3D9ShaderVariation.h"
 #endif

Engine/Graphics/Texture.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #ifdef USE_OPENGL
-#include "OGL/OGLTexture.h"
+#include "OpenGL/OGLTexture.h"
 #else
-#include "D3D9/D3D9Texture.h"
+#include "Direct3D9/D3D9Texture.h"
 #endif

Engine/Graphics/Texture2D.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #ifdef USE_OPENGL
-#include "OGL/OGLTexture2D.h"
+#include "OpenGL/OGLTexture2D.h"
 #else
-#include "D3D9/D3D9Texture2D.h"
+#include "Direct3D9/D3D9Texture2D.h"
 #endif

Engine/Graphics/TextureCube.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #ifdef USE_OPENGL
-#include "OGL/OGLTextureCube.h"
+#include "OpenGL/OGLTextureCube.h"
 #else
-#include "D3D9/D3D9TextureCube.h"
+#include "Direct3D9/D3D9TextureCube.h"
 #endif

Engine/Graphics/VertexBuffer.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #ifdef USE_OPENGL
-#include "OGL/OGLVertexBuffer.h"
+#include "OpenGL/OGLVertexBuffer.h"
 #else
-#include "D3D9/D3D9VertexBuffer.h"
+#include "Direct3D9/D3D9VertexBuffer.h"
 #endif

Engine/Graphics/VertexDeclaration.h

@@ -24,5 +24,5 @@
 #pragma once
 
 #ifndef USE_OPENGL
-#include "D3D9/D3D9VertexDeclaration.h"
+#include "Direct3D9/D3D9VertexDeclaration.h"
 #endif

Engine/UI/UI.cpp

@@ -403,8 +403,8 @@ void UI::Initialize()
     rootElement_->SetSize(graphics->GetWidth(), graphics->GetHeight());
     
     #ifdef USE_OPENGL
-    Shader* basicVS = cache->GetResource<Shader>("Shaders/OGL/Basic.vert");
-    Shader* basicPS = cache->GetResource<Shader>("Shaders/OGL/Basic.frag");
+    Shader* basicVS = cache->GetResource<Shader>("Shaders/GLSL/Basic.vert");
+    Shader* basicPS = cache->GetResource<Shader>("Shaders/GLSL/Basic.frag");
     #else
     Shader* basicVS = cache->GetResource<Shader>("Shaders/SM2/Basic.vs2");
     Shader* basicPS = cache->GetResource<Shader>("Shaders/SM2/Basic.ps2");