Clean includes, delete unused sources.

OpenXRay · Sep 29, 2015 · 28cd255 · 28cd255
1 parent def053c
commit 28cd255
Show file tree

Hide file tree

Showing 1,501 changed files with 4,095 additions and 40,009 deletions.
diff --git a/src/3rd party/crypto/crypto.h b/src/3rd party/crypto/crypto.h
@@ -1,7 +1,7 @@
 #ifndef CRYPTO_INCLUDED
 #define CRYPTO_INCLUDED
 
-#include "../../xrCore/xrCore.h"
+#include "xrCore/xrCore.h"
 #include "xr_dsa.h"
 #include "xr_sha.h"
 

diff --git a/src/3rd party/crypto/xr_dsa.h b/src/3rd party/crypto/xr_dsa.h
@@ -2,7 +2,7 @@
 #define XR_DSA_INCLUDED
 
 #include "crypto_api_def.h"
-#include "../../xrCore/xrCore.h"
+#include "xrCore/xrCore.h"
 
 struct dsa_st;
 

diff --git a/src/3rd party/crypto/xr_sha.h b/src/3rd party/crypto/xr_sha.h
@@ -2,7 +2,7 @@
 #define XR_SHA_INCLUDED
 
 #include "crypto_api_def.h"
-#include "../../xrCore/xrCore.h"
+#include "xrCore/xrCore.h"
 
 struct SHAstate_st;
 

diff --git a/src/Include/xrRender/FactoryPtr.h b/src/Include/xrRender/FactoryPtr.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "RenderFactory.h"
-#include "../../Include/xrAPI/xrAPI.h"
+#include "Include/xrAPI/xrAPI.h"
 
 #define FACTORY_PTR_INSTANCIATE(Class) \
 	inline void FactoryPtr<I##Class>::CreateObject(void) \

diff --git a/src/Include/xrRender/KinematicsAnimated.h b/src/Include/xrRender/KinematicsAnimated.h
@@ -4,7 +4,7 @@
 
 #include "xrCore/Animation/SkeletonMotions.hpp"
 #include "animation_blend.h"
-#include "../../layers/xrrender/KinematicAnimatedDefs.h"
+#include "Layers/xrrender/KinematicAnimatedDefs.h"
 
 class	 IKinematics;
 class    CBlend;

diff --git a/src/Include/xrRender/RainRender.h b/src/Include/xrRender/RainRender.h
@@ -5,7 +5,7 @@
 class CEffect_Rain;
 //struct Fsphere;
 
-#include "../../xrCore/_sphere.h"
+#include "xrCore/_sphere.h"
 
 class IRainRender
 {

diff --git a/src/Layers/xrAPI/xrAPI.cpp b/src/Layers/xrAPI/xrAPI.cpp
@@ -2,7 +2,7 @@
 //
 
 #include "stdafx.h"
-#include "../../Include/xrApi/xrAPI.h"
+#include "Include/xrAPI/xrAPI.h"
 
 XRAPI_API IRender_interface*	Render = NULL;
 XRAPI_API IRenderFactory*	RenderFactory = NULL;

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/D3DUtils.cpp b/src/Layers/xrRender/D3DUtils.cpp
@@ -3,7 +3,7 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "../../xrEngine/gamefont.h"
+#include "xrEngine/gamefont.h"
 #include "d3dutils.h"
 #include "du_box.h"
 #include "du_sphere.h"

diff --git a/src/Layers/xrRender/DetailManager.cpp b/src/Layers/xrRender/DetailManager.cpp
@@ -15,8 +15,8 @@
 #	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.h b/src/Layers/xrRender/DetailManager.h
@@ -6,7 +6,7 @@
 #define DetailManagerH
 #pragma once
 
-#include "../../xrCore/xrpool.h"
+#include "xrCore/xrpool.h"
 #include "detailformat.h"
 #include "detailmodel.h"
 

diff --git a/src/Layers/xrRender/DetailManager_Decompress.cpp b/src/Layers/xrRender/DetailManager_Decompress.cpp
@@ -42,7 +42,7 @@ IC bool		InterpolateAndDither(float* alpha255,	u32 x, u32 y, u32 sx, u32 sy, u32
 
 #ifndef _EDITOR
 #ifdef	DEBUG
-//#include "../../Include/xrRender/DebugRender.h"
+//#include "Include/xrRender/DebugRender.h"
 #include "dxDebugRender.h"
 static void draw_obb		( const Fmatrix &matrix, const u32 &color )
 {

diff --git a/src/Layers/xrRender/DetailManager_VS.cpp b/src/Layers/xrRender/DetailManager_VS.cpp
@@ -7,8 +7,8 @@
 #	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"

diff --git a/src/Layers/xrRender/ETextureParams.cpp b/src/Layers/xrRender/ETextureParams.cpp
@@ -152,7 +152,7 @@ void STextureParams::Save(IWriter& F)
 
 
 #ifdef _EDITOR
-#include "../../xrServerEntities/PropertiesListHelper.h"
+#include "xrServerEntities/PropertiesListHelper.h"
 
 void STextureParams::OnTypeChange(PropValue* prop)
 {

diff --git a/src/Layers/xrRender/FBasicVisual.cpp b/src/Layers/xrRender/FBasicVisual.cpp
@@ -6,7 +6,7 @@
 #pragma hdrstop
 
 #ifndef _EDITOR
-#	include "../../xrEngine/render.h"
+#	include "xrEngine/render.h"
 #endif // #ifndef _EDITOR
 
 #include "fbasicvisual.h"

diff --git a/src/Layers/xrRender/FBasicVisual.h b/src/Layers/xrRender/FBasicVisual.h
@@ -2,9 +2,9 @@
 #define FBasicVisualH
 #pragma once
 
-#include "../../xrEngine/vis_common.h"
+#include "xrEngine/vis_common.h"
 
-#include "../../Include/xrRender/RenderVisual.h"
+#include "Include/xrRender/RenderVisual.h"
 
 #define VLOAD_NOVERTICES		(1<<0)
 

diff --git a/src/Layers/xrRender/FHierrarhyVisual.cpp b/src/Layers/xrRender/FHierrarhyVisual.cpp
@@ -8,9 +8,9 @@
 #include "FHierrarhyVisual.h"
 #include "xrCore/FMesh.hpp"
 #ifndef _EDITOR
-#include "../../xrEngine/render.h"
+#include "xrEngine/render.h"
 #else
-#include "../../Include/xrAPI/xrAPI.h"
+#include "Include/xrAPI/xrAPI.h"
 #endif
 
 //////////////////////////////////////////////////////////////////////

diff --git a/src/Layers/xrRender/FSkinned.cpp b/src/Layers/xrRender/FSkinned.cpp
@@ -16,7 +16,7 @@
 
 #include "../xrRenderDX10/dx10BufferUtils.h"
 
-#include "../../xrEngine/EnnumerateVertices.h"
+#include "xrEngine/EnnumerateVertices.h"
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

diff --git a/src/Layers/xrRender/FTreeVisual.cpp b/src/Layers/xrRender/FTreeVisual.cpp
@@ -1,9 +1,9 @@
 #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"

diff --git a/src/Layers/xrRender/HOM.cpp b/src/Layers/xrRender/HOM.cpp
@@ -5,7 +5,7 @@
 #include "stdafx.h"
 #include "HOM.h"
 #include "occRasterizer.h"
-#include "../../xrEngine/GameFont.h"
+#include "xrEngine/GameFont.h"
 
 #include "dxRenderDeviceRender.h"
 

diff --git a/src/Layers/xrRender/HOM.h b/src/Layers/xrRender/HOM.h
@@ -3,7 +3,7 @@
 //////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include "../../xrEngine/IGame_Persistent.h"
+#include "xrEngine/IGame_Persistent.h"
 
 class occTri;
 

diff --git a/src/Layers/xrRender/HW.cpp b/src/Layers/xrRender/HW.cpp
@@ -8,7 +8,7 @@
 #include <d3dx9.h>
 #pragma warning(default:4995)
 #include "HW.h"
-#include "../../xrEngine/XR_IOConsole.h"
+#include "xrEngine/XR_IOConsole.h"
 
 #ifndef _EDITOR
 	void	fill_vid_mode_list			(CHW* _hw);
@@ -90,7 +90,7 @@ void CHW::Reset		(HWND hwnd)
 
 //xr_token*				vid_mode_token = NULL;
 //extern xr_token*		vid_mode_token;
-#include "../../Include/xrAPI/xrAPI.h"
+#include "Include/xrAPI/xrAPI.h"
 //xr_token*				vid_quality_token = NULL;
 
 void CHW::CreateD3D	()

diff --git a/src/Layers/xrRender/IRenderDetailModel.h b/src/Layers/xrRender/IRenderDetailModel.h
@@ -2,7 +2,7 @@
 #define IRenderDetailModelH
 #pragma once
 
-#include "../../Include/xrRender/RenderDetailModel.h"
+#include "Include/xrRender/RenderDetailModel.h"
 
 //////////////////////////////////////////////////////////////////////////
 // definition (Detail Model)

diff --git a/src/Layers/xrRender/LightTrack.cpp b/src/Layers/xrRender/LightTrack.cpp
@@ -4,15 +4,15 @@
 
 #include "stdafx.h"
 #include "LightTrack.h"
-#include "../../include/xrRender/RenderVisual.h"
-#include "../../xrEngine/xr_object.h"
+#include "Include/xrRender/RenderVisual.h"
+#include "xrEngine/xr_object.h"
 
 #ifdef _EDITOR
 #	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,8 +1,8 @@
 #include "StdAfx.h"
-#include "../../xrEngine/_d3d_extensions.h"
-#include "../../xrEngine/xrLevel.h"
-#include "../../xrEngine/igame_persistent.h"
-#include "../../xrEngine/environment.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 "light_db.h"
 

diff --git a/src/Layers/xrRender/ModelPool.cpp b/src/Layers/xrRender/ModelPool.cpp
@@ -4,7 +4,7 @@
 #include "ModelPool.h"
 
 #ifndef _EDITOR
-	#include "../../xrEngine/IGame_Persistent.h"
+	#include "xrEngine/IGame_Persistent.h"
     #include "xrCore/FMesh.hpp"
     #include "fhierrarhyvisual.h"
     #include "SkeletonAnimated.h"

diff --git a/src/Layers/xrRender/PSLibrary.h b/src/Layers/xrRender/PSLibrary.h
@@ -4,7 +4,7 @@
 #ifndef PSLibraryH
 #define PSLibraryH
 
-#include "../../include/xrRender/particles_systems_library_interface.hpp"
+#include "Include/xrRender/particles_systems_library_interface.hpp"
 
 namespace PS {
 	class CPEDef;

diff --git a/src/Layers/xrRender/ParticleEffect.h b/src/Layers/xrRender/ParticleEffect.h
@@ -6,8 +6,8 @@
 #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"

diff --git a/src/Layers/xrRender/ParticleGroup.cpp b/src/Layers/xrRender/ParticleGroup.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "../../xrParticles/psystem.h"
+#include "xrParticles/psystem.h"
 
 #ifndef _EDITOR
-#include "../../xrServerEntities/smart_cast.h"
+#include "xrServerEntities/smart_cast.h"
 #endif
 
 #include "ParticleGroup.h"

diff --git a/src/Layers/xrRender/R_Backend_Runtime.cpp b/src/Layers/xrRender/R_Backend_Runtime.cpp
@@ -6,7 +6,7 @@
 #include <d3dx9.h>
 #pragma warning(pop)
 
-#include "../../xrCDB/frustum.h"
+#include "xrCDB/frustum.h"
 
 #if defined(USE_DX10) || defined(USE_DX11)
 #include "../xrRenderDX10/StateManager/dx10StateManager.h"

diff --git a/src/Layers/xrRender/ResourceManager_Reset.cpp b/src/Layers/xrRender/ResourceManager_Reset.cpp
@@ -3,9 +3,9 @@
 
 #include "ResourceManager.h"
 #ifndef _EDITOR
-#include	"../../xrEngine/Render.h"
+#include	"xrEngine/Render.h"
 #else
-	#include "../../Include/xrAPI/xrAPI.h"
+	#include "Include/xrAPI/xrAPI.h"
 #endif
 
 void	CResourceManager::reset_begin			()

diff --git a/src/Layers/xrRender/ResourceManager_Resources.cpp b/src/Layers/xrRender/ResourceManager_Resources.cpp
@@ -5,7 +5,7 @@
 #include <d3dx9.h>
 #ifndef _EDITOR
 	#pragma comment( lib, "d3dx9.lib"		)
-#include "../../xrEngine/render.h"
+#include "xrEngine/render.h"
 #endif
 #pragma warning(default:4995)
 

diff --git a/src/Layers/xrRender/ResourceManager_Scripting.cpp b/src/Layers/xrRender/ResourceManager_Scripting.cpp
@@ -3,13 +3,13 @@
 
 #include <lua/library_linkage.h>
 
-#include	"../../xrEngine/Render.h"
+#include	"xrEngine/Render.h"
 #include	"ResourceManager.h"
 #include	"tss.h"
 #include	"blenders\blender.h"
 #include	"blenders\blender_recorder.h"
-#include	"../../xrEngine/ai_script_space.h"
-#include	"../../xrEngine/ai_script_lua_extension.h"
+#include	"xrEngine/ai_script_space.h"
+#include	"xrEngine/ai_script_lua_extension.h"
 #include	"luabind/return_reference_to_policy.hpp"
 
 #include	"dxRenderDeviceRender.h"
@@ -112,7 +112,7 @@ static void *lua_alloc_dl	(void *ud, void *ptr, size_t osize, size_t nsize) {
 }
 #else // USE_DL_ALLOCATOR
 
-#include "../../xrCore/memory_allocator_options.h"
+#include "xrCore/memory_allocator_options.h"
 
 #ifdef USE_ARENA_ALLOCATOR
 	static const u32	s_arena_size = 8*1024*1024;

diff --git a/src/Layers/xrRender/SH_Atomic.h b/src/Layers/xrRender/SH_Atomic.h
@@ -1,7 +1,7 @@
 #ifndef sh_atomicH
 #define sh_atomicH
 #pragma once
-#include "../../xrCore/xr_resource.h"
+#include "xrCore/xr_resource.h"
 #include "tss_def.h"
 
 #if defined(USE_DX10) || defined(USE_DX11)

diff --git a/src/Layers/xrRender/SH_Constant.cpp b/src/Layers/xrRender/SH_Constant.cpp
@@ -2,7 +2,7 @@
 #pragma hdrstop
 
 /*
-#include "../../xrCore/xr_resource.h"
+#include "xrCore/xr_resource.h"
 
 // res
 class	test_resource	: public xr_resource	{

diff --git a/src/Layers/xrRender/SH_Constant.h b/src/Layers/xrRender/SH_Constant.h
@@ -2,7 +2,7 @@
 #define SH_CONSTANT_H
 #pragma once
 
-#include "../../xrEngine/WaveForm.h"
+#include "xrEngine/WaveForm.h"
 
 class		IReader;
 class		IWriter;

diff --git a/src/Layers/xrRender/SH_Matrix.h b/src/Layers/xrRender/SH_Matrix.h
@@ -2,7 +2,7 @@
 #define SH_MATRIX_H
 #pragma once
 
-#include "../../xrEngine/WaveForm.h"
+#include "xrEngine/WaveForm.h"
 
 class		IReader;
 class		IWriter;