Fixed R3 compilation

Thanks to tamlin for dummy tester
OpenXRay · Aug 10, 2017 · 1215cb3 · 1215cb3
1 parent 37b8cf1
commit 1215cb3
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/src/Layers/xrRender/ColorMapManager.h b/src/Layers/xrRender/ColorMapManager.h
@@ -1,6 +1,6 @@
+#pragma once
 #ifndef ColorMapManager_included
 #define ColorMapManager_included
-#pragma once
 
 //	Reduces amount of work if the texture was not changed.
 //	Stores used textures in a separate map to avoid removal of

diff --git a/src/Layers/xrRender/DetailManager.h b/src/Layers/xrRender/DetailManager.h
@@ -6,9 +6,9 @@
 #define DetailManagerH
 #pragma once
 
-#include "xrCore/xrpool.h"
-#include "detailformat.h"
-#include "detailmodel.h"
+#include "xrCore/xrPool.h"
+#include "DetailFormat.h"
+#include "DetailModel.h"
 
 #ifdef _EDITOR
 //.	#include	"ESceneClassList.h"

diff --git a/src/Layers/xrRenderPC_R3/r3_R_rain.cpp b/src/Layers/xrRenderPC_R3/r3_R_rain.cpp
@@ -176,8 +176,11 @@ void CRender::render_rain()
 
         // D3DXMatrixOrthoOffCenterLH	((D3DXMATRIX*)&mdir_Project,bb.vMin.x,bb.vMax.x,  bb.vMin.y,bb.vMax.y,
         // bb.vMin.z-tweak_rain_ortho_xform_initial_offs,bb.vMax.z);
-        D3DXMatrixOrthoOffCenterLH((D3DXMATRIX*)&mdir_Project, bb.min.x, bb.max.x, bb.min.y, bb.max.y,
-            bb.min.z - tweak_rain_ortho_xform_initial_offs, bb.min.z + 2 * tweak_rain_ortho_xform_initial_offs);
+        D3DXMatrixOrthoOffCenterLH((D3DXMATRIX*)&mdir_Project,
+            bb.vMin.x, bb.vMax.x,
+            bb.vMin.y, bb.vMax.y,
+            bb.vMin.z - tweak_rain_ortho_xform_initial_offs,
+            bb.vMin.z + 2 * tweak_rain_ortho_xform_initial_offs);
 
         cull_xform.mul(mdir_Project, mdir_View);
 

diff --git a/src/Layers/xrRenderPC_R3/r3_R_sun.cpp b/src/Layers/xrRenderPC_R3/r3_R_sun.cpp
@@ -929,12 +929,10 @@ void CRender::render_sun_near()
         }
         Fbox& bb = frustum_bb;
         bb.grow(EPS);
-        D3DXMatrixOrthoOffCenterLH((D3DXMATRIX*)&mdir_Project, bb.vMin.x, bb.vMax.x, bb.vMin.y, bb.vMax.y,
+        D3DXMatrixOrthoOffCenterLH((D3DXMATRIX*)&mdir_Project,
+            bb.vMin.x, bb.vMax.x,
+            bb.vMin.y, bb.vMax.y,
             bb.vMin.z - tweak_ortho_xform_initial_offs, bb.vMax.z);
-			bb.vMin.x,bb.vMax.x,
-			bb.vMin.y,bb.vMax.y,
-			bb.vMin.z-tweak_ortho_xform_initial_offs,
-			bb.vMax.z);
         /**/
 
         // build viewport xform

diff --git a/src/Layers/xrRenderPC_R3/r3_rendertarget.h b/src/Layers/xrRenderPC_R3/r3_rendertarget.h
@@ -333,8 +333,8 @@ class CRenderTarget : public IRender_Target
     }
 
     void dbg_addplane(Fplane& P0, u32 /*c*/) { dbg_planes.push_back(P0); }
-
 #else
     void dbg_addline(Fvector& /*P0*/, Fvector& /*P1*/, u32 /*c*/) {}
     void dbg_addplane(Fplane& /*P0*/, u32 /*c*/) {}
 #endif
+};
diff --git a/src/xrParticles/psystem.h b/src/xrParticles/psystem.h
@@ -1,13 +1,15 @@
+#pragma once
 #ifndef PSystemH
 #define PSystemH
-#pragma once
 
 #include "Common/Platform.hpp"
+#include "xrCore/_vector3d.h"
 
 #ifdef XR_PARTICLES_EXPORTS
 #define PARTICLES_API XR_EXPORT
 #else
 #define PARTICLES_API XR_IMPORT
+
 #ifdef _EDITOR
 #pragma comment(lib, "x:\\xrParticlesB.lib")
 #else