Skip to content

Commit 1215cb3

Browse files
committed
Fixed R3 compilation
Thanks to tamlin for dummy tester
1 parent 37b8cf1 commit 1215cb3

File tree

6 files changed

+16
-13
lines changed

6 files changed

+16
-13
lines changed

src/Layers/xrRender/ColorMapManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
#pragma once
12
#ifndef ColorMapManager_included
23
#define ColorMapManager_included
3-
#pragma once
44

55
// Reduces amount of work if the texture was not changed.
66
// Stores used textures in a separate map to avoid removal of

src/Layers/xrRender/DetailManager.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#define DetailManagerH
77
#pragma once
88

9-
#include "xrCore/xrpool.h"
10-
#include "detailformat.h"
11-
#include "detailmodel.h"
9+
#include "xrCore/xrPool.h"
10+
#include "DetailFormat.h"
11+
#include "DetailModel.h"
1212

1313
#ifdef _EDITOR
1414
//. #include "ESceneClassList.h"

src/Layers/xrRenderPC_R3/r3_R_rain.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,11 @@ void CRender::render_rain()
176176

177177
// D3DXMatrixOrthoOffCenterLH ((D3DXMATRIX*)&mdir_Project,bb.vMin.x,bb.vMax.x, bb.vMin.y,bb.vMax.y,
178178
// bb.vMin.z-tweak_rain_ortho_xform_initial_offs,bb.vMax.z);
179-
D3DXMatrixOrthoOffCenterLH((D3DXMATRIX*)&mdir_Project, bb.min.x, bb.max.x, bb.min.y, bb.max.y,
180-
bb.min.z - tweak_rain_ortho_xform_initial_offs, bb.min.z + 2 * tweak_rain_ortho_xform_initial_offs);
179+
D3DXMatrixOrthoOffCenterLH((D3DXMATRIX*)&mdir_Project,
180+
bb.vMin.x, bb.vMax.x,
181+
bb.vMin.y, bb.vMax.y,
182+
bb.vMin.z - tweak_rain_ortho_xform_initial_offs,
183+
bb.vMin.z + 2 * tweak_rain_ortho_xform_initial_offs);
181184

182185
cull_xform.mul(mdir_Project, mdir_View);
183186

src/Layers/xrRenderPC_R3/r3_R_sun.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -929,12 +929,10 @@ void CRender::render_sun_near()
929929
}
930930
Fbox& bb = frustum_bb;
931931
bb.grow(EPS);
932-
D3DXMatrixOrthoOffCenterLH((D3DXMATRIX*)&mdir_Project, bb.vMin.x, bb.vMax.x, bb.vMin.y, bb.vMax.y,
932+
D3DXMatrixOrthoOffCenterLH((D3DXMATRIX*)&mdir_Project,
933+
bb.vMin.x, bb.vMax.x,
934+
bb.vMin.y, bb.vMax.y,
933935
bb.vMin.z - tweak_ortho_xform_initial_offs, bb.vMax.z);
934-
bb.vMin.x,bb.vMax.x,
935-
bb.vMin.y,bb.vMax.y,
936-
bb.vMin.z-tweak_ortho_xform_initial_offs,
937-
bb.vMax.z);
938936
/**/
939937

940938
// build viewport xform

src/Layers/xrRenderPC_R3/r3_rendertarget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,8 @@ class CRenderTarget : public IRender_Target
333333
}
334334

335335
void dbg_addplane(Fplane& P0, u32 /*c*/) { dbg_planes.push_back(P0); }
336-
337336
#else
338337
void dbg_addline(Fvector& /*P0*/, Fvector& /*P1*/, u32 /*c*/) {}
339338
void dbg_addplane(Fplane& /*P0*/, u32 /*c*/) {}
340339
#endif
340+
};

src/xrParticles/psystem.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1+
#pragma once
12
#ifndef PSystemH
23
#define PSystemH
3-
#pragma once
44

55
#include "Common/Platform.hpp"
6+
#include "xrCore/_vector3d.h"
67

78
#ifdef XR_PARTICLES_EXPORTS
89
#define PARTICLES_API XR_EXPORT
910
#else
1011
#define PARTICLES_API XR_IMPORT
12+
1113
#ifdef _EDITOR
1214
#pragma comment(lib, "x:\\xrParticlesB.lib")
1315
#else

0 commit comments

Comments
 (0)