Rewrite #includes to use explicit subdirectory paths

Co-authored-by: Hirek193 <23196899+Hirek193@users.noreply.github.com>
2026-07-23 15:39: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/vehicle/AirCoupler.cpp
+++ b/vehicle/AirCoupler.cpp
@@ -8,10 +8,10 @@ http://mozilla.org/MPL/2.0/.
 */

 #include "stdafx.h"
-#include "AirCoupler.h"
+#include "vehicle/AirCoupler.h"

-#include "Model3d.h"
-#include "parser.h"
+#include "model/Model3d.h"
+#include "utilities/parser.h"

 AirCoupler::AirCoupler()
 {
--- a/vehicle/AirCoupler.h
+++ b/vehicle/AirCoupler.h
@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.

 #pragma once

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

 class AirCoupler
 {
--- a/vehicle/Button.cpp
+++ b/vehicle/Button.cpp
@@ -8,13 +8,13 @@ http://mozilla.org/MPL/2.0/.
 */

 #include "stdafx.h"
-#include "Button.h"
-#include "parser.h"
-#include "Model3d.h"
-#include "DynObj.h"
+#include "vehicle/Button.h"
+#include "utilities/parser.h"
+#include "model/Model3d.h"
+#include "vehicle/DynObj.h"
 #include "Console.h"
-#include "Logs.h"
-#include "renderer.h"
+#include "utilities/Logs.h"
+#include "rendering/renderer.h"

 void TButton::Clear(int i)
 {
--- a/vehicle/Button.h
+++ b/vehicle/Button.h
@@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/.

 #pragma once

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

 // animacja dwustanowa, włącza jeden z dwóch submodeli (jednego z nich może nie być)
 class TButton {
--- a/vehicle/Camera.cpp
+++ b/vehicle/Camera.cpp
@@ -8,14 +8,14 @@ http://mozilla.org/MPL/2.0/.
 */

 #include "stdafx.h"
-#include "Camera.h"
+#include "vehicle/Camera.h"

-#include "Globals.h"
-#include "utilities.h"
+#include "utilities/Globals.h"
+#include "utilities/utilities.h"
 #include "Console.h"
-#include "Timer.h"
-#include "Driver.h"
-#include "DynObj.h"
+#include "utilities/Timer.h"
+#include "vehicle/Driver.h"
+#include "vehicle/DynObj.h"
 #include "MOVER.h"

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

 #pragma once

-#include "dumb3d.h"
-#include "command.h"
-#include "DynObj.h"
+#include "utilities/dumb3d.h"
+#include "input/command.h"
+#include "vehicle/DynObj.h"

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

--- a/vehicle/Driver.cpp
+++ b/vehicle/Driver.cpp
@@ -13,21 +13,21 @@ http://mozilla.org/MPL/2.0/.
 */

 #include "stdafx.h"
-#include "Driver.h"
+#include "vehicle/Driver.h"

-#include "Globals.h"
-#include "translation.h"
-#include "Logs.h"
-#include "Train.h"
-#include "mtable.h"
-#include "DynObj.h"
-#include "Event.h"
-#include "MemCell.h"
-#include "simulation.h"
-#include "simulationtime.h"
-#include "Track.h"
-#include "station.h"
-#include "keyboardinput.h"
+#include "utilities/Globals.h"
+#include "utilities/translation.h"
+#include "utilities/Logs.h"
+#include "vehicle/Train.h"
+#include "world/mtable.h"
+#include "vehicle/DynObj.h"
+#include "world/Event.h"
+#include "world/MemCell.h"
+#include "simulation/simulation.h"
+#include "simulation/simulationtime.h"
+#include "world/Track.h"
+#include "world/station.h"
+#include "input/keyboardinput.h"

 #define LOGVELOCITY 0
 #define LOGORDERS 1
--- a/vehicle/Driver.h
+++ b/vehicle/Driver.h
@@ -10,13 +10,13 @@ http://mozilla.org/MPL/2.0/.
 #pragma once

 #include <string>
-#include "Classes.h"
+#include "utilities/Classes.h"
 #include "MOVER.h"
-#include "sound.h"
-#include "DynObj.h"
-#include "mtable.h"
-#include "translation.h"
-#include "driverhints.h"
+#include "audio/sound.h"
+#include "vehicle/DynObj.h"
+#include "world/mtable.h"
+#include "utilities/translation.h"
+#include "application/driverhints.h"

 auto const EU07_AI_ACCELERATION = 0.05;
 auto const EU07_AI_NOACCELERATION = -0.05;
--- a/vehicle/DynObj.cpp
+++ b/vehicle/DynObj.cpp
@@ -13,25 +13,25 @@ http://mozilla.org/MPL/2.0/.
 */

 #include "stdafx.h"
-#include "DynObj.h"
+#include "vehicle/DynObj.h"

-#include "simulation.h"
-#include "lightarray.h"
-#include "Camera.h"
-#include "Train.h"
-#include "Driver.h"
-#include "Globals.h"
-#include "Timer.h"
-#include "Logs.h"
+#include "simulation/simulation.h"
+#include "rendering/lightarray.h"
+#include "vehicle/Camera.h"
+#include "vehicle/Train.h"
+#include "vehicle/Driver.h"
+#include "utilities/Globals.h"
+#include "utilities/Timer.h"
+#include "utilities/Logs.h"
 #include "Console.h"
-#include "Traction.h"
-#include "sound.h"
-#include "MdlMngr.h"
-#include "Model3d.h"
-#include "renderer.h"
-#include "uitranscripts.h"
-#include "messaging.h"
-#include "Driver.h"
+#include "world/Traction.h"
+#include "audio/sound.h"
+#include "model/MdlMngr.h"
+#include "model/Model3d.h"
+#include "rendering/renderer.h"
+#include "application/uitranscripts.h"
+#include "input/messaging.h"
+#include "vehicle/Driver.h"

 // Ra: taki zapis funkcjonuje lepiej, ale może nie jest optymalny
 #define vWorldFront Math3D::vector3(0, 0, 1)
--- a/vehicle/DynObj.h
+++ b/vehicle/DynObj.h
@@ -12,15 +12,15 @@ http://mozilla.org/MPL/2.0/.
 #include <string>
 #include <functional>

-#include "Classes.h"
+#include "utilities/Classes.h"
 #include "interfaces/IMaterial.h"
 #include "MOVER.h"
-#include "TrkFoll.h"
-#include "Button.h"
-#include "AirCoupler.h"
+#include "world/TrkFoll.h"
+#include "vehicle/Button.h"
+#include "vehicle/AirCoupler.h"
 #include "interfaces/ITexture.h"
-#include "sound.h"
-#include "Spring.h"
+#include "audio/sound.h"
+#include "world/Spring.h"

 #include <vector>

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

 #include "stdafx.h"
-#include "Gauge.h"
-#include "parser.h"
-#include "Model3d.h"
-#include "DynObj.h"
-#include "Timer.h"
-#include "Logs.h"
-#include "renderer.h"
+#include "vehicle/Gauge.h"
+#include "utilities/parser.h"
+#include "model/Model3d.h"
+#include "vehicle/DynObj.h"
+#include "utilities/Timer.h"
+#include "utilities/Logs.h"
+#include "rendering/renderer.h"

 TGauge::TGauge( sound_source const &Soundtemplate ) :
    m_soundtemplate( Soundtemplate )
--- a/vehicle/Gauge.h
+++ b/vehicle/Gauge.h
@@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/.

 #pragma once

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

 enum class TGaugeAnimation {
    // typ ruchu
--- a/vehicle/Train.cpp
+++ b/vehicle/Train.cpp
@@ -13,24 +13,24 @@ http://mozilla.org/MPL/2.0/.
 */

 #include "stdafx.h"
-#include "Train.h"
+#include "vehicle/Train.h"

-#include "Globals.h"
-#include "simulation.h"
-#include "Event.h"
-#include "simulationtime.h"
-#include "Camera.h"
-#include "Logs.h"
-#include "MdlMngr.h"
-#include "Model3d.h"
-#include "dumb3d.h"
-#include "Timer.h"
-#include "Driver.h"
-#include "DynObj.h"
-#include "mtable.h"
+#include "utilities/Globals.h"
+#include "simulation/simulation.h"
+#include "world/Event.h"
+#include "simulation/simulationtime.h"
+#include "vehicle/Camera.h"
+#include "utilities/Logs.h"
+#include "model/MdlMngr.h"
+#include "model/Model3d.h"
+#include "utilities/dumb3d.h"
+#include "utilities/Timer.h"
+#include "vehicle/Driver.h"
+#include "vehicle/DynObj.h"
+#include "world/mtable.h"
 #include "Console.h"
-#include "application.h"
-#include "renderer.h"
+#include "application/application.h"
+#include "rendering/renderer.h"
 #include <future>
 /*
 namespace input {
--- a/vehicle/Train.h
+++ b/vehicle/Train.h
@@ -10,15 +10,15 @@ http://mozilla.org/MPL/2.0/.
 #pragma once

 #include <string>
-#include "DynObj.h"
-#include "Driver.h"
-#include "Button.h"
-#include "Gauge.h"
-#include "sound.h"
-#include "PyInt.h"
-#include "command.h"
-#include "pythonscreenviewer.h"
-#include "dictionary.h"
+#include "vehicle/DynObj.h"
+#include "vehicle/Driver.h"
+#include "vehicle/Button.h"
+#include "vehicle/Gauge.h"
+#include "audio/sound.h"
+#include "scripting/PyInt.h"
+#include "input/command.h"
+#include "scripting/pythonscreenviewer.h"
+#include "utilities/dictionary.h"

 #undef snprintf // pyint.h->python