xrRender: fix includes

OpenXRay · Sep 29, 2018 · bd553a0 · bd553a0
1 parent 947db1d
commit bd553a0
Show file tree

Hide file tree

Showing 30 changed files with 46 additions and 36 deletions.
diff --git a/src/Layers/xrRender/Blender_BmmD.cpp b/src/Layers/xrRender/Blender_BmmD.cpp
@@ -5,7 +5,7 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "blender_BmmD.h"
+#include "Blender_BmmD.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

diff --git a/src/Layers/xrRender/Blender_Lm(EbB).cpp b/src/Layers/xrRender/Blender_Lm(EbB).cpp
@@ -5,7 +5,7 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "blender_Lm(EbB).h"
+#include "Blender_Lm(EbB).h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

diff --git a/src/Layers/xrRender/Blender_Model_EbB.cpp b/src/Layers/xrRender/Blender_Model_EbB.cpp
@@ -5,7 +5,7 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "blender_Model_EbB.h"
+#include "Blender_Model_EbB.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

diff --git a/src/Layers/xrRender/Blender_Recorder_StandartBinding.cpp b/src/Layers/xrRender/Blender_Recorder_StandartBinding.cpp
@@ -1,14 +1,16 @@
 #include "stdafx.h"
 #pragma hdrstop
 
+#if defined(WINDOWS)
 #pragma warning(push)
 #pragma warning(disable : 4995)
 #include <d3dx9.h>
 #pragma warning(pop)
+#endif
 
 #include "ResourceManager.h"
-#include "blenders\Blender_Recorder.h"
-#include "blenders\Blender.h"
+#include "blenders/Blender_Recorder.h"
+#include "blenders/Blender.h"
 
 #include "xrEngine/IGame_Persistent.h"
 #include "xrEngine/Environment.h"

diff --git a/src/Layers/xrRender/Blender_detail_still.cpp b/src/Layers/xrRender/Blender_detail_still.cpp
@@ -5,7 +5,7 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "Blender_Detail_still.h"
+#include "Blender_detail_still.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

diff --git a/src/Layers/xrRender/D3DUtils.cpp b/src/Layers/xrRender/D3DUtils.cpp
@@ -4,18 +4,20 @@
 #pragma hdrstop
 
 #include "xrEngine/GameFont.h"
-#include "d3dutils.h"
+#include "D3DUtils.h"
 #include "du_box.h"
 #include "du_sphere.h"
 #include "du_sphere_part.h"
 #include "du_cone.h"
 #include "du_cylinder.h"
 #include "xrCore/_obb.h"
 
+#if defined(WINDOWS)
 #pragma warning(push)
 #pragma warning(disable : 4995)
 #include "d3dx9.h"
 #pragma warning(pop)
+#endif
 
 CDrawUtilities DUImpl;
 

diff --git a/src/Layers/xrRender/DetailManager_soft.cpp b/src/Layers/xrRender/DetailManager_soft.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "detailmanager.h"
+#include "DetailManager.h"
 
 const u32 vs_size = 3000;
 

diff --git a/src/Layers/xrRender/DetailModel.cpp b/src/Layers/xrRender/DetailModel.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #pragma hdrstop
-#include "detailmodel.h"
+#include "DetailModel.h"
 
 CDetail::~CDetail() {}
 void CDetail::Unload()

diff --git a/src/Layers/xrRender/Light_DB.cpp b/src/Layers/xrRender/Light_DB.cpp
@@ -1,10 +1,10 @@
-#include "StdAfx.h"
+#include "stdafx.h"
 #include "Common/_d3d_extensions.h"
 #include "Common/LevelStructure.hpp"
 #include "xrEngine/IGame_Persistent.h"
 #include "xrEngine/Environment.h"
 #include "utils/xrLC_Light/R_light.h"
-#include "light_db.h"
+#include "Light_DB.h"
 
 CLight_DB::CLight_DB() {}
 CLight_DB::~CLight_DB() {}

diff --git a/src/Layers/xrRender/Light_Render_Direct.cpp b/src/Layers/xrRender/Light_Render_Direct.cpp
@@ -1,2 +1,2 @@
-#include "StdAfx.h"
-#include "light_render_direct.h"
+#include "stdafx.h"
+#include "Light_Render_Direct.h"
diff --git a/src/Layers/xrRender/Light_Render_Direct_ComputeXFS.cpp b/src/Layers/xrRender/Light_Render_Direct_ComputeXFS.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "light_render_direct.h"
+#include "Light_Render_Direct.h"
 
 void CLight_Compute_XFORM_and_VIS::compute_xf_spot(light* L)
 {

diff --git a/src/Layers/xrRender/ParticleEffect.cpp b/src/Layers/xrRender/ParticleEffect.cpp
@@ -6,6 +6,10 @@
 #include "xrCore/Threading/ThreadPool.hpp"
 #endif
 
+#if defined(LINUX)
+#include <math.h>
+#endif
+
 using namespace PAPI;
 using namespace PS;
 

diff --git a/src/Layers/xrRender/R_Backend_hemi.cpp b/src/Layers/xrRender/R_Backend_hemi.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "r_backend_hemi.h"
+#include "R_Backend_hemi.h"
 
 R_hemi::R_hemi() { unmap(); }
 void R_hemi::unmap()

diff --git a/src/Layers/xrRender/R_Backend_tree.cpp b/src/Layers/xrRender/R_Backend_tree.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "r_backend_tree.h"
+#include "R_Backend_tree.h"
 
 R_tree::R_tree() { unmap(); }
 void R_tree::unmap()

diff --git a/src/Layers/xrRender/R_Backend_xform.cpp b/src/Layers/xrRender/R_Backend_xform.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "r_backend_xform.h"
+#include "R_Backend_xform.h"
 
 void R_xforms::set_W(const Fmatrix& m)
 {

diff --git a/src/Layers/xrRender/ResourceManager_Resources.cpp b/src/Layers/xrRender/ResourceManager_Resources.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 
 
+#if defined(WINDOWS)
 #pragma warning(push)
 #pragma warning(disable : 4995)
 #include <d3dx9.h>
@@ -9,11 +10,12 @@
 #include "xrEngine/Render.h"
 #endif
 #pragma warning(pop)
+#endif
 
 #include "ResourceManager.h"
 #include "tss.h"
-#include "blenders/blender.h"
-#include "blenders/blender_recorder.h"
+#include "blenders/Blender.h"
+#include "blenders/Blender_Recorder.h"
 #include "ShaderResourceTraits.h"
 
 void fix_texture_name(LPSTR fn);

diff --git a/src/Layers/xrRender/ResourceManager_Scripting.cpp b/src/Layers/xrRender/ResourceManager_Scripting.cpp
@@ -4,8 +4,8 @@
 #include "xrEngine/Render.h"
 #include "ResourceManager.h"
 #include "tss.h"
-#include "blenders/blender.h"
-#include "blenders/blender_recorder.h"
+#include "blenders/Blender.h"
+#include "blenders/Blender_Recorder.h"
 #include "xrScriptEngine/script_engine.hpp"
 #include "luabind/return_reference_to_policy.hpp"
 

diff --git a/src/Layers/xrRender/SH_Atomic.cpp b/src/Layers/xrRender/SH_Atomic.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "sh_atomic.h"
+#include "SH_Atomic.h"
 #include "ResourceManager.h"
 
 // Atomic

diff --git a/src/Layers/xrRender/SkeletonAnimated.h b/src/Layers/xrRender/SkeletonAnimated.h
@@ -2,8 +2,8 @@
 #ifndef SkeletonAnimatedH
 #define SkeletonAnimatedH
 
-#include "skeletoncustom.h"
-#include "animation.h"
+#include "SkeletonCustom.h"
+#include "Animation.h"
 #include "xrCore/Animation/SkeletonMotions.hpp"
 
 #include "Include/xrRender/KinematicsAnimated.h"

diff --git a/src/Layers/xrRender/dxLensFlareRender.cpp b/src/Layers/xrRender/dxLensFlareRender.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "dxLensFlareRender.h"
 #include "xrEngine/xr_efflensflare.h"
-#include "xrEngine/iGame_persistent.h"
+#include "xrEngine/IGame_Persistent.h"
 #define MAX_Flares 24
 
 #define FAR_DIST g_pGamePersistent->Environment().CurrentEnv->far_plane

diff --git a/src/Layers/xrRender/dxRainRender.cpp b/src/Layers/xrRender/dxRainRender.cpp
@@ -38,7 +38,7 @@ dxRainRender::dxRainRender()
 
 dxRainRender::~dxRainRender() { ::RImplementation.model_Delete(DM_Drop); }
 void dxRainRender::Copy(IRainRender& _in) { *this = *(dxRainRender*)&_in; }
-#include "xrEngine/iGame_persistent.h"
+#include "xrEngine/IGame_Persistent.h"
 
 void dxRainRender::Render(CEffect_Rain& owner)
 {

diff --git a/src/Layers/xrRender/light_gi.cpp b/src/Layers/xrRender/light_gi.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "stdafx.h"
 #include "Layers/xrRender/light.h"
 
 IC bool pred_LI(const light_indirect& A, const light_indirect& B) { return A.E > B.E; }

diff --git a/src/Layers/xrRender/light_smapvis.cpp b/src/Layers/xrRender/light_smapvis.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "stdafx.h"
 #include "Layers/xrRender/light.h"
 #include "Layers/xrRender/FBasicVisual.h"
 

diff --git a/src/Layers/xrRender/light_vis.cpp b/src/Layers/xrRender/light_vis.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "stdafx.h"
 #include "Layers/xrRender/light.h"
 #include "xrCDB/Intersect.hpp"
 

diff --git a/src/Layers/xrRender/r__dsgraph_build.cpp b/src/Layers/xrRender/r__dsgraph_build.cpp
@@ -6,7 +6,7 @@
 #include "xrEngine/IRenderable.h"
 
 #include "FLOD.h"
-#include "particlegroup.h"
+#include "ParticleGroup.h"
 #include "FTreeVisual.h"
 #include "xrEngine/GameFont.h"
 #include "xrEngine/PerformanceAlert.hpp"

diff --git a/src/Layers/xrRender/r__sector_traversal.cpp b/src/Layers/xrRender/r__sector_traversal.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "xrEngine/IGame_Persistent.h"
 #include "xrEngine/Environment.h"
-#include "fvf.h"
+#include "FVF.h"
 
 CPortalTraverser PortalTraverser;
 

diff --git a/src/Layers/xrRender/xrStripify.cpp b/src/Layers/xrRender/xrStripify.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "xrstripify.h"
+#include "xrStripify.h"
 
 #include "NvTriStrip.h"
 #include "VertexCache.h"

diff --git a/src/Layers/xrRenderPC_GL/blender_deffer_aref.cpp b/src/Layers/xrRenderPC_GL/blender_deffer_aref.cpp
@@ -2,7 +2,7 @@
 #pragma hdrstop
 
 #include "Layers/xrRender/uber_deffer.h"
-#include "Blender_deffer_aref.h"
+#include "blender_deffer_aref.h"
 
 CBlender_deffer_aref::CBlender_deffer_aref(bool _lmapped) : lmapped(_lmapped)
 {

diff --git a/src/Layers/xrRenderPC_GL/blender_light_mask.cpp b/src/Layers/xrRenderPC_GL/blender_light_mask.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "Blender_light_mask.h"
+#include "blender_light_mask.h"
 
 CBlender_accum_direct_mask::CBlender_accum_direct_mask() { description.CLS = 0; }
 CBlender_accum_direct_mask::~CBlender_accum_direct_mask() { }

diff --git a/src/Layers/xrRenderPC_GL/glResourceManager_Scripting.cpp b/src/Layers/xrRenderPC_GL/glResourceManager_Scripting.cpp
@@ -4,8 +4,8 @@
 #include	"xrEngine/Render.h"
 #include	"Layers/xrRender/ResourceManager.h"
 #include	"Layers/xrRender/tss.h"
-#include	"Layers/xrRender/blenders/blender.h"
-#include	"Layers/xrRender/blenders/blender_recorder.h"
+#include	"Layers/xrRender/blenders/Blender.h"
+#include	"Layers/xrRender/blenders/Blender_Recorder.h"
 //	adopt_compiler don't have = operator And it can't have = operator
 #include	"xrScriptEngine/script_engine.hpp"
 #include	"luabind/return_reference_to_policy.hpp"