Rewrite #includes to use explicit subdirectory paths

Co-authored-by: Hirek193 <23196899+Hirek193@users.noreply.github.com>
2026-07-22 16:19:19 +02:00 · 2026-03-14 19:16:48 +00:00
parent 0531086bb9
commit 7e49aa8740
243 changed files with 994 additions and 1006 deletions
--- a/world/EvLaunch.cpp
+++ b/world/EvLaunch.cpp
@@ -14,17 +14,17 @@ http://mozilla.org/MPL/2.0/.
 */

 #include "stdafx.h"
-#include "EvLaunch.h"
+#include "world/EvLaunch.h"

-#include "Globals.h"
-#include "Logs.h"
-#include "Event.h"
-#include "MemCell.h"
-#include "Timer.h"
-#include "parser.h"
+#include "utilities/Globals.h"
+#include "utilities/Logs.h"
+#include "world/Event.h"
+#include "world/MemCell.h"
+#include "utilities/Timer.h"
+#include "utilities/parser.h"
 #include "Console.h"
-#include "simulationtime.h"
-#include "utilities.h"
+#include "simulation/simulationtime.h"
+#include "utilities/utilities.h"

 //---------------------------------------------------------------------------

--- a/world/EvLaunch.h
+++ b/world/EvLaunch.h
@@ -11,8 +11,8 @@ http://mozilla.org/MPL/2.0/.

 #include <string>

-#include "Classes.h"
-#include "scenenode.h"
+#include "utilities/Classes.h"
+#include "scene/scenenode.h"

 // radio-transmitted event launch messages
 enum radio_message {
--- a/world/Event.cpp
+++ b/world/Event.cpp
@@ -14,24 +14,24 @@ http://mozilla.org/MPL/2.0/.
 */

 #include "stdafx.h"
-#include "Event.h"
+#include "world/Event.h"

-#include "simulation.h"
-#include "simulationtime.h"
-#include "simulationsounds.h"
-#include "messaging.h"
-#include "Globals.h"
-#include "MemCell.h"
-#include "Track.h"
-#include "Traction.h"
-#include "TractionPower.h"
-#include "sound.h"
-#include "AnimModel.h"
-#include "DynObj.h"
-#include "Driver.h"
-#include "renderer.h"
-#include "Timer.h"
-#include "Logs.h"
+#include "simulation/simulation.h"
+#include "simulation/simulationtime.h"
+#include "simulation/simulationsounds.h"
+#include "input/messaging.h"
+#include "utilities/Globals.h"
+#include "world/MemCell.h"
+#include "world/Track.h"
+#include "world/Traction.h"
+#include "world/TractionPower.h"
+#include "audio/sound.h"
+#include "model/AnimModel.h"
+#include "vehicle/DynObj.h"
+#include "vehicle/Driver.h"
+#include "rendering/renderer.h"
+#include "utilities/Timer.h"
+#include "utilities/Logs.h"
 #include "widgets/map_objects.h"

 void
--- a/world/Event.h
+++ b/world/Event.h
@@ -9,16 +9,16 @@ http://mozilla.org/MPL/2.0/.

 #pragma once

-#include "Classes.h"
-#include "scene.h"
-#include "Names.h"
-#include "EvLaunch.h"
-#include "Logs.h"
-#include "command.h"
-#include "comparison.h"
+#include "utilities/Classes.h"
+#include "scene/scene.h"
+#include "utilities/Names.h"
+#include "world/EvLaunch.h"
+#include "utilities/Logs.h"
+#include "input/command.h"
+#include "utilities/comparison.h"

 #ifdef WITH_LUA
-#include "lua.h"
+#include "scripting/lua.h"
 #endif

 // common event interface
--- a/world/MemCell.cpp
+++ b/world/MemCell.cpp
@@ -14,12 +14,12 @@ http://mozilla.org/MPL/2.0/.
 */

 #include "stdafx.h"
-#include "MemCell.h"
+#include "world/MemCell.h"

-#include "simulation.h"
-#include "Driver.h"
-#include "Event.h"
-#include "Logs.h"
+#include "simulation/simulation.h"
+#include "vehicle/Driver.h"
+#include "world/Event.h"
+#include "utilities/Logs.h"

 //---------------------------------------------------------------------------

--- a/world/MemCell.h
+++ b/world/MemCell.h
@@ -9,10 +9,10 @@ http://mozilla.org/MPL/2.0/.

 #pragma once

-#include "Classes.h"
-#include "scenenode.h"
-#include "Names.h"
-#include "comparison.h"
+#include "utilities/Classes.h"
+#include "scene/scenenode.h"
+#include "utilities/Names.h"
+#include "utilities/comparison.h"

 class TMemCell : public scene::basic_node {

--- a/world/Segment.cpp
+++ b/world/Segment.cpp
@@ -8,14 +8,14 @@ http://mozilla.org/MPL/2.0/.
 */

 #include "stdafx.h"
-#include "Segment.h"
+#include "world/Segment.h"

-#include "Globals.h"
-#include "Logs.h"
-#include "parser.h"
-#include "utilities.h"
-#include "Track.h"
-#include "renderer.h"
+#include "utilities/Globals.h"
+#include "utilities/Logs.h"
+#include "utilities/parser.h"
+#include "utilities/utilities.h"
+#include "world/Track.h"
+#include "rendering/renderer.h"

 void
 segment_data::deserialize( cParser &Input, glm::dvec3 const &Offset ) {
--- a/world/Segment.h
+++ b/world/Segment.h
@@ -9,10 +9,10 @@ http://mozilla.org/MPL/2.0/.

 #pragma once

-#include "Classes.h"
-#include "dumb3d.h"
-#include "geometrybank.h"
-#include "utilities.h"
+#include "utilities/Classes.h"
+#include "utilities/dumb3d.h"
+#include "rendering/geometrybank.h"
+#include "utilities/utilities.h"

 struct map_colored_paths {
 	std::vector<gfx::geometrybank_handle> switches;
--- a/world/Spring.cpp
+++ b/world/Spring.cpp
@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
 */

 #include "stdafx.h"
-#include "Spring.h"
+#include "world/Spring.h"

 void TSpring::Init(double nKs, double nKd) {
    Ks = nKs;
--- a/world/Spring.h
+++ b/world/Spring.h
@@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/.
 #ifndef ParticlesH
 #define ParticlesH

-#include "dumb3d.h"
+#include "utilities/dumb3d.h"
 /*
 #define STATIC_THRESHOLD 0.17f
 const double m_Kd = 0.02f; // DAMPING FACTOR
--- a/world/Track.cpp
+++ b/world/Track.cpp
@@ -14,20 +14,20 @@ http://mozilla.org/MPL/2.0/.

 #include "stdafx.h"

-#include "Track.h"
-#include "simulation.h"
-#include "Globals.h"
-#include "Event.h"
-#include "MemCell.h"
-#include "messaging.h"
-#include "DynObj.h"
-#include "Driver.h"
-#include "AnimModel.h"
-#include "Track.h"
-#include "Timer.h"
-#include "Logs.h"
-#include "renderer.h"
-#include "utilities.h"
+#include "world/Track.h"
+#include "simulation/simulation.h"
+#include "utilities/Globals.h"
+#include "world/Event.h"
+#include "world/MemCell.h"
+#include "input/messaging.h"
+#include "vehicle/DynObj.h"
+#include "vehicle/Driver.h"
+#include "model/AnimModel.h"
+#include "world/Track.h"
+#include "utilities/Timer.h"
+#include "utilities/Logs.h"
+#include "rendering/renderer.h"
+#include "utilities/utilities.h"

 // 101206 Ra: trapezoidalne drogi i tory
 // 110720 Ra: rozprucie zwrotnicy i odcinki izolowane
--- a/world/Track.h
+++ b/world/Track.h
@@ -13,11 +13,11 @@ http://mozilla.org/MPL/2.0/.
 #include <vector>
 #include <deque>

-#include "Classes.h"
-#include "Segment.h"
-#include "material.h"
-#include "scenenode.h"
-#include "Names.h"
+#include "utilities/Classes.h"
+#include "world/Segment.h"
+#include "model/material.h"
+#include "scene/scenenode.h"
+#include "utilities/Names.h"

 namespace scene {
 class basic_cell;
--- a/world/Traction.cpp
+++ b/world/Traction.cpp
@@ -13,14 +13,14 @@ http://mozilla.org/MPL/2.0/.
 */

 #include "stdafx.h"
-#include "Traction.h"
+#include "world/Traction.h"

-#include "simulation.h"
-#include "Globals.h"
-#include "TractionPower.h"
-#include "Logs.h"
-#include "renderer.h"
-#include "utilities.h"
+#include "simulation/simulation.h"
+#include "utilities/Globals.h"
+#include "world/TractionPower.h"
+#include "utilities/Logs.h"
+#include "rendering/renderer.h"
+#include "utilities/utilities.h"

 //---------------------------------------------------------------------------
 /*
--- a/world/Traction.h
+++ b/world/Traction.h
@@ -11,10 +11,10 @@ http://mozilla.org/MPL/2.0/.

 #include <string>

-#include "scenenode.h"
-#include "Segment.h"
-#include "material.h"
-#include "Names.h"
+#include "scene/scenenode.h"
+#include "world/Segment.h"
+#include "model/material.h"
+#include "utilities/Names.h"

 class TTractionPowerSource;

--- a/world/TractionPower.cpp
+++ b/world/TractionPower.cpp
@@ -14,10 +14,10 @@ http://mozilla.org/MPL/2.0/.
 */

 #include "stdafx.h"
-#include "TractionPower.h"
+#include "world/TractionPower.h"

-#include "parser.h"
-#include "Logs.h"
+#include "utilities/parser.h"
+#include "utilities/Logs.h"

 //---------------------------------------------------------------------------

--- a/world/TractionPower.h
+++ b/world/TractionPower.h
@@ -9,9 +9,9 @@ http://mozilla.org/MPL/2.0/.

 #pragma once

-#include "Classes.h"
-#include "scenenode.h"
-#include "Names.h"
+#include "utilities/Classes.h"
+#include "scene/scenenode.h"
+#include "utilities/Names.h"

 class TTractionPowerSource : public scene::basic_node {

--- a/world/TrkFoll.cpp
+++ b/world/TrkFoll.cpp
@@ -14,13 +14,13 @@ http://mozilla.org/MPL/2.0/.
 */

 #include "stdafx.h"
-#include "TrkFoll.h"
+#include "world/TrkFoll.h"

-#include "simulation.h"
-#include "Globals.h"
-#include "DynObj.h"
-#include "Driver.h"
-#include "Logs.h"
+#include "simulation/simulation.h"
+#include "utilities/Globals.h"
+#include "vehicle/DynObj.h"
+#include "vehicle/Driver.h"
+#include "utilities/Logs.h"

 TTrackFollower::~TTrackFollower()
 {
--- a/world/TrkFoll.h
+++ b/world/TrkFoll.h
@@ -10,8 +10,8 @@ http://mozilla.org/MPL/2.0/.
 #ifndef TrkFollH
 #define TrkFollH

-#include "Classes.h"
-#include "Segment.h"
+#include "utilities/Classes.h"
+#include "world/Segment.h"

 // oś poruszająca się po torze
 class TTrackFollower {
--- a/world/mtable.cpp
+++ b/world/mtable.cpp
@@ -8,11 +8,11 @@ http://mozilla.org/MPL/2.0/.
 */

 #include "stdafx.h"
-#include "mtable.h"
-#include "Globals.h"
-#include "simulationtime.h"
-#include "dictionary.h"
-#include "utilities.h"
+#include "world/mtable.h"
+#include "utilities/Globals.h"
+#include "simulation/simulationtime.h"
+#include "utilities/dictionary.h"
+#include "utilities/utilities.h"

 double TTrainParameters::CheckTrainLatency()
 {
--- a/world/mtable.h
+++ b/world/mtable.h
@@ -11,8 +11,8 @@ http://mozilla.org/MPL/2.0/.

 #include <string>

-#include "Classes.h"
-#include "sound.h"
+#include "utilities/Classes.h"
+#include "audio/sound.h"

 namespace Mtable
 {
--- a/world/station.cpp
+++ b/world/station.cpp
@@ -8,10 +8,10 @@ http://mozilla.org/MPL/2.0/.
 */

 #include "stdafx.h"
-#include "station.h"
+#include "world/station.h"

-#include "DynObj.h"
-#include "mtable.h"
+#include "vehicle/DynObj.h"
+#include "world/mtable.h"

 namespace simulation {

--- a/world/station.h
+++ b/world/station.h
@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.

 #pragma once

-#include "Classes.h"
+#include "utilities/Classes.h"

 // a simple station, performs freight and passenger exchanges with visiting consists
 class basic_station {