Skip to content

Commit 03f01f7

Browse files
author
Pavel Kovalenko
committed
Export classes required for xrPostProcessEditor, merge duplicated code.
1 parent 539eb58 commit 03f01f7

File tree

235 files changed

+2130
-7699
lines changed

Some content is hidden

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

235 files changed

+2130
-7699
lines changed

src/Include/FSMacros.hpp

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#pragma once
2+
3+
// game path definition
4+
#define _game_data_ "$game_data$"
5+
#define _game_textures_ "$game_textures$"
6+
#define _game_levels_ "$game_levels$"
7+
#define _game_sounds_ "$game_sounds$"
8+
#define _game_meshes_ "$game_meshes$"
9+
#define _game_shaders_ "$game_shaders$"
10+
#define _game_config_ "$game_congif$"
11+
12+
// editor path definition
13+
#define _server_root_ "$server_root$"
14+
#define _server_data_root_ "$server_data_root$"
15+
#define _local_root_ "$local_root$"
16+
#define _import_ "$import$"
17+
#define _sounds_ "$sounds$"
18+
#define _textures_ "$textures$"
19+
#define _objects_ "$objects$"
20+
#define _maps_ "$maps$"
21+
#define _temp_ "$temp$"
22+
#define _omotion_ "$omotion$"
23+
#define _omotions_ "$omotions$"
24+
#define _smotion_ "$smotion$"
25+
#define _detail_objects_ "$detail_objects$"

src/Include/xrRender/KinematicsAnimated.h

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

5-
#include "../../xrEngine/SkeletonMotions.h"
5+
#include "xrCore/Animation/SkeletonMotions.hpp"
66
#include "animation_blend.h"
77
#include "../../layers/xrrender/KinematicAnimatedDefs.h"
88

src/Layers/xrRender/DetailManager_Decompress.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ bool det_render_debug = false;
6767
#endif
6868
#endif
6969

70-
#include "../../xrEngine/gamemtllib.h"
70+
#include "xrEngine/GameMtlLib.h"
7171

7272
//#define DBG_SWITCHOFF_RANDOMIZE
7373
void CDetailManager::cache_Decompress(Slot* S)

src/Layers/xrRender/FBasicVisual.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#endif // #ifndef _EDITOR
1111

1212
#include "fbasicvisual.h"
13-
#include "../../xrEngine/fmesh.h"
13+
#include "xrCore/FMesh.hpp"
1414

1515
//////////////////////////////////////////////////////////////////////
1616
// Construction/Destruction

src/Layers/xrRender/FHierrarhyVisual.cpp

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

88
#include "FHierrarhyVisual.h"
9-
#include "../../xrEngine/Fmesh.h"
9+
#include "xrCore/FMesh.hpp"
1010
#ifndef _EDITOR
1111
#include "../../xrEngine/render.h"
1212
#else

src/Layers/xrRender/FLOD.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "stdafx.h"
2-
#include "../../xrEngine/fmesh.h"
2+
#include "xrCore/FMesh.hpp"
33
#include "flod.h"
44

55
struct _hw

src/Layers/xrRender/FProgressive.cpp

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

8-
#include "../../xrEngine/fmesh.h"
8+
#include "xrCore/FMesh.hpp"
99
#include "FProgressive.h"
1010

1111
//////////////////////////////////////////////////////////////////////

src/Layers/xrRender/FSkinned.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <d3dx9.h>
1010
#pragma warning(default:4995)
1111

12-
#include "../../xrEngine/fmesh.h"
12+
#include "xrCore/FMesh.hpp"
1313
#include "../../xrCPU_Pipe/xrCPU_Pipe.h"
1414
#include "FSkinned.h"
1515
#include "SkeletonX.h"

src/Layers/xrRender/FTreeVisual.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "../../xrEngine/igame_persistent.h"
55
#include "../../xrEngine/igame_level.h"
66
#include "../../xrEngine/environment.h"
7-
#include "../../xrEngine/fmesh.h"
7+
#include "xrCore/FMesh.hpp"
88

99
#include "ftreevisual.h"
1010

src/Layers/xrRender/FVisual.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <d3dx9.h>
1010
#pragma warning(default:4995)
1111

12-
#include "../../xrEngine/fmesh.h"
12+
#include "xrCore/FMesh.hpp"
1313
#include "fvisual.h"
1414

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

0 commit comments

Comments
 (0)