Skip to content

Commit 28cd255

Browse files
author
nitrocaster
committed
Clean includes, delete unused sources.
1 parent def053c commit 28cd255

File tree

1,501 files changed

+4095
-40009
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,501 files changed

+4095
-40009
lines changed

‎src/3rd party/crypto/crypto.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef CRYPTO_INCLUDED
22
#define CRYPTO_INCLUDED
33

4-
#include "../../xrCore/xrCore.h"
4+
#include "xrCore/xrCore.h"
55
#include "xr_dsa.h"
66
#include "xr_sha.h"
77

‎src/3rd party/crypto/xr_dsa.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define XR_DSA_INCLUDED
33

44
#include "crypto_api_def.h"
5-
#include "../../xrCore/xrCore.h"
5+
#include "xrCore/xrCore.h"
66

77
struct dsa_st;
88

‎src/3rd party/crypto/xr_sha.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define XR_SHA_INCLUDED
33

44
#include "crypto_api_def.h"
5-
#include "../../xrCore/xrCore.h"
5+
#include "xrCore/xrCore.h"
66

77
struct SHAstate_st;
88

‎src/Include/xrRender/FactoryPtr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#pragma once
44

55
#include "RenderFactory.h"
6-
#include "../../Include/xrAPI/xrAPI.h"
6+
#include "Include/xrAPI/xrAPI.h"
77

88
#define FACTORY_PTR_INSTANCIATE(Class) \
99
inline void FactoryPtr<I##Class>::CreateObject(void) \

‎src/Include/xrRender/KinematicsAnimated.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "xrCore/Animation/SkeletonMotions.hpp"
66
#include "animation_blend.h"
7-
#include "../../layers/xrrender/KinematicAnimatedDefs.h"
7+
#include "Layers/xrrender/KinematicAnimatedDefs.h"
88

99
class IKinematics;
1010
class CBlend;

‎src/Include/xrRender/RainRender.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
class CEffect_Rain;
66
//struct Fsphere;
77

8-
#include "../../xrCore/_sphere.h"
8+
#include "xrCore/_sphere.h"
99

1010
class IRainRender
1111
{

‎src/Layers/xrAPI/xrAPI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33

44
#include "stdafx.h"
5-
#include "../../Include/xrApi/xrAPI.h"
5+
#include "Include/xrAPI/xrAPI.h"
66

77
XRAPI_API IRender_interface* Render = NULL;
88
XRAPI_API IRenderFactory* RenderFactory = NULL;

‎src/Layers/xrRender/Blender_Recorder_StandartBinding.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#include "blenders\Blender_Recorder.h"
1111
#include "blenders\Blender.h"
1212

13-
#include "../../xrEngine/igame_persistent.h"
14-
#include "../../xrEngine/environment.h"
13+
#include "xrEngine/igame_persistent.h"
14+
#include "xrEngine/environment.h"
1515

1616
#include "dxRenderDeviceRender.h"
1717

‎src/Layers/xrRender/D3DUtils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "stdafx.h"
44
#pragma hdrstop
55

6-
#include "../../xrEngine/gamefont.h"
6+
#include "xrEngine/gamefont.h"
77
#include "d3dutils.h"
88
#include "du_box.h"
99
#include "du_sphere.h"

‎src/Layers/xrRender/DetailManager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
# include "igame_persistent.h"
1616
# include "environment.h"
1717
#else
18-
# include "../../xrEngine/igame_persistent.h"
19-
# include "../../xrEngine/environment.h"
18+
# include "xrEngine/igame_persistent.h"
19+
# include "xrEngine/environment.h"
2020
# include <xmmintrin.h>
2121
#endif
2222

‎src/Layers/xrRender/DetailManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#define DetailManagerH
77
#pragma once
88

9-
#include "../../xrCore/xrpool.h"
9+
#include "xrCore/xrpool.h"
1010
#include "detailformat.h"
1111
#include "detailmodel.h"
1212

‎src/Layers/xrRender/DetailManager_Decompress.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ IC bool InterpolateAndDither(float* alpha255, u32 x, u32 y, u32 sx, u32 sy, u32
4242

4343
#ifndef _EDITOR
4444
#ifdef DEBUG
45-
//#include "../../Include/xrRender/DebugRender.h"
45+
//#include "Include/xrRender/DebugRender.h"
4646
#include "dxDebugRender.h"
4747
static void draw_obb ( const Fmatrix &matrix, const u32 &color )
4848
{

‎src/Layers/xrRender/DetailManager_VS.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
# include "igame_persistent.h"
88
# include "environment.h"
99
#else
10-
# include "../../xrEngine/igame_persistent.h"
11-
# include "../../xrEngine/environment.h"
10+
# include "xrEngine/igame_persistent.h"
11+
# include "xrEngine/environment.h"
1212
#endif
1313

1414
#include "../xrRenderDX10/dx10BufferUtils.h"

‎src/Layers/xrRender/ETextureParams.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ void STextureParams::Save(IWriter& F)
152152

153153

154154
#ifdef _EDITOR
155-
#include "../../xrServerEntities/PropertiesListHelper.h"
155+
#include "xrServerEntities/PropertiesListHelper.h"
156156

157157
void STextureParams::OnTypeChange(PropValue* prop)
158158
{

‎src/Layers/xrRender/FBasicVisual.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#pragma hdrstop
77

88
#ifndef _EDITOR
9-
# include "../../xrEngine/render.h"
9+
# include "xrEngine/render.h"
1010
#endif // #ifndef _EDITOR
1111

1212
#include "fbasicvisual.h"

‎src/Layers/xrRender/FBasicVisual.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#define FBasicVisualH
33
#pragma once
44

5-
#include "../../xrEngine/vis_common.h"
5+
#include "xrEngine/vis_common.h"
66

7-
#include "../../Include/xrRender/RenderVisual.h"
7+
#include "Include/xrRender/RenderVisual.h"
88

99
#define VLOAD_NOVERTICES (1<<0)
1010

‎src/Layers/xrRender/FHierrarhyVisual.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#include "FHierrarhyVisual.h"
99
#include "xrCore/FMesh.hpp"
1010
#ifndef _EDITOR
11-
#include "../../xrEngine/render.h"
11+
#include "xrEngine/render.h"
1212
#else
13-
#include "../../Include/xrAPI/xrAPI.h"
13+
#include "Include/xrAPI/xrAPI.h"
1414
#endif
1515

1616
//////////////////////////////////////////////////////////////////////

‎src/Layers/xrRender/FSkinned.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "../xrRenderDX10/dx10BufferUtils.h"
1818

19-
#include "../../xrEngine/EnnumerateVertices.h"
19+
#include "xrEngine/EnnumerateVertices.h"
2020
//////////////////////////////////////////////////////////////////////
2121
// Construction/Destruction
2222
//////////////////////////////////////////////////////////////////////

‎src/Layers/xrRender/FTreeVisual.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#include "stdafx.h"
22
#pragma hdrstop
33

4-
#include "../../xrEngine/igame_persistent.h"
5-
#include "../../xrEngine/igame_level.h"
6-
#include "../../xrEngine/environment.h"
4+
#include "xrEngine/igame_persistent.h"
5+
#include "xrEngine/igame_level.h"
6+
#include "xrEngine/environment.h"
77
#include "xrCore/FMesh.hpp"
88

99
#include "ftreevisual.h"

‎src/Layers/xrRender/HOM.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "stdafx.h"
66
#include "HOM.h"
77
#include "occRasterizer.h"
8-
#include "../../xrEngine/GameFont.h"
8+
#include "xrEngine/GameFont.h"
99

1010
#include "dxRenderDeviceRender.h"
1111

‎src/Layers/xrRender/HOM.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//////////////////////////////////////////////////////////////////////
44
#pragma once
55

6-
#include "../../xrEngine/IGame_Persistent.h"
6+
#include "xrEngine/IGame_Persistent.h"
77

88
class occTri;
99

‎src/Layers/xrRender/HW.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <d3dx9.h>
99
#pragma warning(default:4995)
1010
#include "HW.h"
11-
#include "../../xrEngine/XR_IOConsole.h"
11+
#include "xrEngine/XR_IOConsole.h"
1212

1313
#ifndef _EDITOR
1414
void fill_vid_mode_list (CHW* _hw);
@@ -90,7 +90,7 @@ void CHW::Reset (HWND hwnd)
9090

9191
//xr_token* vid_mode_token = NULL;
9292
//extern xr_token* vid_mode_token;
93-
#include "../../Include/xrAPI/xrAPI.h"
93+
#include "Include/xrAPI/xrAPI.h"
9494
//xr_token* vid_quality_token = NULL;
9595

9696
void CHW::CreateD3D ()

‎src/Layers/xrRender/IRenderDetailModel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define IRenderDetailModelH
33
#pragma once
44

5-
#include "../../Include/xrRender/RenderDetailModel.h"
5+
#include "Include/xrRender/RenderDetailModel.h"
66

77
//////////////////////////////////////////////////////////////////////////
88
// definition (Detail Model)

‎src/Layers/xrRender/LightTrack.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
#include "stdafx.h"
66
#include "LightTrack.h"
7-
#include "../../include/xrRender/RenderVisual.h"
8-
#include "../../xrEngine/xr_object.h"
7+
#include "Include/xrRender/RenderVisual.h"
8+
#include "xrEngine/xr_object.h"
99

1010
#ifdef _EDITOR
1111
# include "igame_persistent.h"
1212
# include "environment.h"
1313
#else
14-
# include "../../xrEngine/igame_persistent.h"
15-
# include "../../xrEngine/environment.h"
14+
# include "xrEngine/igame_persistent.h"
15+
# include "xrEngine/environment.h"
1616
#endif
1717

1818
//////////////////////////////////////////////////////////////////////

‎src/Layers/xrRender/Light_DB.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include "StdAfx.h"
2-
#include "../../xrEngine/_d3d_extensions.h"
3-
#include "../../xrEngine/xrLevel.h"
4-
#include "../../xrEngine/igame_persistent.h"
5-
#include "../../xrEngine/environment.h"
2+
#include "xrEngine/_d3d_extensions.h"
3+
#include "xrEngine/xrLevel.h"
4+
#include "xrEngine/igame_persistent.h"
5+
#include "xrEngine/environment.h"
66
#include "../../utils/xrLC_Light/R_light.h"
77
#include "light_db.h"
88

‎src/Layers/xrRender/ModelPool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "ModelPool.h"
55

66
#ifndef _EDITOR
7-
#include "../../xrEngine/IGame_Persistent.h"
7+
#include "xrEngine/IGame_Persistent.h"
88
#include "xrCore/FMesh.hpp"
99
#include "fhierrarhyvisual.h"
1010
#include "SkeletonAnimated.h"

‎src/Layers/xrRender/PSLibrary.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#ifndef PSLibraryH
55
#define PSLibraryH
66

7-
#include "../../include/xrRender/particles_systems_library_interface.hpp"
7+
#include "Include/xrRender/particles_systems_library_interface.hpp"
88

99
namespace PS {
1010
class CPEDef;

‎src/Layers/xrRender/ParticleEffect.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#include "ParticleEffectDef.h"
77

88
#ifdef _EDITOR
9-
# include "../../Layers/xrRender/FBasicVisual.h"
10-
# include "../../Layers/xrRender/dxParticleCustom.h"
9+
# include "Layers/xrRender/FBasicVisual.h"
10+
# include "Layers/xrRender/dxParticleCustom.h"
1111
#else // _EDITOR
1212
# include "../xrRender/FBasicVisual.h"
1313
# include "../xrRender/dxParticleCustom.h"

‎src/Layers/xrRender/ParticleGroup.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#include "stdafx.h"
22
#pragma hdrstop
33

4-
#include "../../xrParticles/psystem.h"
4+
#include "xrParticles/psystem.h"
55

66
#ifndef _EDITOR
7-
#include "../../xrServerEntities/smart_cast.h"
7+
#include "xrServerEntities/smart_cast.h"
88
#endif
99

1010
#include "ParticleGroup.h"

‎src/Layers/xrRender/R_Backend_Runtime.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <d3dx9.h>
77
#pragma warning(pop)
88

9-
#include "../../xrCDB/frustum.h"
9+
#include "xrCDB/frustum.h"
1010

1111
#if defined(USE_DX10) || defined(USE_DX11)
1212
#include "../xrRenderDX10/StateManager/dx10StateManager.h"

‎src/Layers/xrRender/ResourceManager_Reset.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
#include "ResourceManager.h"
55
#ifndef _EDITOR
6-
#include "../../xrEngine/Render.h"
6+
#include "xrEngine/Render.h"
77
#else
8-
#include "../../Include/xrAPI/xrAPI.h"
8+
#include "Include/xrAPI/xrAPI.h"
99
#endif
1010

1111
void CResourceManager::reset_begin ()

‎src/Layers/xrRender/ResourceManager_Resources.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <d3dx9.h>
66
#ifndef _EDITOR
77
#pragma comment( lib, "d3dx9.lib" )
8-
#include "../../xrEngine/render.h"
8+
#include "xrEngine/render.h"
99
#endif
1010
#pragma warning(default:4995)
1111

‎src/Layers/xrRender/ResourceManager_Scripting.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
#include <lua/library_linkage.h>
55

6-
#include "../../xrEngine/Render.h"
6+
#include "xrEngine/Render.h"
77
#include "ResourceManager.h"
88
#include "tss.h"
99
#include "blenders\blender.h"
1010
#include "blenders\blender_recorder.h"
11-
#include "../../xrEngine/ai_script_space.h"
12-
#include "../../xrEngine/ai_script_lua_extension.h"
11+
#include "xrEngine/ai_script_space.h"
12+
#include "xrEngine/ai_script_lua_extension.h"
1313
#include "luabind/return_reference_to_policy.hpp"
1414

1515
#include "dxRenderDeviceRender.h"
@@ -112,7 +112,7 @@ static void *lua_alloc_dl (void *ud, void *ptr, size_t osize, size_t nsize) {
112112
}
113113
#else // USE_DL_ALLOCATOR
114114

115-
#include "../../xrCore/memory_allocator_options.h"
115+
#include "xrCore/memory_allocator_options.h"
116116

117117
#ifdef USE_ARENA_ALLOCATOR
118118
static const u32 s_arena_size = 8*1024*1024;

‎src/Layers/xrRender/SH_Atomic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef sh_atomicH
22
#define sh_atomicH
33
#pragma once
4-
#include "../../xrCore/xr_resource.h"
4+
#include "xrCore/xr_resource.h"
55
#include "tss_def.h"
66

77
#if defined(USE_DX10) || defined(USE_DX11)

‎src/Layers/xrRender/SH_Constant.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#pragma hdrstop
33

44
/*
5-
#include "../../xrCore/xr_resource.h"
5+
#include "xrCore/xr_resource.h"
66
77
// res
88
class test_resource : public xr_resource {

‎src/Layers/xrRender/SH_Constant.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define SH_CONSTANT_H
33
#pragma once
44

5-
#include "../../xrEngine/WaveForm.h"
5+
#include "xrEngine/WaveForm.h"
66

77
class IReader;
88
class IWriter;

‎src/Layers/xrRender/SH_Matrix.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define SH_MATRIX_H
33
#pragma once
44

5-
#include "../../xrEngine/WaveForm.h"
5+
#include "xrEngine/WaveForm.h"
66

77
class IReader;
88
class IWriter;

0 commit comments

Comments
 (0)