Skip to content

Commit

Permalink
Layers: Fixed includes.
Browse files Browse the repository at this point in the history
  • Loading branch information
Kaffeine committed Nov 11, 2015
1 parent a30082a commit 7ed68e9
Show file tree
Hide file tree
Showing 26 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion src/Layers/xrRender/D3DUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "stdafx.h"
#pragma hdrstop

#include "xrEngine/gamefont.h"
#include "xrEngine/GameFont.h"
#include "d3dutils.h"
#include "du_box.h"
#include "du_sphere.h"
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRender/FBasicVisual.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#pragma hdrstop

#ifndef _EDITOR
# include "xrEngine/render.h"
# include "xrEngine/Render.h"
#endif // #ifndef _EDITOR

#include "FBasicVisual.h"
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRender/FHierrarhyVisual.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "FHierrarhyVisual.h"
#include "xrCore/FMesh.hpp"
#ifndef _EDITOR
#include "xrEngine/render.h"
#include "xrEngine/Render.h"
#else
#include "Include/xrAPI/xrAPI.h"
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRender/ResourceManager_Resources.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <d3dx9.h>
#ifndef _EDITOR
#pragma comment( lib, "d3dx9.lib" )
#include "xrEngine/render.h"
#include "xrEngine/Render.h"
#endif
#pragma warning(default:4995)

Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRender/SH_Texture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "ResourceManager.h"

#ifndef _EDITOR
#include "xrEngine/render.h"
#include "xrEngine/Render.h"
#endif

#include "xrEngine/tntQAVI.h"
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRender/blenders/Blender_Palette.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void IBlender::CreatePalette(xr_vector<IBlender*> &palette)

#ifndef _EDITOR
// Engine
#include "xrEngine/render.h"
#include "xrEngine/Render.h"
IBlender* IBlender::Create (CLASS_ID cls)
{
return ::RImplementation.blender_create (cls);
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRender/light.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef LAYERS_XRRENDER_LIGHT_H_INCLUDED
#define LAYERS_XRRENDER_LIGHT_H_INCLUDED

#include "xrCDB/ispatial.h"
#include "xrCDB/ISpatial.h"

#if (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4)
# include "light_package.h"
Expand Down
4 changes: 2 additions & 2 deletions src/Layers/xrRender/r__dsgraph_render.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "stdafx.h"

#include "xrEngine/render.h"
#include "xrEngine/irenderable.h"
#include "xrEngine/Render.h"
#include "xrEngine/IRenderable.h"
#include "xrEngine/IGame_Persistent.h"
#include "xrEngine/Environment.h"
#include "xrEngine/CustomHUD.h"
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRender/xrRender_console.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ int ps_r3_dyn_wet_surf_sm_res = 256; // 256
float ps_r2_gloss_factor = 4.0f;
//- Mad Max
#ifndef _EDITOR
#include "xrEngine/xr_ioconsole.h"
#include "xrEngine/XR_IOConsole.h"
#include "xrEngine/xr_ioc_cmd.h"

#if defined(USE_DX10) || defined(USE_DX11)
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderDX10/dx10ResourceManager_Resources.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <d3dx9.h>
#ifndef _EDITOR
#pragma comment( lib, "d3dx9.lib" )
#include "xrEngine/render.h"
#include "xrEngine/Render.h"
#endif
#pragma warning(default:4995)

Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderDX10/dx10SH_Texture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "Layers/xrRender/ResourceManager.h"

#ifndef _EDITOR
#include "xrEngine/render.h"
#include "xrEngine/Render.h"
#endif

#include "xrEngine/tntQAVI.h"
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R1/GlowManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#define AFX_GLOWMANAGER_H__EC35911F_479B_469A_845C_1A64D81D0326__INCLUDED_
#pragma once

#include "xrCDB/ispatial.h"
#include "xrCDB/ISpatial.h"
#include "xrCDB/xr_collide_defs.h"

class CGlow : public IRender_Glow, public SpatialBase
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R2/r2_R_calculate.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "xrEngine/customhud.h"
#include "xrEngine/CustomHUD.h"

float g_fSCREEN ;

Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R2/r2_R_render.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "xrEngine/IGame_Persistent.h"
#include "Layers/xrRender/FBasicVisual.h"
#include "xrEngine/customhud.h"
#include "xrEngine/CustomHUD.h"
#include "xrEngine/xr_object.h"

IC bool pred_sp_sort (ISpatial* _1, ISpatial* _2)
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R2/r2_R_sun.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "stdafx.h"
#include "xrEngine/IGame_Persistent.h"
#include "xrEngine/irenderable.h"
#include "xrEngine/IRenderable.h"
#include "Layers/xrRender/FBasicVisual.h"

const float tweak_COP_initial_offs = 1200.f ;
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R2/stdafx.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

#include "Layers/xrRender/ResourceManager.h"
#include "xrEngine/vis_common.h"
#include "xrEngine/render.h"
#include "xrEngine/Render.h"
#include "Common/_d3d_extensions.h"
#include "xrEngine/IGame_Level.h"
#include "Layers/xrRender/blenders/Blender.h"
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R3/r2_R_calculate.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "xrEngine/customhud.h"
#include "xrEngine/CustomHUD.h"

float g_fSCREEN ;

Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R3/r3_R_rain.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "stdafx.h"
#include "xrEngine/IGame_Persistent.h"
#include "xrEngine/irenderable.h"
#include "xrEngine/IRenderable.h"
#include "Layers/xrRender/FBasicVisual.h"
#include "r3_R_sun_support.h"

Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R3/r3_R_render.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "xrEngine/IGame_Persistent.h"
#include "Layers/xrRender/FBasicVisual.h"
#include "xrEngine/customhud.h"
#include "xrEngine/CustomHUD.h"
#include "xrEngine/xr_object.h"
#include "Layers/xrRender/QueryHelper.h"

Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R3/stdafx.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include "Layers/xrRender/R_Backend_Runtime.h"
#include "Layers/xrRender/ResourceManager.h"
#include "xrEngine/vis_common.h"
#include "xrEngine/render.h"
#include "xrEngine/Render.h"
#include "Common/_d3d_extensions.h"
#include "xrEngine/IGame_Level.h"
#include "Layers/xrRender/blenders\blender.h"
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R4/r2_R_calculate.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "xrEngine/customhud.h"
#include "xrEngine/CustomHUD.h"

float g_fSCREEN ;

Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R4/r2_R_sun.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "stdafx.h"
#include "xrEngine/IGame_Persistent.h"
#include "xrEngine/irenderable.h"
#include "xrEngine/IRenderable.h"
#include "Layers/xrRender/FBasicVisual.h"

#include "r4_R_sun_support.h"
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R4/r4.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "Layers/xrRender/LightTrack.h"
#include "Layers/xrRender/r_sun_cascades.h"

#include "xrEngine/irenderable.h"
#include "xrEngine/IRenderable.h"
#include "xrCore/FMesh.hpp"

class dxRender_Visual;
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R4/r4_R_rain.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "stdafx.h"
#include "xrEngine/IGame_Persistent.h"
#include "xrEngine/irenderable.h"
#include "xrEngine/IRenderable.h"
#include "Layers/xrRender/FBasicVisual.h"

#include "r4_R_sun_support.h"
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R4/r4_R_render.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "xrEngine/IGame_Persistent.h"
#include "Layers/xrRender/FBasicVisual.h"
#include "xrEngine/customhud.h"
#include "xrEngine/CustomHUD.h"
#include "xrEngine/xr_object.h"

#include "Layers/xrRender/QueryHelper.h"
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R4/stdafx.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include "Layers/xrRender/ResourceManager.h"

#include "xrEngine/vis_common.h"
#include "xrEngine/render.h"
#include "xrEngine/Render.h"
#include "Common/_d3d_extensions.h"
#include "xrEngine/IGame_Level.h"
#include "Layers/xrRender/blenders\blender.h"
Expand Down

0 comments on commit 7ed68e9

Please sign in to comment.