Skip to content

Commit

Permalink
Redo includes in Unix style
Browse files Browse the repository at this point in the history
  • Loading branch information
@ForserX
ForserX committed Nov 30, 2024
1 parent aa41ca5 commit 1993027
Show file tree
Hide file tree
Showing 1,763 changed files with 3,956 additions and 3,956 deletions.
2 changes: 1 addition & 1 deletion src/3rd party/cximage/CxImage/ximacfg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ extern "C" void* cxrealloc(void* ptr, size_t size);
#include "../../../xrCore/xrCore.h"

#ifdef DEBUG
#include "../../../xrCore/ftimer.h"
#include "../../../xrCore/FTimer.h"
#endif //#ifdef DEBUG

# define CXIMAGE_API
Expand Down
6 changes: 3 additions & 3 deletions src/3rd party/ode/include/ode/collision.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
#ifndef _ODE_COLLISION_H_
#define _ODE_COLLISION_H_

#include "../../include/ode/common.h"
#include "../../include/ode/collision_space.h"
#include "../../include/ode/contact.h"
#include "common.h"
#include "collision_space.h"
#include "contact.h"

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion src/3rd party/ode/include/ode/collision_space.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#ifndef _ODE_COLLISION_SPACE_H_
#define _ODE_COLLISION_SPACE_H_

#include "../../include/ode/common.h"
#include "common.h"

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion src/3rd party/ode/include/ode/odecpp_collision.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#define _ODE_ODECPP_COLLISION_H_
#ifdef __cplusplus

#include "../../include/ode/error.h"
#include "error.h"


class dGeom {
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/ActorEditor/UIMainForm.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "stdafx.h"

#include "../XrECore/Editor/EditorChooseEvents.h"
#include "../xrECore/Editor/EditorChooseEvents.h"
UIMainForm* MainForm = nullptr;
UIMainForm::UIMainForm()
{
Expand Down
6 changes: 3 additions & 3 deletions src/Editors/ActorEditor/UI_ActorTools.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#pragma hdrstop
#define dSINGLE
#include "../../Include/xrRender/animation_blend.h"
#include "..\..\XrPhysics\Physics.h"
#include "..\XrECore\Editor\EditMesh.h"
#include "../../xrPhysics/Physics.h"
#include "../xrECore/Editor/EditMesh.h"
#include "../../Layers/xrRender/KinematicAnimatedDefs.h"
#include "../../Layers/xrRender/SkeletonAnimated.h"

Expand Down Expand Up @@ -54,7 +54,7 @@ CActorTools::~CActorTools()
}

#include "../../xrEngine/IGame_Persistent.h"
#include "..\xrECore\editor\d3dutils.h"
#include "../xrECore/Editor/D3DUtils.h"

const u32 color_bone_sel_color = 0xFFFFFFFF;
const u32 color_bone_norm_color = 0xFFFFFF00;
Expand Down
8 changes: 4 additions & 4 deletions src/Editors/ActorEditor/UI_ActorToolsMotions.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
#pragma hdrstop

#include "UI_ActorTools.h"
#include "../xrECore/Editor/UI_Main.h"
#include "../xrECore/Editor/ui_main.h"
#include "../xrECore/Editor/EditObject.h"
#include "../../xrEngine/motion.h"
#include "../../xrEngine/bone.h"
#include "../../Layers/xrRender/SkeletonAnimated.h"
#include "../../xrEngine/fmesh.h"
#include "../xrEProps/folderlib.h"
#include "../../xrphysics/physicsshell.h"
#include "../../xrEngine/Fmesh.h"
#include "../xrEProps/FolderLib.h"
#include "../../xrPhysics/PhysicsShell.h"
//---------------------------------------------------------------------------
MotionID EngineModel::FindMotionID(LPCSTR name, u16 slot)
{
Expand Down
4 changes: 2 additions & 2 deletions src/Editors/ActorEditor/UI_ActorToolsProps.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//---------------------------------------------------------------------------
#include "stdafx.h"
#pragma hdrstop
#include "..\..\Layers\xrRender\KinematicAnimatedDefs.h"
#include "..\..\Layers\xrRender\SkeletonAnimated.h"
#include "../../Layers/xrRender/KinematicAnimatedDefs.h"
#include "../../Layers/xrRender/SkeletonAnimated.h"
//------------------------------------------------------------------------------

void CActorTools::OnObjectItemsFocused(xr_vector<ListItem*>& items)
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/ActorEditor/imgui_impl_dx9.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// https://github.com/ocornut/imgui

#pragma once
#include "..\XrEUI\stdafx.h" // IMGUI_IMPL_API
#include "../xrEUI/stdafx.h"

struct IDirect3DDevice9;

Expand Down
18 changes: 9 additions & 9 deletions src/Editors/ActorEditor/stdafx.h
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#pragma once
#include "..\XrECore\stdafx.h"
#include "..\XrECore\Editor\device.h"
#include "..\XrECore\Editor\UI_MainCommand.h"
#include "..\XrECore\Editor\UI_ToolsCustom.h"
#include "..\XrECore\Editor\ui_main.h"
#include "..\XrECore\Editor\EditorPreferences.h"
#include "..\XrECore\Editor\render.h"
#include "..\XrECore\Editor\UIRenderForm.h"
#include "..\XrECore\Editor\ELog.h"
#include "../xrECore/stdafx.h"
#include "../xrECore/Editor/device.h"
#include "../xrECore/Editor/UI_MainCommand.h"
#include "../xrECore/Editor/UI_ToolsCustom.h"
#include "../xrECore/Editor/ui_main.h"
#include "../xrECore/Editor/EditorPreferences.h"
#include "../xrECore/Editor/render.h"
#include "../xrECore/Editor/UIRenderForm.h"
#include "../xrECore/Editor/ELog.h"
#include "UITopBarForm.h"
#include "UIMainMenuForm.h"
#include "UILeftBarForm.h"
Expand Down
4 changes: 2 additions & 2 deletions src/Editors/LevelEditor/AI/game_spawn_constructor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
#pragma once

#include "alife_space.h"
#include "xrthread.h"
#include "xrThread.h"
#include "graph_abstract.h"
#include "../../xrServerEntities/xrServer_Object_Base.h"
#include "spawn_constructor_space.h"
#include "server_entity_wrapper.h"
#include "../../XrECore/Engine/guid_generator.h"
#include "../../xrECore/Engine/guid_generator.h"
class CSE_Abstract;
class CLevelSpawnConstructor;
class CSE_ALifeCreatureAbstract;
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/LevelEditor/Editor/Scene/scene.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "lephysics.h"
#include "LEPhysics.h"
#include "../xrEngine/xr_input.h"

EScene* Scene;
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/LevelEditor/Editor/Tools/StaticObject/ESceneObjectToolsExportBreakable.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "..\..\Utils\GeometryPartExtractor.h"
#include "../../Utils/GeometryPartExtractor.h"
#include "../xrServerEntities/xrServer_Object_Base.h"
#include "../xrServerEntities/xrServer_Objects_Abstract.h"
#include "../xrServerEntities/xrServer_Objects.h"
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/LevelEditor/Editor/UI_LevelMain.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "Utils\Cursor3D.h"
#include "Utils/Cursor3D.h"
#include "..\xrengine\GameFont.h"
#include "UI\UIEditLibrary.h"
#include "Editor/Utils/ContentView.h"
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/LevelEditor/Editor/Utils/Gizmo/IM_Manipulator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "IM_Manipulator.h"
#include "../xrEUI/imgui.h"
#include "../xrEUI/ImGuizmo.h"
#include "../../scene/scene.h"
#include "../../Scene/scene.h"
#include "../../UI_LevelTools.h"
#include "../../Entry/CustomObject.h"

Expand Down
62 changes: 31 additions & 31 deletions src/Editors/LevelEditor/stdafx.h
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
#pragma once
#include "../XrECore/stdafx.h"
#include "../xrECore/stdafx.h"
#include "../../xrScripts/stdafx.h"

#include "../xrEngine/xrLevel.h"

#include "../XrECore/Editor/device.h"
#include "../XrECore/Editor/UI_MainCommand.h"
#include "../XrECore/Editor/UI_ToolsCustom.h"
#include "../XrECore/Editor/ui_main.h"
#include "../XrECore/Editor/GeometryCollector.h"
#include "../XrECore/Editor/EditorPreferences.h"
#include "../XrECore/Editor/render.h"
#include "../XrECore/Editor/UIRenderForm.h"
#include "../XrECore/Editor/ELog.h"
#include "../XrECore/Editor/tlsprite.h"
#include "../XrECore/Editor/EditObject.h"
#include "../XrECore/Editor/EditMesh.h"
#include "../XrECore/Editor/D3DUtils.h"
#include "../XrEcore/Editor/PhysicsShellHolderEditorBase.h"
#include "../xrECore/Editor/device.h"
#include "../xrECore/Editor/UI_MainCommand.h"
#include "../xrECore/Editor/UI_ToolsCustom.h"
#include "../xrECore/Editor/ui_main.h"
#include "../xrECore/Editor/GeometryCollector.h"
#include "../xrECore/Editor/EditorPreferences.h"
#include "../xrECore/Editor/render.h"
#include "../xrECore/Editor/UIRenderForm.h"
#include "../xrECore/Editor/ELog.h"
#include "../xrECore/Editor/TLSPRITE.h"
#include "../xrECore/Editor/EditObject.h"
#include "../xrECore/Editor/EditMesh.h"
#include "../xrECore/Editor/D3DUtils.h"
#include "../xrECore/Editor/PhysicsShellHolderEditorBase.h"
#include "../../utils/ETools/ETools.h"
#include "../XrECore/Engine/Texture.h"
#include "../XrECore/Editor/Library.h"
#include "../XrECore/Editor/ImageManager.h"
#include "../XrECore/Editor/pick_defs.h"
#include "../XrECore/Editor/SoundManager.h"
#include "../XrECore/Editor/EDetailModel.h"
#include "../XrECore/Engine/guid_generator.h"
#include "../XrECore/Editor/ExportSkeleton.h"
#include "../xrECore/Engine/Texture.h"
#include "../xrECore/Editor/Library.h"
#include "../xrECore/Editor/ImageManager.h"
#include "../xrECore/Editor/pick_defs.h"
#include "../xrECore/Editor/SoundManager.h"
#include "../xrECore/Editor/EDetailModel.h"
#include "../xrECore/Engine/guid_generator.h"
#include "../xrECore/Editor/ExportSkeleton.h"
#include "../FreeMagic/MgcAppr3DPlaneFit.h"
#include "../FreeMagic/MgcEigen.h"
#include "../FreeMagic/MgcLinearSystem.h"
Expand All @@ -40,7 +40,7 @@
#include "../../xrEngine/envelope.h"
#include "../../xrEngine/xrHemisphere.h"
#include "../../xrServerEntities/LevelGameDef.h"
#include "..\..\Layers\xrRender\SkeletonAnimated.h"
#include "../../Layers/xrRender/SkeletonAnimated.h"
#include "../../xrEngine/ObjectAnimator.h"
#include "../../xrEngine/xr_efflensflare.h"
#include "../xrECore/Editor/du_box.h"
Expand All @@ -53,13 +53,13 @@
#include "../../xrEngine/CameraManager.h"
#include "../../xrEngine/IGame_Level.h"
#include "../../xrEngine/x_ray.h"
#include "..\..\XrCDB\xrCDB.h"
#include "..\..\XrCDB\ISpatial.h"
#include "..\..\Include\xrRender\ParticleCustom.h"
#include "..\..\Layers\xrRender\DetailManager.h"
#include "..\..\Layers\xrRender\ParticleEffect.h"
#include "..\..\Layers\xrRender\ParticleEffectDef.h"
#include "..\..\Layers\xrRender\ParticleGroup.h"
#include "../../xrCDB/xrCDB.h"
#include "../../xrCDB/ISpatial.h"
#include "../../Include/xrRender/ParticleCustom.h"
#include "../../Layers/xrRender/DetailManager.h"
#include "../../Layers/xrRender/ParticleEffect.h"
#include "../../Layers/xrRender/ParticleEffectDef.h"
#include "../../Layers/xrRender/ParticleGroup.h"
#include "../../xrEngine/EngineAPI.h"
#include "../../xrEngine/cl_intersect.h"

Expand Down
6 changes: 3 additions & 3 deletions src/Editors/ParticleEditor/PSLibraryEditor.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "stdafx.h"
#pragma hdrstop

#include "..\..\Layers\xrRender\PSLibrary.h"
#include "..\..\Layers\xrRender\ParticleEffect.h"
#include "..\..\Layers\xrRender\ParticleGroup.h"
#include "../../Layers/xrRender/PSLibrary.h"
#include "../../Layers/xrRender/ParticleEffect.h"
#include "../../Layers/xrRender/ParticleGroup.h"
//------------------------------------------------------------------------------


Expand Down
6 changes: 3 additions & 3 deletions src/Editors/ParticleEditor/ParticleEffectActionsImpl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#include "stdafx.h"
#pragma hdrstop

#include "../XrECore/Editor/ParticleEffectActions.h"
#include "../xrEProps/folderlib.h"
#include "../../Editors/Public/PropertiesListHelper.h"
#include "../xrECore/Editor/ParticleEffectActions.h"
#include "../xrEProps/FolderLib.h"
#include "../Public/PropertiesListHelper.h"
#include "../../xrParticles/particle_actions_collection.h"
#include "../../xrParticles/noise.h"

Expand Down
6 changes: 3 additions & 3 deletions src/Editors/ParticleEditor/ParticleEffectEditor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

#ifdef _PARTICLE_EDITOR

#include "..\..\Layers\xrRender\ParticleEffect.h"
#include "..\xrEcore\Editor\ParticleEffectActions.h"
#include "../../Layers/xrRender/ParticleEffect.h"
#include "../xrECore/Editor/ParticleEffectActions.h"
#include "../Public/PropertiesListHelper.h"
#include "ui_particletools.h"
#include "UI_ParticleTools.h"
#include "../xrEProps/FolderLib.h"

BOOL PS::CPEDef::Equal(const CPEDef* pe)
Expand Down
4 changes: 2 additions & 2 deletions src/Editors/ParticleEditor/ParticleGroupEditor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#include "stdafx.h"
#pragma hdrstop

#include "..\..\Layers\xrRender\ParticleGroup.h"
#include "../../Layers/xrRender/ParticleGroup.h"
#include "../Public/PropertiesListHelper.h"
#include "ui_particletools.h"
#include "UI_ParticleTools.h"

BOOL PS::CPGDef::SEffect::Equal(const SEffect& src)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/ParticleEditor/UIMainForm.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "stdafx.h"

#include "../XrECore/Editor/EditorChooseEvents.h"
#include "../xrECore/Editor/EditorChooseEvents.h"
UIMainForm* MainForm = nullptr;
UIMainForm::UIMainForm()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/ParticleEditor/UI_ParticleTools.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@ PS::CPGDef* CParticleTool::AppendPG(PS::CPGDef* src, const char* path)
return S;
}

#include "../XrECore/Editor/EditMesh.h"
#include "../xrECore/Editor/EditMesh.h"

bool CParticleTool::RayPick(const Fvector& start, const Fvector& dir, float& dist, Fvector* pt, Fvector* n)
{
Expand Down
6 changes: 3 additions & 3 deletions src/Editors/ParticleEditor/UI_ParticleTools.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
#define UI_ParticleToolsH

//. ?#include "ParticleSystem.h"
#include "..\..\Layers\xrRender\ParticleEffect.h"
#include "..\..\Layers\xrRender\ParticleGroup.h"
#include "..\..\xrEngine\pure.h"
#include "../../Layers/xrRender/ParticleEffect.h"
#include "../../Layers/xrRender/ParticleGroup.h"
#include "../../xrEngine/pure.h"

// refs
class CEditableObject;
Expand Down
20 changes: 10 additions & 10 deletions src/Editors/ParticleEditor/stdafx.h
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#pragma once
#include "..\xrECore\stdafx.h"
#include "..\xrECore\Editor\device.h"
#include "..\xrECore\Editor\UI_MainCommand.h"
#include "..\xrECore\Editor\UI_ToolsCustom.h"
#include "..\xrECore\Editor\ui_main.h"
#include "..\xrECore\Editor\EditorPreferences.h"
#include "..\xrECore\Editor\render.h"
#include "..\xrECore\Editor\UIRenderForm.h"
#include "..\xrECore\Editor\ELog.h"
#include "..\xrECore\Editor\Library.h"
#include "../xrECore/stdafx.h"
#include "../xrECore/Editor/device.h"
#include "../xrECore/Editor/UI_MainCommand.h"
#include "../xrECore/Editor/UI_ToolsCustom.h"
#include "../xrECore/Editor/ui_main.h"
#include "../xrECore/Editor/EditorPreferences.h"
#include "../xrECore/Editor/render.h"
#include "../xrECore/Editor/UIRenderForm.h"
#include "../xrECore/Editor/ELog.h"
#include "../xrECore/Editor/Library.h"

#include "../xrECore/Editor/D3DUtils.h"

Expand Down
2 changes: 1 addition & 1 deletion src/Editors/Public/NVMeshMenderTwo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/

#include "stdafx.h"
#include "nvMeshMender.h"
#include "NVMeshMender.h"
#include "assert.h"

namespace
Expand Down
Loading

0 comments on commit 1993027

Please sign in to comment.