Clean includes.

OpenXRay · Sep 30, 2015 · 9511121 · 9511121
1 parent 28cd255
commit 9511121
Show file tree

Hide file tree

Showing 223 changed files with 881 additions and 1,093 deletions.
diff --git a/src/Layers/xrRender/Blender_Recorder_StandartBinding.cpp b/src/Layers/xrRender/Blender_Recorder_StandartBinding.cpp
@@ -10,8 +10,8 @@
 #include "blenders\Blender_Recorder.h"
 #include "blenders\Blender.h"
 
-#include "xrEngine/igame_persistent.h"
-#include "xrEngine/environment.h"
+#include "xrEngine/IGame_Persistent.h"
+#include "xrEngine/Environment.h"
 
 #include "dxRenderDeviceRender.h"
 

diff --git a/src/Layers/xrRender/DetailManager.cpp b/src/Layers/xrRender/DetailManager.cpp
@@ -12,11 +12,11 @@
 #	include "ESceneClassList.h"
 #	include "Scene.h"
 #	include "SceneObject.h"
-#	include "igame_persistent.h"
-#	include "environment.h"
+#	include "IGame_Persistent.h"
+#	include "Environment.h"
 #else
-#	include "xrEngine/igame_persistent.h"
-#	include "xrEngine/environment.h"
+#	include "xrEngine/IGame_Persistent.h"
+#	include "xrEngine/Environment.h"
 #   include <xmmintrin.h>
 #endif
 

diff --git a/src/Layers/xrRender/DetailManager_Decompress.cpp b/src/Layers/xrRender/DetailManager_Decompress.cpp
@@ -1,13 +1,11 @@
 #include "stdafx.h"
 #pragma hdrstop
-
 #include "DetailManager.h"
 #include "xrCDB/Intersect.hpp"
-
 #ifdef _EDITOR
-#	include "scene.h"
-#	include "sceneobject.h"
-#	include "../utils/ETools/ETools.h"
+#include "scene.h"
+#include "sceneobject.h"
+#include "utils/ETools/ETools.h"
 #endif
 
 //--------------------------------------------------- Decompression

diff --git a/src/Layers/xrRender/DetailManager_VS.cpp b/src/Layers/xrRender/DetailManager_VS.cpp
@@ -1,17 +1,14 @@
 #include "stdafx.h"
 #pragma hdrstop
-
-#include "detailmanager.h"
-
+#include "DetailManager.h"
 #ifdef _EDITOR
-#	include "igame_persistent.h"
-#	include "environment.h"
+#include "IGame_Persistent.h"
+#include "Environment.h"
 #else
-#	include "xrEngine/igame_persistent.h"
-#	include "xrEngine/environment.h"
+#include "xrEngine/IGame_Persistent.h"
+#include "xrEngine/Environment.h"
 #endif
-
-#include "../xrRenderDX10/dx10BufferUtils.h"
+#include "Layers/xrRenderDX10/dx10BufferUtils.h"
 
 const int			quant	= 16384;
 const int			c_hdr	= 10;

diff --git a/src/Layers/xrRender/FBasicVisual.cpp b/src/Layers/xrRender/FBasicVisual.cpp
@@ -9,7 +9,7 @@
 #	include "xrEngine/render.h"
 #endif // #ifndef _EDITOR
 
-#include "fbasicvisual.h"
+#include "FBasicVisual.h"
 #include "xrCore/FMesh.hpp"
 
 //////////////////////////////////////////////////////////////////////

diff --git a/src/Layers/xrRender/FHierrarhyVisual.h b/src/Layers/xrRender/FHierrarhyVisual.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "fbasicvisual.h"
+#include "FBasicVisual.h"
 
 class  FHierrarhyVisual : public dxRender_Visual
 {

diff --git a/src/Layers/xrRender/FLOD.cpp b/src/Layers/xrRender/FLOD.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "xrCore/FMesh.hpp"
-#include "flod.h"
+#include "FLOD.h"
 
 struct _hw 
 {

diff --git a/src/Layers/xrRender/FLOD.h b/src/Layers/xrRender/FLOD.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "fhierrarhyvisual.h"
+#include "FHierrarhyVisual.h"
 
 class	FLOD	:	public FHierrarhyVisual
 {

diff --git a/src/Layers/xrRender/FSkinned.cpp b/src/Layers/xrRender/FSkinned.cpp
@@ -1,7 +1,3 @@
-// SkeletonX.cpp: implementation of the CSkeletonX class.
-//
-//////////////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #pragma hdrstop
 
@@ -10,12 +6,10 @@
 #pragma warning(default:4995)
 
 #include "xrCore/FMesh.hpp"
-#include "../../xrCPU_Pipe/xrCPU_Pipe.h"
+#include "xrCPU_Pipe/xrCPU_Pipe.h"
 #include "FSkinned.h"
 #include "SkeletonX.h"
-
-#include "../xrRenderDX10/dx10BufferUtils.h"
-
+#include "Layers/xrRenderDX10/dx10BufferUtils.h"
 #include "xrEngine/EnnumerateVertices.h"
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

diff --git a/src/Layers/xrRender/FTreeVisual.cpp b/src/Layers/xrRender/FTreeVisual.cpp
@@ -1,12 +1,11 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "xrEngine/igame_persistent.h"
-#include "xrEngine/igame_level.h"
-#include "xrEngine/environment.h"
+#include "xrEngine/IGame_Persistent.h"
+#include "xrEngine/IGame_Level.h"
+#include "xrEngine/Environment.h"
 #include "xrCore/FMesh.hpp"
-
-#include "ftreevisual.h"
+#include "FTreeVisual.h"
 
 shared_str					m_xform		;
 shared_str					m_xform_v	;

diff --git a/src/Layers/xrRender/FVisual.cpp b/src/Layers/xrRender/FVisual.cpp
@@ -1,7 +1,3 @@
-// FVisual.cpp: implementation of the FVisual class.
-//
-//////////////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #pragma hdrstop
 
@@ -10,9 +6,8 @@
 #pragma warning(default:4995)
 
 #include "xrCore/FMesh.hpp"
-#include "fvisual.h"
-
-#include "../xrRenderDX10/dx10BufferUtils.h"
+#include "FVisual.h"
+#include "Layers/xrRenderDX10/dx10BufferUtils.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

diff --git a/src/Layers/xrRender/FVisual.h b/src/Layers/xrRender/FVisual.h
@@ -6,9 +6,9 @@
 #pragma once
 
 #ifdef _EDITOR
-#	include "fbasicvisual.h"
+#	include "FBasicVisual.h"
 #else
-#	include "fbasicvisual.h"
+#	include "FBasicVisual.h"
 #endif
 
 class	Fvisual					: public		dxRender_Visual, public IRender_Mesh

diff --git a/src/Layers/xrRender/HOM.cpp b/src/Layers/xrRender/HOM.cpp
@@ -6,7 +6,6 @@
 #include "HOM.h"
 #include "occRasterizer.h"
 #include "xrEngine/GameFont.h"
-
 #include "dxRenderDeviceRender.h"
 
 float	psOSSR		= .001f;

diff --git a/src/Layers/xrRender/LightTrack.cpp b/src/Layers/xrRender/LightTrack.cpp
@@ -8,11 +8,11 @@
 #include "xrEngine/xr_object.h"
 
 #ifdef _EDITOR
-#	include "igame_persistent.h"
-#	include "environment.h"
+#	include "IGame_Persistent.h"
+#	include "Environment.h"
 #else
-#	include "xrEngine/igame_persistent.h"
-#	include "xrEngine/environment.h"
+#	include "xrEngine/IGame_Persistent.h"
+#	include "xrEngine/Environment.h"
 #endif
 
 //////////////////////////////////////////////////////////////////////

diff --git a/src/Layers/xrRender/Light_DB.cpp b/src/Layers/xrRender/Light_DB.cpp
@@ -1,9 +1,9 @@
 #include "StdAfx.h"
 #include "xrEngine/_d3d_extensions.h"
 #include "xrEngine/xrLevel.h"
-#include "xrEngine/igame_persistent.h"
-#include "xrEngine/environment.h"
-#include "../../utils/xrLC_Light/R_light.h"
+#include "xrEngine/IGame_Persistent.h"
+#include "xrEngine/Environment.h"
+#include "utils/xrLC_Light/R_light.h"
 #include "light_db.h"
 
 CLight_DB::CLight_DB()

diff --git a/src/Layers/xrRender/ModelPool.cpp b/src/Layers/xrRender/ModelPool.cpp
@@ -6,23 +6,23 @@
 #ifndef _EDITOR
 	#include "xrEngine/IGame_Persistent.h"
     #include "xrCore/FMesh.hpp"
-    #include "fhierrarhyvisual.h"
+    #include "FHierrarhyVisual.h"
     #include "SkeletonAnimated.h"
-	#include "fvisual.h"
-	#include "fprogressive.h"
-	#include "fskinned.h"
-	#include "flod.h"
-    #include "ftreevisual.h"
+	#include "FVisual.h"
+	#include "FProgressive.h"
+	#include "FSkinned.h"
+	#include "FLOD.h"
+    #include "FTreeVisual.h"
     #include "ParticleGroup.h"
     #include "ParticleEffect.h"
 #else
-    #include "fmesh.h"
-    #include "fvisual.h"
-    #include "fprogressive.h"
+    #include "FMesh.h"
+    #include "FVisual.h"
+    #include "FProgressive.h"
     #include "ParticleEffect.h"
     #include "ParticleGroup.h"
-	#include "fskinned.h"
-    #include "fhierrarhyvisual.h"
+	#include "FSkinned.h"
+    #include "FHierrarhyVisual.h"
     #include "SkeletonAnimated.h"
 	#include "IGame_Persistent.h"
 #endif

diff --git a/src/Layers/xrRender/PSLibrary.cpp b/src/Layers/xrRender/PSLibrary.cpp
@@ -1,16 +1,11 @@
-//----------------------------------------------------
-// file: PSLibrary.cpp
-//----------------------------------------------------
 #include "stdafx.h"
 #pragma hdrstop
-
 #include "PSLibrary.h"
 #include "ParticleEffect.h"
 #include "ParticleGroup.h"
-
 #ifdef _EDITOR
-#	include "ParticleEffectActions.h"
-#include "../ECore/Editor/ui_main.h"
+#include "ParticleEffectActions.h"
+#include "editors/ECore/Editor/ui_main.h"
 #endif
 
 #define _game_data_			"$game_data$"

diff --git a/src/Layers/xrRender/ParticleEffect.cpp b/src/Layers/xrRender/ParticleEffect.cpp
@@ -1,11 +1,9 @@
 #include "stdafx.h"
 #pragma hdrstop
-
 #include "ParticleEffect.h"
-
 #ifndef _EDITOR
 #include <xmmintrin.h>
-#include "../../xrCPU_Pipe/ttapi.h"
+#include "xrCPU_Pipe/ttapi.h"
 #pragma comment(lib,"xrCPU_Pipe.lib")
 #endif
 

diff --git a/src/Layers/xrRender/ParticleEffect.h b/src/Layers/xrRender/ParticleEffect.h
@@ -1,16 +1,12 @@
-//---------------------------------------------------------------------------
 #ifndef ParticleEffectH
 #define ParticleEffectH
-//---------------------------------------------------------------------------
-
 #include "ParticleEffectDef.h"
-
 #ifdef _EDITOR
-#	include "Layers/xrRender/FBasicVisual.h"
-#	include "Layers/xrRender/dxParticleCustom.h"
+#include "Layers/xrRender/FBasicVisual.h"
+#include "Layers/xrRender/dxParticleCustom.h"
 #else // _EDITOR
-#	include "../xrRender/FBasicVisual.h"
-#	include "../xrRender/dxParticleCustom.h"
+#include "Layers/xrRender/FBasicVisual.h"
+#include "Layers/xrRender/dxParticleCustom.h"
 #endif // _EDITOR
 
 namespace PS

diff --git a/src/Layers/xrRender/ParticleGroup.h b/src/Layers/xrRender/ParticleGroup.h
@@ -2,7 +2,7 @@
 #ifndef ParticleGroupH
 #define ParticleGroupH
 
-#include "../xrRender/dxParticleCustom.h"
+#include "Layers/xrRender/dxParticleCustom.h"
 
 namespace PS
 {

diff --git a/src/Layers/xrRender/R_Backend.cpp b/src/Layers/xrRender/R_Backend.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "../xrRenderDX10/dx10BufferUtils.h"
+#include "Layers/xrRenderDX10/dx10BufferUtils.h"
 
 CBackend			RCache;
 

diff --git a/src/Layers/xrRender/R_Backend_Runtime.cpp b/src/Layers/xrRender/R_Backend_Runtime.cpp
@@ -9,8 +9,8 @@
 #include "xrCDB/frustum.h"
 
 #if defined(USE_DX10) || defined(USE_DX11)
-#include "../xrRenderDX10/StateManager/dx10StateManager.h"
-#include "../xrRenderDX10/StateManager/dx10ShaderResourceStateCache.h"
+#include "Layers/xrRenderDX10/StateManager/dx10StateManager.h"
+#include "Layers/xrRenderDX10/StateManager/dx10ShaderResourceStateCache.h"
 #endif	USE_DX10
 
 void CBackend::OnFrameEnd	()

diff --git a/src/Layers/xrRender/R_Backend_Runtime.h b/src/Layers/xrRender/R_Backend_Runtime.h
@@ -8,10 +8,10 @@
 #include "sh_rt.h"
 
 #if defined(USE_DX10) || defined(USE_DX11)
-#include "../xrRenderDX10/dx10R_Backend_Runtime.h"
-#include "../xrRenderDX10/StateManager/dx10State.h"
+#include "Layers/xrRenderDX10/dx10R_Backend_Runtime.h"
+#include "Layers/xrRenderDX10/StateManager/dx10State.h"
 #else	//	USE_DX10
-#include "../xrRenderDX9/dx9R_Backend_Runtime.h"
+#include "Layers/xrRenderDX9/dx9R_Backend_Runtime.h"
 #endif	//	USE_DX10
 
 IC void		R_xforms::set_c_w			(R_constant* C)		{	c_w		= C;	RCache.set_c(C,m_w);	};

diff --git a/src/Layers/xrRender/R_DStreams.cpp b/src/Layers/xrRender/R_DStreams.cpp
@@ -1,10 +1,8 @@
 #include "stdafx.h"
 #pragma hdrstop
-
 #include "ResourceManager.h"
 #include "R_DStreams.h"
-
-#include "../xrRender/dxRenderDeviceRender.h"
+#include "Layers/xrRender/dxRenderDeviceRender.h"
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

diff --git a/src/Layers/xrRender/SH_Atomic.h b/src/Layers/xrRender/SH_Atomic.h
@@ -3,9 +3,8 @@
 #pragma once
 #include "xrCore/xr_resource.h"
 #include "tss_def.h"
-
 #if defined(USE_DX10) || defined(USE_DX11)
-#include "../xrRenderDX10/StateManager/dx10State.h"
+#include "Layers/xrRenderDX10/StateManager/dx10State.h"
 #endif	//	USE_DX10
 
 #pragma pack(push,4)

diff --git a/src/Layers/xrRender/SkeletonCustom.h b/src/Layers/xrRender/SkeletonCustom.h
@@ -2,7 +2,7 @@
 #ifndef SkeletonCustomH
 #define SkeletonCustomH
 
-#include		"fhierrarhyvisual.h"
+#include		"FHierrarhyVisual.h"
 #include "xrCore/Animation/Bone.hpp"
 #include		"Include/xrRender/Kinematics.h"
 

diff --git a/src/Layers/xrRender/SkeletonX.cpp b/src/Layers/xrRender/SkeletonX.cpp
@@ -10,15 +10,14 @@
 #pragma warning(default:4995)
 
 #ifndef _EDITOR
-	#include	"xrEngine/Render.h"
+#include "xrEngine/Render.h"
 #else
-	#include "Include/xrAPI/xrAPI.h"
+#include "Include/xrAPI/xrAPI.h"
 #endif
-
 #include "SkeletonX.h"
 #include "SkeletonCustom.h"
 #include "xrCore/FMesh.hpp"
-#include "../../xrCPU_Pipe/xrCPU_Pipe.h"
+#include "xrCPU_Pipe/xrCPU_Pipe.h"
 
 shared_str	s_bones_array_const;
 

diff --git a/src/Layers/xrRender/WallmarksEngine.cpp b/src/Layers/xrRender/WallmarksEngine.cpp
@@ -4,7 +4,6 @@
 
 #include "stdafx.h"
 #include "WallmarksEngine.h"
-
 #include "xrEngine/xr_object.h"
 #include "xrEngine/x_ray.h"
 #include "xrEngine/GameFont.h"