Further clean up on the include path for the Graphics sub-library.

Source/Urho3D/CMakeLists.txt

@@ -131,7 +131,7 @@ set_source_files_properties (${ALL_OBJ_FILES} PROPERTIES GENERATED TRUE)
 # Define dependency libs
 if (MSVC)
     # MSVC compiler does not handle quoted include pathspec with relative path the same way as GCC and Clang
-    # Following header search paths must be added in order to make MSVC resolves "../" back to ${CMAKE_CURRENT_SOURCE_DIR}
+    # Following header search path must be added in order to make MSVC resolves "../" back to ${CMAKE_CURRENT_SOURCE_DIR}
     set (MSVC_WORKAROUND MSVC-WORKAROUND)
 endif ()
 # Add include directories to find the precompiled header, export header, and installed headers from thirdparty libs

Source/Urho3D/Graphics/Direct3D9/D3D9GPUObject.cpp

@@ -21,11 +21,11 @@
 //
 
 #include "Precompiled.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../Graphics/GPUObject.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../Graphics/GPUObject.h"
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9GPUObject.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "../Container/Ptr.h"
+#include "../../Container/Ptr.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9Graphics.cpp

@@ -21,46 +21,46 @@
 //
 
 #include "Precompiled.h"
-#include "../Graphics/AnimatedModel.h"
-#include "../Graphics/Animation.h"
-#include "../Graphics/AnimationController.h"
-#include "../Graphics/Camera.h"
-#include "../Core/Context.h"
-#include "../Graphics/CustomGeometry.h"
-#include "../Graphics/DebugRenderer.h"
-#include "../Graphics/DecalSet.h"
-#include "../IO/File.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsEvents.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../Graphics/IndexBuffer.h"
-#include "../IO/Log.h"
-#include "../Graphics/Material.h"
-#include "../Graphics/Octree.h"
-#include "../Graphics/ParticleEffect.h"
-#include "../Graphics/ParticleEmitter.h"
-#include "../Core/ProcessUtils.h"
-#include "../Core/Profiler.h"
-#include "../Resource/ResourceCache.h"
-#include "../Graphics/Shader.h"
-#include "../Graphics/ShaderPrecache.h"
-#include "../Graphics/ShaderVariation.h"
-#include "../Graphics/Skybox.h"
-#include "../Graphics/StaticModelGroup.h"
-#include "../Graphics/Technique.h"
-#include "../Graphics/Terrain.h"
-#include "../Graphics/TerrainPatch.h"
-#include "../Graphics/Texture2D.h"
-#include "../Graphics/Texture3D.h"
-#include "../Graphics/TextureCube.h"
-#include "../Core/Timer.h"
-#include "../Graphics/VertexBuffer.h"
-#include "../Graphics/VertexDeclaration.h"
-#include "../Graphics/Zone.h"
+#include "../../Graphics/AnimatedModel.h"
+#include "../../Graphics/Animation.h"
+#include "../../Graphics/AnimationController.h"
+#include "../../Graphics/Camera.h"
+#include "../../Core/Context.h"
+#include "../../Graphics/CustomGeometry.h"
+#include "../../Graphics/DebugRenderer.h"
+#include "../../Graphics/DecalSet.h"
+#include "../../IO/File.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsEvents.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../Graphics/IndexBuffer.h"
+#include "../../IO/Log.h"
+#include "../../Graphics/Material.h"
+#include "../../Graphics/Octree.h"
+#include "../../Graphics/ParticleEffect.h"
+#include "../../Graphics/ParticleEmitter.h"
+#include "../../Core/ProcessUtils.h"
+#include "../../Core/Profiler.h"
+#include "../../Resource/ResourceCache.h"
+#include "../../Graphics/Shader.h"
+#include "../../Graphics/ShaderPrecache.h"
+#include "../../Graphics/ShaderVariation.h"
+#include "../../Graphics/Skybox.h"
+#include "../../Graphics/StaticModelGroup.h"
+#include "../../Graphics/Technique.h"
+#include "../../Graphics/Terrain.h"
+#include "../../Graphics/TerrainPatch.h"
+#include "../../Graphics/Texture2D.h"
+#include "../../Graphics/Texture3D.h"
+#include "../../Graphics/TextureCube.h"
+#include "../../Core/Timer.h"
+#include "../../Graphics/VertexBuffer.h"
+#include "../../Graphics/VertexDeclaration.h"
+#include "../../Graphics/Zone.h"
 
 #include <SDL/SDL_syswm.h>
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 #ifdef _MSC_VER
 #pragma warning(disable:4355)

Source/Urho3D/Graphics/Direct3D9/D3D9Graphics.h

@@ -22,15 +22,15 @@
 
 #pragma once
 
-#include "../Container/ArrayPtr.h"
-#include "../Math/Color.h"
-#include "../Container/HashSet.h"
-#include "../Resource/Image.h"
-#include "../Core/Mutex.h"
-#include "../Core/Object.h"
-#include "../Math/Plane.h"
-#include "../Math/Rect.h"
-#include "../GraphicsDefs.h"
+#include "../../Container/ArrayPtr.h"
+#include "../../Math/Color.h"
+#include "../../Container/HashSet.h"
+#include "../../Resource/Image.h"
+#include "../../Core/Mutex.h"
+#include "../../Core/Object.h"
+#include "../../Math/Plane.h"
+#include "../../Math/Rect.h"
+#include "../../Graphics/GraphicsDefs.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9GraphicsImpl.cpp

@@ -21,11 +21,11 @@
 //
 
 #include "Precompiled.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsEvents.h"
-#include "../Graphics/GraphicsImpl.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsEvents.h"
+#include "../../Graphics/GraphicsImpl.h"
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9GraphicsImpl.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "../Math/Color.h"
+#include "../../Math/Color.h"
 
 #include <d3d9.h>
 #include <SDL/SDL.h>

Source/Urho3D/Graphics/Direct3D9/D3D9IndexBuffer.cpp

@@ -21,13 +21,13 @@
 //
 
 #include "Precompiled.h"
-#include "../Core/Context.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../Graphics/IndexBuffer.h"
-#include "../IO/Log.h"
+#include "../../Core/Context.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../Graphics/IndexBuffer.h"
+#include "../../IO/Log.h"
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9IndexBuffer.h

@@ -22,10 +22,10 @@
 
 #pragma once
 
-#include "../GPUObject.h"
-#include "../Core/Object.h"
-#include "../GraphicsDefs.h"
-#include "../Container/ArrayPtr.h"
+#include "../../Graphics/GPUObject.h"
+#include "../../Core/Object.h"
+#include "../../Graphics/GraphicsDefs.h"
+#include "../../Container/ArrayPtr.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9RenderSurface.cpp

@@ -21,16 +21,16 @@
 //
 
 #include "Precompiled.h"
-#include "../Graphics/Camera.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../IO/Log.h"
-#include "../Graphics/Renderer.h"
-#include "../Graphics/RenderSurface.h"
-#include "../Scene/Scene.h"
-#include "../Graphics/Texture.h"
-
-#include "../Container/DebugNew.h"
+#include "../../Graphics/Camera.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../IO/Log.h"
+#include "../../Graphics/Renderer.h"
+#include "../../Graphics/RenderSurface.h"
+#include "../../Scene/Scene.h"
+#include "../../Graphics/Texture.h"
+
+#include "../../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9RenderSurface.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "../GraphicsDefs.h"
-#include "../Viewport.h"
+#include "../../Graphics/GraphicsDefs.h"
+#include "../../Graphics/Viewport.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9ShaderVariation.cpp

@@ -21,20 +21,20 @@
 //
 
 #include "Precompiled.h"
-#include "../IO/File.h"
-#include "../IO/FileSystem.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../IO/Log.h"
-#include "../Resource/ResourceCache.h"
-#include "../Graphics/Shader.h"
-#include "../Graphics/ShaderVariation.h"
+#include "../../IO/File.h"
+#include "../../IO/FileSystem.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../IO/Log.h"
+#include "../../Resource/ResourceCache.h"
+#include "../../Graphics/Shader.h"
+#include "../../Graphics/ShaderVariation.h"
 
 #include <windows.h>
 #include <d3dcompiler.h>
 #include <MojoShader/mojoshader.h>
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9ShaderVariation.h

@@ -22,11 +22,11 @@
 
 #pragma once
 
-#include "../GPUObject.h"
-#include "../GraphicsDefs.h"
-#include "../Container/HashSet.h"
-#include "../Container/RefCounted.h"
-#include "../Container/ArrayPtr.h"
+#include "../../Graphics/GPUObject.h"
+#include "../../Graphics/GraphicsDefs.h"
+#include "../../Container/HashSet.h"
+#include "../../Container/RefCounted.h"
+#include "../../Container/ArrayPtr.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9Texture.cpp

@@ -21,17 +21,17 @@
 //
 
 #include "Precompiled.h"
-#include "../IO/FileSystem.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../Graphics/Material.h"
-#include "../Core/Profiler.h"
-#include "../Resource/ResourceCache.h"
-#include "../Core/StringUtils.h"
-#include "../Graphics/Texture.h"
-#include "../Resource/XMLFile.h"
+#include "../../IO/FileSystem.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../Graphics/Material.h"
+#include "../../Core/Profiler.h"
+#include "../../Resource/ResourceCache.h"
+#include "../../Core/StringUtils.h"
+#include "../../Graphics/Texture.h"
+#include "../../Resource/XMLFile.h"
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9Texture.h

@@ -22,10 +22,10 @@
 
 #pragma once
 
-#include "../Math/Color.h"
-#include "../GPUObject.h"
-#include "../GraphicsDefs.h"
-#include "../Resource/Resource.h"
+#include "../../Math/Color.h"
+#include "../../Graphics/GPUObject.h"
+#include "../../Graphics/GraphicsDefs.h"
+#include "../../Resource/Resource.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9Texture2D.cpp

@@ -21,19 +21,19 @@
 //
 
 #include "Precompiled.h"
-#include "../Core/Context.h"
-#include "../IO/FileSystem.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsEvents.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../IO/Log.h"
-#include "../Graphics/Renderer.h"
-#include "../Core/Profiler.h"
-#include "../Resource/ResourceCache.h"
-#include "../Graphics/Texture2D.h"
-#include "../Resource/XMLFile.h"
+#include "../../Core/Context.h"
+#include "../../IO/FileSystem.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsEvents.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../IO/Log.h"
+#include "../../Graphics/Renderer.h"
+#include "../../Core/Profiler.h"
+#include "../../Resource/ResourceCache.h"
+#include "../../Graphics/Texture2D.h"
+#include "../../Resource/XMLFile.h"
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9Texture2D.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "../RenderSurface.h"
-#include "../Container/Ptr.h"
-#include "../Texture.h"
+#include "../../Graphics/RenderSurface.h"
+#include "../../Container/Ptr.h"
+#include "../../Graphics/Texture.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9Texture3D.cpp

@@ -21,19 +21,19 @@
 //
 
 #include "Precompiled.h"
-#include "../Core/Context.h"
-#include "../IO/FileSystem.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsEvents.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../IO/Log.h"
-#include "../Graphics/Renderer.h"
-#include "../Core/Profiler.h"
-#include "../Resource/ResourceCache.h"
-#include "../Graphics/Texture3D.h"
-#include "../Resource/XMLFile.h"
+#include "../../Core/Context.h"
+#include "../../IO/FileSystem.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsEvents.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../IO/Log.h"
+#include "../../Graphics/Renderer.h"
+#include "../../Core/Profiler.h"
+#include "../../Resource/ResourceCache.h"
+#include "../../Graphics/Texture3D.h"
+#include "../../Resource/XMLFile.h"
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9Texture3D.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "../RenderSurface.h"
-#include "../Container/Ptr.h"
-#include "../Texture.h"
+#include "../../Graphics/RenderSurface.h"
+#include "../../Container/Ptr.h"
+#include "../../Graphics/Texture.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9TextureCube.cpp

@@ -21,19 +21,19 @@
 //
 
 #include "Precompiled.h"
-#include "../Core/Context.h"
-#include "../IO/FileSystem.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsEvents.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../IO/Log.h"
-#include "../Core/Profiler.h"
-#include "../Graphics/Renderer.h"
-#include "../Resource/ResourceCache.h"
-#include "../Graphics/TextureCube.h"
-#include "../Resource/XMLFile.h"
+#include "../../Core/Context.h"
+#include "../../IO/FileSystem.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsEvents.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../IO/Log.h"
+#include "../../Core/Profiler.h"
+#include "../../Graphics/Renderer.h"
+#include "../../Resource/ResourceCache.h"
+#include "../../Graphics/TextureCube.h"
+#include "../../Resource/XMLFile.h"
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 #ifdef _MSC_VER
 #pragma warning(disable:4355)

Source/Urho3D/Graphics/Direct3D9/D3D9TextureCube.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "../RenderSurface.h"
-#include "../Container/Ptr.h"
-#include "../Texture.h"
+#include "../../Graphics/RenderSurface.h"
+#include "../../Container/Ptr.h"
+#include "../../Graphics/Texture.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9VertexBuffer.cpp

@@ -21,12 +21,12 @@
 //
 
 #include "Precompiled.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../IO/Log.h"
-#include "../Graphics/VertexBuffer.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../IO/Log.h"
+#include "../../Graphics/VertexBuffer.h"
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9VertexBuffer.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "../GPUObject.h"
-#include "../GraphicsDefs.h"
-#include "../Container/ArrayPtr.h"
+#include "../../Graphics/GPUObject.h"
+#include "../../Graphics/GraphicsDefs.h"
+#include "../../Container/ArrayPtr.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9VertexDeclaration.cpp

@@ -21,12 +21,12 @@
 //
 
 #include "Precompiled.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../Graphics/VertexBuffer.h"
-#include "../Graphics/VertexDeclaration.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../Graphics/VertexBuffer.h"
+#include "../../Graphics/VertexDeclaration.h"
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/Direct3D9/D3D9VertexDeclaration.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "../GraphicsDefs.h"
-#include "../Container/RefCounted.h"
-#include "../Container/Vector.h"
+#include "../../Graphics/GraphicsDefs.h"
+#include "../../Container/RefCounted.h"
+#include "../../Container/Vector.h"
 
 #include <d3d9.h>
 

Source/Urho3D/Graphics/OpenGL/OGLGPUObject.cpp

@@ -21,10 +21,10 @@
 //
 
 #include "Precompiled.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GPUObject.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GPUObject.h"
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/OpenGL/OGLGPUObject.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "../Container/Ptr.h"
+#include "../../Container/Ptr.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/OpenGL/OGLGraphics.cpp

@@ -21,48 +21,48 @@
 //
 
 #include "Precompiled.h"
-#include "../Graphics/AnimatedModel.h"
-#include "../Graphics/Animation.h"
-#include "../Graphics/AnimationController.h"
-#include "../Graphics/BillboardSet.h"
-#include "../Graphics/Camera.h"
-#include "../Core/Context.h"
-#include "../Graphics/CustomGeometry.h"
-#include "../Graphics/DebugRenderer.h"
-#include "../Graphics/DecalSet.h"
-#include "../IO/File.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsEvents.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../Graphics/IndexBuffer.h"
-#include "../IO/Log.h"
-#include "../Graphics/Material.h"
-#include "../Core/Mutex.h"
-#include "../Graphics/Octree.h"
-#include "../Graphics/ParticleEffect.h"
-#include "../Graphics/ParticleEmitter.h"
-#include "../Core/ProcessUtils.h"
-#include "../Core/Profiler.h"
-#include "../Graphics/RenderSurface.h"
-#include "../Resource/ResourceCache.h"
-#include "../Graphics/Shader.h"
-#include "../Graphics/ShaderPrecache.h"
-#include "../Graphics/ShaderProgram.h"
-#include "../Graphics/ShaderVariation.h"
-#include "../Graphics/Skybox.h"
-#include "../Graphics/StaticModelGroup.h"
-#include "../Graphics/Technique.h"
-#include "../Graphics/Terrain.h"
-#include "../Graphics/TerrainPatch.h"
-#include "../Graphics/Texture2D.h"
-#include "../Graphics/Texture3D.h"
-#include "../Graphics/TextureCube.h"
-#include "../Graphics/VertexBuffer.h"
-#include "../Graphics/Zone.h"
+#include "../../Graphics/AnimatedModel.h"
+#include "../../Graphics/Animation.h"
+#include "../../Graphics/AnimationController.h"
+#include "../../Graphics/BillboardSet.h"
+#include "../../Graphics/Camera.h"
+#include "../../Core/Context.h"
+#include "../../Graphics/CustomGeometry.h"
+#include "../../Graphics/DebugRenderer.h"
+#include "../../Graphics/DecalSet.h"
+#include "../../IO/File.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsEvents.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../Graphics/IndexBuffer.h"
+#include "../../IO/Log.h"
+#include "../../Graphics/Material.h"
+#include "../../Core/Mutex.h"
+#include "../../Graphics/Octree.h"
+#include "../../Graphics/ParticleEffect.h"
+#include "../../Graphics/ParticleEmitter.h"
+#include "../../Core/ProcessUtils.h"
+#include "../../Core/Profiler.h"
+#include "../../Graphics/RenderSurface.h"
+#include "../../Resource/ResourceCache.h"
+#include "../../Graphics/Shader.h"
+#include "../../Graphics/ShaderPrecache.h"
+#include "../../Graphics/ShaderProgram.h"
+#include "../../Graphics/ShaderVariation.h"
+#include "../../Graphics/Skybox.h"
+#include "../../Graphics/StaticModelGroup.h"
+#include "../../Graphics/Technique.h"
+#include "../../Graphics/Terrain.h"
+#include "../../Graphics/TerrainPatch.h"
+#include "../../Graphics/Texture2D.h"
+#include "../../Graphics/Texture3D.h"
+#include "../../Graphics/TextureCube.h"
+#include "../../Graphics/VertexBuffer.h"
+#include "../../Graphics/Zone.h"
 
 #include <stdio.h>
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 #ifdef GL_ES_VERSION_2_0
 #define GL_DEPTH_COMPONENT24 GL_DEPTH_COMPONENT24_OES

Source/Urho3D/Graphics/OpenGL/OGLGraphics.h

@@ -22,14 +22,14 @@
 
 #pragma once
 
-#include "../Container/ArrayPtr.h"
-#include "../Math/Color.h"
-#include "../GraphicsDefs.h"
-#include "../Resource/Image.h"
-#include "../Core/Mutex.h"
-#include "../Core/Object.h"
-#include "../Math/Plane.h"
-#include "../Math/Rect.h"
+#include "../../Container/ArrayPtr.h"
+#include "../../Math/Color.h"
+#include "../../Graphics/GraphicsDefs.h"
+#include "../../Resource/Image.h"
+#include "../../Core/Mutex.h"
+#include "../../Core/Object.h"
+#include "../../Math/Plane.h"
+#include "../../Math/Rect.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/OpenGL/OGLGraphicsImpl.cpp

@@ -21,10 +21,10 @@
 //
 
 #include "Precompiled.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsImpl.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsImpl.h"
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/OpenGL/OGLGraphicsImpl.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "../Math/Color.h"
-#include "../Container/HashMap.h"
-#include "../Core/Timer.h"
+#include "../../Math/Color.h"
+#include "../../Container/HashMap.h"
+#include "../../Core/Timer.h"
 
 #if defined(ANDROID) || defined (RPI)
 #include <GLES2/gl2.h>

Source/Urho3D/Graphics/OpenGL/OGLIndexBuffer.cpp

@@ -21,15 +21,15 @@
 //
 
 #include "Precompiled.h"
-#include "../Core/Context.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../Graphics/IndexBuffer.h"
-#include "../IO/Log.h"
+#include "../../Core/Context.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../Graphics/IndexBuffer.h"
+#include "../../IO/Log.h"
 
 #include <cstring>
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/OpenGL/OGLIndexBuffer.h

@@ -22,10 +22,10 @@
 
 #pragma once
 
-#include "../Container/ArrayPtr.h"
-#include "../GPUObject.h"
-#include "../Core/Object.h"
-#include "../GraphicsDefs.h"
+#include "../../Container/ArrayPtr.h"
+#include "../../Graphics/GPUObject.h"
+#include "../../Core/Object.h"
+#include "../../Graphics/GraphicsDefs.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/OpenGL/OGLRenderSurface.cpp

@@ -21,16 +21,16 @@
 //
 
 #include "Precompiled.h"
-#include "../Graphics/Camera.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../IO/Log.h"
-#include "../Graphics/Renderer.h"
-#include "../Graphics/RenderSurface.h"
-#include "../Scene/Scene.h"
-#include "../Graphics/Texture.h"
-
-#include "../Container/DebugNew.h"
+#include "../../Graphics/Camera.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../IO/Log.h"
+#include "../../Graphics/Renderer.h"
+#include "../../Graphics/RenderSurface.h"
+#include "../../Scene/Scene.h"
+#include "../../Graphics/Texture.h"
+
+#include "../../Container/DebugNew.h"
 
 #ifdef GL_ES_VERSION_2_0
 #define GL_RENDERBUFFER_EXT GL_RENDERBUFFER

Source/Urho3D/Graphics/OpenGL/OGLRenderSurface.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "../GraphicsDefs.h"
-#include "../Viewport.h"
+#include "../../Graphics/GraphicsDefs.h"
+#include "../../Graphics/Viewport.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/OpenGL/OGLShaderProgram.cpp

@@ -21,12 +21,12 @@
 //
 
 #include "Precompiled.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../Graphics/ShaderProgram.h"
-#include "../Graphics/ShaderVariation.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../Graphics/ShaderProgram.h"
+#include "../../Graphics/ShaderVariation.h"
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/OpenGL/OGLShaderProgram.h

@@ -22,10 +22,10 @@
 
 #pragma once
 
-#include "../GPUObject.h"
-#include "../GraphicsDefs.h"
-#include "../Container/HashMap.h"
-#include "../Container/RefCounted.h"
+#include "../../Graphics/GPUObject.h"
+#include "../../Graphics/GraphicsDefs.h"
+#include "../../Container/HashMap.h"
+#include "../../Container/RefCounted.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/OpenGL/OGLShaderVariation.cpp

@@ -21,14 +21,14 @@
 //
 
 #include "Precompiled.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../IO/Log.h"
-#include "../Graphics/Shader.h"
-#include "../Graphics/ShaderProgram.h"
-#include "../Graphics/ShaderVariation.h"
-
-#include "../Container/DebugNew.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../IO/Log.h"
+#include "../../Graphics/Shader.h"
+#include "../../Graphics/ShaderProgram.h"
+#include "../../Graphics/ShaderVariation.h"
+
+#include "../../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/OpenGL/OGLShaderVariation.h

@@ -22,10 +22,10 @@
 
 #pragma once
 
-#include "../Container/ArrayPtr.h"
-#include "../GPUObject.h"
-#include "../GraphicsDefs.h"
-#include "../Container/RefCounted.h"
+#include "../../Container/ArrayPtr.h"
+#include "../../Graphics/GPUObject.h"
+#include "../../Graphics/GraphicsDefs.h"
+#include "../../Container/RefCounted.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/OpenGL/OGLTexture.cpp

@@ -21,18 +21,18 @@
 //
 
 #include "Precompiled.h"
-#include "../IO/FileSystem.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../IO/Log.h"
-#include "../Graphics/Material.h"
-#include "../Core/Profiler.h"
-#include "../Graphics/RenderSurface.h"
-#include "../Resource/ResourceCache.h"
-#include "../Graphics/Texture.h"
-#include "../Resource/XMLFile.h"
-
-#include "../Container/DebugNew.h"
+#include "../../IO/FileSystem.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../IO/Log.h"
+#include "../../Graphics/Material.h"
+#include "../../Core/Profiler.h"
+#include "../../Graphics/RenderSurface.h"
+#include "../../Resource/ResourceCache.h"
+#include "../../Graphics/Texture.h"
+#include "../../Resource/XMLFile.h"
+
+#include "../../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/OpenGL/OGLTexture.h

@@ -22,10 +22,10 @@
 
 #pragma once
 
-#include "../Math/Color.h"
-#include "../GPUObject.h"
-#include "../GraphicsDefs.h"
-#include "../Resource/Resource.h"
+#include "../../Math/Color.h"
+#include "../../Graphics/GPUObject.h"
+#include "../../Graphics/GraphicsDefs.h"
+#include "../../Resource/Resource.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/OpenGL/OGLTexture2D.cpp

@@ -21,20 +21,20 @@
 //
 
 #include "Precompiled.h"
-#include "../Core/Context.h"
-#include "../IO/FileSystem.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsEvents.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../Resource/Image.h"
-#include "../IO/Log.h"
-#include "../Core/Profiler.h"
-#include "../Graphics/Renderer.h"
-#include "../Resource/ResourceCache.h"
-#include "../Graphics/Texture2D.h"
-#include "../Resource/XMLFile.h"
+#include "../../Core/Context.h"
+#include "../../IO/FileSystem.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsEvents.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../Resource/Image.h"
+#include "../../IO/Log.h"
+#include "../../Core/Profiler.h"
+#include "../../Graphics/Renderer.h"
+#include "../../Resource/ResourceCache.h"
+#include "../../Graphics/Texture2D.h"
+#include "../../Resource/XMLFile.h"
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/OpenGL/OGLTexture2D.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "../RenderSurface.h"
-#include "../Container/Ptr.h"
-#include "../Texture.h"
+#include "../../Graphics/RenderSurface.h"
+#include "../../Container/Ptr.h"
+#include "../../Graphics/Texture.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/OpenGL/OGLTexture3D.cpp

@@ -21,19 +21,19 @@
 //
 
 #include "Precompiled.h"
-#include "../Core/Context.h"
-#include "../IO/FileSystem.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsEvents.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../IO/Log.h"
-#include "../Core/Profiler.h"
-#include "../Graphics/Renderer.h"
-#include "../Resource/ResourceCache.h"
-#include "../Graphics/Texture3D.h"
-#include "../Resource/XMLFile.h"
+#include "../../Core/Context.h"
+#include "../../IO/FileSystem.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsEvents.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../IO/Log.h"
+#include "../../Core/Profiler.h"
+#include "../../Graphics/Renderer.h"
+#include "../../Resource/ResourceCache.h"
+#include "../../Graphics/Texture3D.h"
+#include "../../Resource/XMLFile.h"
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/OpenGL/OGLTexture3D.h

@@ -22,10 +22,10 @@
 
 #pragma once
 
-#include "../Resource/Image.h"
-#include "../RenderSurface.h"
-#include "../Container/Ptr.h"
-#include "../Texture.h"
+#include "../../Resource/Image.h"
+#include "../../Graphics/RenderSurface.h"
+#include "../../Container/Ptr.h"
+#include "../../Graphics/Texture.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/OpenGL/OGLTextureCube.cpp

@@ -21,19 +21,19 @@
 //
 
 #include "Precompiled.h"
-#include "../Core/Context.h"
-#include "../IO/FileSystem.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsEvents.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../IO/Log.h"
-#include "../Core/Profiler.h"
-#include "../Graphics/Renderer.h"
-#include "../Resource/ResourceCache.h"
-#include "../Graphics/TextureCube.h"
-#include "../Resource/XMLFile.h"
+#include "../../Core/Context.h"
+#include "../../IO/FileSystem.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsEvents.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../IO/Log.h"
+#include "../../Core/Profiler.h"
+#include "../../Graphics/Renderer.h"
+#include "../../Resource/ResourceCache.h"
+#include "../../Graphics/TextureCube.h"
+#include "../../Resource/XMLFile.h"
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 #ifdef _MSC_VER
 #pragma warning(disable:4355)

Source/Urho3D/Graphics/OpenGL/OGLTextureCube.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "../RenderSurface.h"
-#include "../Container/Ptr.h"
-#include "../Texture.h"
+#include "../../Graphics/RenderSurface.h"
+#include "../../Container/Ptr.h"
+#include "../../Graphics/Texture.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/OpenGL/OGLVertexBuffer.cpp

@@ -21,14 +21,14 @@
 //
 
 #include "Precompiled.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsImpl.h"
-#include "../IO/Log.h"
-#include "../Graphics/VertexBuffer.h"
+#include "../../Graphics/Graphics.h"
+#include "../../Graphics/GraphicsImpl.h"
+#include "../../IO/Log.h"
+#include "../../Graphics/VertexBuffer.h"
 
 #include <cstring>
 
-#include "../Container/DebugNew.h"
+#include "../../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Graphics/OpenGL/OGLVertexBuffer.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "../Container/ArrayPtr.h"
-#include "../GPUObject.h"
-#include "../GraphicsDefs.h"
+#include "../../Container/ArrayPtr.h"
+#include "../../Graphics/GPUObject.h"
+#include "../../Graphics/GraphicsDefs.h"
 
 namespace Urho3D
 {