Clean includes.

OpenXRay · Sep 30, 2015 · 758d22b · 758d22b
1 parent 9511121
commit 758d22b
Show file tree

Hide file tree

Showing 52 changed files with 69 additions and 74 deletions.
diff --git a/src/Layers/xrRender/D3DUtils.h b/src/Layers/xrRender/D3DUtils.h
@@ -4,7 +4,7 @@
 
 #ifndef D3DUtilsH
 #define D3DUtilsH
-#include "..\..\Include\xrRender\DrawUtils.h"
+#include "Include/xrRender/DrawUtils.h"
 //----------------------------------------------------
 
 #ifdef _EDITOR

diff --git a/src/Layers/xrRender/R_Backend.h b/src/Layers/xrRender/R_Backend.h
@@ -17,7 +17,7 @@
 #include "r_backend_tree.h"
 
 #ifdef USE_DX11
-#	include "..\xrRenderPC_R4\r_backend_lod.h"
+#include "Layers/xrRenderPC_R4/r_backend_lod.h"
 #endif
 
 #include "fvf.h"

diff --git a/src/Layers/xrRender/blenders/Blender_Recorder.cpp b/src/Layers/xrRender/blenders/Blender_Recorder.cpp
@@ -5,11 +5,10 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "..\ResourceManager.h"
+#include "Layers/xrRender/ResourceManager.h"
 #include "Blender_Recorder.h"
 #include "Blender.h"
-
-#include "..\dxRenderDeviceRender.h"
+#include "Layers/xrRender/dxRenderDeviceRender.h"
 
 static int ParseName(LPCSTR N)
 {

diff --git a/src/Layers/xrRender/blenders/Blender_Recorder.h b/src/Layers/xrRender/blenders/Blender_Recorder.h
@@ -6,7 +6,7 @@
 #define AFX_BLENDER_RECORDER_H__1F549674_8674_4EB2_95E6_E6BC19218A6C__INCLUDED_
 #pragma once
 
-#include "..\tss.h"
+#include "Layers/xrRender/tss.h"
 
 #pragma pack(push,4)
 

diff --git a/src/Layers/xrRender/dxApplicationRender.h b/src/Layers/xrRender/dxApplicationRender.h
@@ -2,7 +2,7 @@
 #define dxApplicationRender_included
 #pragma once
 
-#include "..\..\Include\xrRender\ApplicationRender.h"
+#include "Include/xrRender/ApplicationRender.h"
 
 class dxApplicationRender : public IApplicationRender
 {

diff --git a/src/Layers/xrRender/dxConsoleRender.h b/src/Layers/xrRender/dxConsoleRender.h
@@ -2,7 +2,7 @@
 #define dxConsoleRender_included
 #pragma once
 
-#include "..\..\Include\xrRender\ConsoleRender.h"
+#include "Include/xrRender/ConsoleRender.h"
 
 class dxConsoleRender : public IConsoleRender
 {

diff --git a/src/Layers/xrRender/dxEnvironmentRender.h b/src/Layers/xrRender/dxEnvironmentRender.h
@@ -2,9 +2,9 @@
 #define dxEnvironmentRender_included
 #pragma once
 
-#include "..\..\Include\xrRender\EnvironmentRender.h"
+#include "Include/xrRender/EnvironmentRender.h"
+#include "blenders/Blender.h"
 
-#include "blenders\blender.h"
 class CBlender_skybox		: public IBlender  
 {
 public:

diff --git a/src/Layers/xrRender/dxFontRender.h b/src/Layers/xrRender/dxFontRender.h
@@ -2,7 +2,7 @@
 #define dxFontRender_included
 #pragma once
 
-#include "..\..\Include\xrRender\FontRender.h"
+#include "Include/xrRender/FontRender.h"
 
 class dxFontRender : public IFontRender
 {

diff --git a/src/Layers/xrRender/dxLensFlareRender.h b/src/Layers/xrRender/dxLensFlareRender.h
@@ -2,7 +2,7 @@
 #define dxLensFlareRender_included
 #pragma once
 
-#include "..\..\Include\xrRender\LensFlareRender.h"
+#include "Include/xrRender/LensFlareRender.h"
 
 class dxFlareRender : public IFlareRender
 {

diff --git a/src/Layers/xrRender/dxObjectSpaceRender.h b/src/Layers/xrRender/dxObjectSpaceRender.h
@@ -3,9 +3,9 @@
 #pragma once
 
 #ifdef DEBUG
+#include "Include/xrRender/ObjectSpaceRender.h"
+#include "xrEngine/xr_collide_form.h"
 
-#include "..\..\Include\xrRender\ObjectSpaceRender.h"
-#include "..\..\xrengine\xr_collide_form.h"
 class dxObjectSpaceRender : public IObjectSpaceRender
 {
 public:

diff --git a/src/Layers/xrRender/dxRainRender.h b/src/Layers/xrRender/dxRainRender.h
@@ -2,7 +2,7 @@
 #define dxRainRender_included
 #pragma once
 
-#include "..\..\Include\xrRender\RainRender.h"
+#include "Include/xrRender/RainRender.h"
 
 class dxRainRender : public IRainRender
 {

diff --git a/src/Layers/xrRender/dxRenderDeviceRender.h b/src/Layers/xrRender/dxRenderDeviceRender.h
@@ -10,7 +10,7 @@
 
 #ifndef _EDITOR
 
-#include "..\..\Include\xrRender\RenderDeviceRender.h"
+#include "Include/xrRender/RenderDeviceRender.h"
 #include "xr_effgamma.h"
 
 class CResourceManager;

diff --git a/src/Layers/xrRender/dxRenderFactory.h b/src/Layers/xrRender/dxRenderFactory.h
@@ -2,7 +2,7 @@
 #define dxRenderFactory_included
 #pragma once
 
-#include "..\..\Include\xrRender\RenderFactory.h"
+#include "Include/xrRender/RenderFactory.h"
 
 #define RENDER_FACTORY_DECLARE(Class) \
 	virtual I##Class* Create##Class(); \

diff --git a/src/Layers/xrRender/dxStatGraphRender.h b/src/Layers/xrRender/dxStatGraphRender.h
@@ -2,8 +2,7 @@
 #define	dxStatGraphRender_included
 #pragma once
 
-#include "..\..\Include\xrRender\StatGraphRender.h"
-
+#include "Include/xrRender/StatGraphRender.h"
 #include "xrEngine/StatGraph.h"
 
 class dxStatGraphRender : public IStatGraphRender

diff --git a/src/Layers/xrRender/dxStatsRender.h b/src/Layers/xrRender/dxStatsRender.h
@@ -2,7 +2,7 @@
 #define	dxStatsRender_included
 #pragma once
 
-#include "..\..\Include\xrRender\StatsRender.h"
+#include "Include/xrRender/StatsRender.h"
 
 class dxStatsRender : public IStatsRender
 {

diff --git a/src/Layers/xrRender/dxThunderboltDescRender.h b/src/Layers/xrRender/dxThunderboltDescRender.h
@@ -2,7 +2,7 @@
 #define	dxThunderboltDescRender_included
 #pragma once
 
-#include "..\..\Include\xrRender\ThunderboltDescRender.h"
+#include "Include/xrRender/ThunderboltDescRender.h"
 
 class IRender_DetailModel;
 

diff --git a/src/Layers/xrRender/dxThunderboltRender.h b/src/Layers/xrRender/dxThunderboltRender.h
@@ -2,7 +2,7 @@
 #define dxThunderboltRender_included
 #pragma once
 
-#include "..\..\Include\xrRender\ThunderboltRender.h"
+#include "Include/xrRender/ThunderboltRender.h"
 
 class dxThunderboltRender : public IThunderboltRender
 {

diff --git a/src/Layers/xrRender/dxUIRender.h b/src/Layers/xrRender/dxUIRender.h
@@ -2,7 +2,7 @@
 #define	dxUIRender_included
 #pragma once
 
-#include "..\..\Include\xrRender\UIRender.h"
+#include "Include/xrRender/UIRender.h"
 
 class dxUIRender : public IUIRender
 {

diff --git a/src/Layers/xrRender/dxUISequenceVideoItem.h b/src/Layers/xrRender/dxUISequenceVideoItem.h
@@ -2,7 +2,7 @@
 #define	dxUISequenceVideoItem_included
 #pragma once
 
-#include "..\..\Include\xrRender\UISequenceVideoItem.h"
+#include "Include/xrRender/UISequenceVideoItem.h"
 
 class dxUISequenceVideoItem : public IUISequenceVideoItem
 {

diff --git a/src/Layers/xrRender/dxUIShader.h b/src/Layers/xrRender/dxUIShader.h
@@ -2,7 +2,7 @@
 #define	dxUIShader_included
 #pragma once
 
-#include "..\..\Include\xrRender\UIShader.h"
+#include "Include/xrRender/UIShader.h"
 
 class dxUIShader : public IUIShader
 {

diff --git a/src/Layers/xrRender/dxWallMarkArray.h b/src/Layers/xrRender/dxWallMarkArray.h
@@ -2,7 +2,7 @@
 #define dxWallMarkArray_included
 #pragma once
 
-#include "..\..\Include\xrRender\WallMarkArray.h"
+#include "Include/xrRender/WallMarkArray.h"
 
 class dxWallMarkArray : public IWallMarkArray
 {

diff --git a/src/Layers/xrRender/xrD3DDefs.h b/src/Layers/xrRender/xrD3DDefs.h
@@ -3,9 +3,7 @@
 #pragma once
 
 #if defined(USE_DX11) || defined(USE_DX10)
-
-#	include "..\xrRenderDX10\DXCommonTypes.h"
-
+#include "Layers/xrRenderDX10/DXCommonTypes.h"
 #else	//	USE_DX10
 
 typedef	IDirect3DVertexShader9	ID3DVertexShader;

diff --git a/src/Layers/xrRenderPC_R4/CSCompiler.cpp b/src/Layers/xrRenderPC_R4/CSCompiler.cpp
@@ -7,7 +7,7 @@
 #include "stdafx.h"
 #include "CSCompiler.h"
 #include "ComputeShader.h"
-#include "..\xrRender\dxRenderDeviceRender.h"
+#include "Layers/xrRender/dxRenderDeviceRender.h"
 
 CSCompiler::CSCompiler(ComputeShader& target):
 	m_Target(target), m_cs(0)

diff --git a/src/plugins/Max/Export/BoneDef.cpp b/src/plugins/Max/Export/BoneDef.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\..\Shared\BoneDef.h"
+#include "plugins/Shared/BoneDef.h"
 #include "Exporter.h"
 #include "MeshExpUtility.h"
 

diff --git a/src/plugins/Max/Export/EditMeshExportMAX.cpp b/src/plugins/Max/Export/EditMeshExportMAX.cpp
@@ -7,13 +7,11 @@
 //#include "..\..\Shared\EditMesh.h"
 //#include "..\..\Shared\EditObject.h"
 
-#include "..\..\..\editors\ECore\Editor\EditMesh.h"
-#include "..\..\..\editors\ECore\Editor\EditObject.h"
-
+#include "editors/ECore/Editor/EditMesh.h"
+#include "editors/ECore/Editor/EditObject.h"
 #include "MeshExpUtility.h"
-
 #include "Exporter.h"
-#include "..\..\Shared\GameMaterial.h"
+#include "plugins/Shared/GameMaterial.h"
 //----------------------------------------------------
 void CEditableMesh::FlipFaces(){
 	VERIFY(m_Faces);

diff --git a/src/plugins/Max/Export/EditObjectExportLWO.cpp b/src/plugins/Max/Export/EditObjectExportLWO.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "..\..\..\editors\ECore\Editor\EditObject.h"
-#include "..\..\..\editors\ECore\Editor\EditMesh.h"
+#include "editors/ECore/Editor/EditObject.h"
+#include "editors/ECore/Editor/EditMesh.h"
 #include "FS2.h"
 
 int FindLPCSTR(LPCSTRVec& vec, LPCSTR key){

diff --git a/src/plugins/Max/Export/EditObjectExportMAX.cpp b/src/plugins/Max/Export/EditObjectExportMAX.cpp
@@ -5,11 +5,11 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "..\..\..\editors\ECore\Editor\EditObject.h"
-#include "..\..\..\editors\ECore\Editor\EditMesh.h"
+#include "editors/ECore/Editor/EditObject.h"
+#include "editors/ECore/Editor/EditMesh.h"
 #include "xrCore/Animation/Bone.hpp"
 #include "Exporter.h"
-#include "..\..\Shared\GameMaterial.h"
+#include "plugins/Shared/GameMaterial.h"
 
 //----------------------------------------------------------------------------
 // Material parsing

diff --git a/src/plugins/Max/Export/Exporter.h b/src/plugins/Max/Export/Exporter.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "..\..\Shared\helper.h"
-#include "..\..\Shared\bonedef.h"
-#include "..\..\Shared\face.h"
+#include "plugins/Shared/Helper.h"
+#include "plugins/Shared/bonedef.h"
+#include "plugins/Shared/Face.h"
 
 DEFINE_VECTOR(INode*,INodeVec,INodeIt);
 

diff --git a/src/plugins/Max/Export/ExporterMotion.cpp b/src/plugins/Max/Export/ExporterMotion.cpp
@@ -5,8 +5,8 @@
 
 #include "Exporter.h"
 #include "MeshExpUtility.h"
-#include "..\..\..\editors\ECore\Editor\EditObject.h"
-#include "..\..\..\editors\ECore\Editor\EditMesh.h"
+#include "editors/ECore/Editor/EditObject.h"
+#include "editors/ECore/Editor/EditMesh.h"
 #include "xrCore/Animation/Bone.hpp"
 #include "xrCore/Animation/Motion.hpp"
 #include "xrCore/Animation/Envelope.hpp"

diff --git a/src/plugins/Max/Export/ExporterSkin.cpp b/src/plugins/Max/Export/ExporterSkin.cpp
@@ -2,7 +2,7 @@
 #pragma hdrstop
 
 #include "exporter.h"
-#include "..\..\..\editors\ECore\Editor\EditObject.h"
+#include "editors/ECore/Editor/EditObject.h"
 #include "MeshExpUtility.h"
 //----------------------------------------------------------------------------------------------
 

diff --git a/src/plugins/Max/Export/MeshExpUtility.cpp b/src/plugins/Max/Export/MeshExpUtility.cpp
@@ -4,10 +4,10 @@
 #pragma hdrstop
 
 #include "MeshExpUtility.h"
-#include "..\..\xrCore/FileSystem.h"
+#include "xrCore/FileSystem.h"
 #include "MeshExpUtility.rh"
-#include "..\..\..\editors\ECore\Editor\EditObject.h"
-#include "..\..\..\editors\ECore\Editor\EditMesh.h"
+#include "editors/ECore/Editor/EditObject.h"
+#include "editors/ECore/Editor/EditMesh.h"
 //-------------------------------------------------------------------
 //  Dialog Handler for Utility
 

diff --git a/src/plugins/Max/Export/Stdafx.h b/src/plugins/Max/Export/Stdafx.h
@@ -67,7 +67,7 @@ DEFINE_VECTOR(AnsiString,AStringVec,AStringIt);
 //#include "clsid.h"
 //#include "Engine.h"
 //#include "Properties.h"
-#include "..\..\Shared\ELog.h"
+#include "plugins/Shared/ELog.h"
 
 #define THROW R_ASSERT(0)
 

diff --git a/src/plugins/Max/Material/DllEntry.cpp b/src/plugins/Max/Material/DllEntry.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "..\..\Shared\GameMaterial.h"
+#include "plugins/Shared/GameMaterial.h"
 
 extern ClassDesc2*	GetXRayMtlDesc		();
 extern TCHAR*		GetString			(int id);

diff --git a/src/plugins/Max/Material/Stdafx.h b/src/plugins/Max/Material/Stdafx.h
@@ -67,7 +67,7 @@ DEFINE_VECTOR(AnsiString,AStringVec,AStringIt);
 //#include "clsid.h"
 //#include "Engine.h"
 //#include "Properties.h"
-#include "..\..\Shared\ELog.h"
+#include "plugins/Shared/ELog.h"
 
 #define THROW R_ASSERT(0)
 

diff --git a/src/plugins/Maya/Export/MayaExport.cpp b/src/plugins/Maya/Export/MayaExport.cpp
@@ -2,8 +2,8 @@
 #pragma hdrstop
 
 #include "maTranslator.h"
-#include "..\..\..\editors\Ecore\editor\EditObject.h"
-#include "..\..\..\editors\Ecore\editor\EditMesh.h"
+#include "editors/ECore/Editor/EditObject.h"
+#include "editors/ECore/Editor/EditMesh.h"
 #include "smoth_flags.h"
 //-----------------------------------------------------------------------------------------
 BOOL CEditableObject::ParseMAMaterial(CSurface* dest, SXRShaderData& d)

diff --git a/src/plugins/Maya/Export/SmdMaya.cpp b/src/plugins/Maya/Export/SmdMaya.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h" 
 
 #include "SmdMaya.h"
-#include "..\..\..\editors\Ecore\editor\EditObject.h"
-#include "..\..\..\editors\Ecore\editor\EditMesh.h"
+#include "editors/ECore/Editor/EditObject.h"
+#include "editors/ECore/Editor/EditMesh.h"
 #include "xrCore/Animation/Motion.hpp"
 #include "xrCore/Animation/Envelope.hpp"
 #include "smoth_flags.h"

diff --git a/src/plugins/Maya/Export/SmdMaya.h b/src/plugins/Maya/Export/SmdMaya.h
@@ -1,7 +1,7 @@
 #ifndef SmdMayaH
 #define SmdMayaH
 
-#include "..\..\..\editors\Ecore\editor\EditMesh.H"
+#include "editors/ECore/Editor/EditMesh.H"
 #include "ExportDefines.H"
 #include "SmdBone.h"
 #include "SmdTriangle.h"

diff --git a/src/plugins/Maya/Export/SmdTriangle.h b/src/plugins/Maya/Export/SmdTriangle.h
@@ -10,7 +10,7 @@
 #define TRIANGLE_H
 
 #include "SmdBone.h"
-#include "..\..\..\editors\Ecore\editor\EditMesh.h"
+#include "editors/ECore/Editor/EditMesh.h"
 
 class SmdVertex
 {

diff --git a/src/plugins/Maya/Export/Stdafx.h b/src/plugins/Maya/Export/Stdafx.h
@@ -76,7 +76,7 @@ typedef TMsgDlgBtn TMsgDlgButtons[mbHelp];
 
 #pragma warning(push)
 #pragma warning(disable:4995)
-#	include "..\..\Shared\ELog.h"
+#include "plugins/Shared/ELog.h"
 #pragma warning(pop)
 
 #include "xrCore/Animation/Bone.hpp"