Rewrite #includes to use explicit subdirectory paths

Co-authored-by: Hirek193 <23196899+Hirek193@users.noreply.github.com>

application/application.cpp

@@ -8,37 +8,37 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "application.h"
-#include "drivermode.h"
-#include "editormode.h"
-#include "scenarioloadermode.h"
+#include "application/application.h"
+#include "application/drivermode.h"
+#include "application/editormode.h"
+#include "application/scenarioloadermode.h"
 #include "launcher/launchermode.h"
 
-#include "Globals.h"
-#include "simulation.h"
-#include "simulationsounds.h"
-#include "Train.h"
-#include "dictionary.h"
-#include "sceneeditor.h"
-#include "renderer.h"
-#include "uilayer.h"
-#include "Logs.h"
-#include "screenshot.h"
-#include "translation.h"
-#include "Train.h"
-#include "Timer.h"
-#include "dictionary.h"
+#include "utilities/Globals.h"
+#include "simulation/simulation.h"
+#include "simulation/simulationsounds.h"
+#include "vehicle/Train.h"
+#include "utilities/dictionary.h"
+#include "scene/sceneeditor.h"
+#include "rendering/renderer.h"
+#include "application/uilayer.h"
+#include "utilities/Logs.h"
+#include "rendering/screenshot.h"
+#include "utilities/translation.h"
+#include "vehicle/Train.h"
+#include "utilities/Timer.h"
+#include "utilities/dictionary.h"
 #include "version_info.h"
 #include "ref/discord-rpc/include/discord_rpc.h"
 #include <chrono>
-#include "translation.h"
+#include "utilities/translation.h"
 
 #if WITH_DISCORD_RPC
 #include <discord_rpc.h>
 #endif
 
 #include <chrono>
-#include "translation.h"
+#include "utilities/translation.h"
 
 #ifdef _WIN32
 #pragma comment(lib, "dsound.lib")

application/application.h

@@ -9,12 +9,12 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "applicationmode.h"
-#include "PyInt.h"
+#include "application/applicationmode.h"
+#include "scripting/PyInt.h"
 #include "network/manager.h"
-#include "headtrack.h"
+#include "utilities/headtrack.h"
 #ifdef WITH_UART
-#include "uart.h"
+#include "utilities/uart.h"
 #endif
 
 class eu07_application {

application/applicationmode.h

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "uilayer.h"
+#include "application/uilayer.h"
 
 // component implementing specific mode of application behaviour
 // base interface

application/driverhints.cpp

@@ -8,8 +8,8 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "Driver.h"
-#include "Globals.h"
+#include "vehicle/Driver.h"
+#include "utilities/Globals.h"
 
 void
 TController::hint( driver_hint const Value, hintpredicate const Predicate, float const Predicateparameter ) {

application/driverhints.h

@@ -3,7 +3,7 @@
 #define DRIVER_HINT_DEF(a, b) a,
 
 enum class driver_hint {
-    #include "driverhints_def.h"
+    #include "application/driverhints_def.h"
 };
 
 #undef DRIVER_HINT_DEF
@@ -14,7 +14,7 @@ enum class driver_hint {
 
 const char *driver_hints_texts[] =
 {
-    #include "driverhints_def.h"
+    #include "application/driverhints_def.h"
 };
 
 #undef DRIVER_HINT_DEF

application/drivermode.cpp

@@ -8,28 +8,28 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "drivermode.h"
-#include "driveruilayer.h"
+#include "application/drivermode.h"
+#include "application/driveruilayer.h"
 
-#include "Globals.h"
-#include "application.h"
-#include "translation.h"
-#include "simulation.h"
-#include "simulationtime.h"
-#include "simulationenvironment.h"
-#include "scene.h"
-#include "lightarray.h"
-#include "particles.h"
-#include "Train.h"
-#include "Driver.h"
-#include "DynObj.h"
-#include "Model3d.h"
-#include "Event.h"
-#include "messaging.h"
-#include "Timer.h"
-#include "renderer.h"
-#include "utilities.h"
-#include "Logs.h"
+#include "utilities/Globals.h"
+#include "application/application.h"
+#include "utilities/translation.h"
+#include "simulation/simulation.h"
+#include "simulation/simulationtime.h"
+#include "simulation/simulationenvironment.h"
+#include "scene/scene.h"
+#include "rendering/lightarray.h"
+#include "rendering/particles.h"
+#include "vehicle/Train.h"
+#include "vehicle/Driver.h"
+#include "vehicle/DynObj.h"
+#include "model/Model3d.h"
+#include "world/Event.h"
+#include "input/messaging.h"
+#include "utilities/Timer.h"
+#include "rendering/renderer.h"
+#include "utilities/utilities.h"
+#include "utilities/Logs.h"
 /*
 namespace input {
 

application/drivermode.h

@@ -9,19 +9,19 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "applicationmode.h"
+#include "application/applicationmode.h"
 
-#include "driverkeyboardinput.h"
-#include "drivermouseinput.h"
-#include "gamepadinput.h"
+#include "input/driverkeyboardinput.h"
+#include "input/drivermouseinput.h"
+#include "input/gamepadinput.h"
 #include "Console.h"
-#include "Camera.h"
-#include "Classes.h"
+#include "vehicle/Camera.h"
+#include "utilities/Classes.h"
 #ifdef WITH_UART
-#include "uart.h"
+#include "utilities/uart.h"
 #endif
 #ifdef WITH_ZMQ
-#include "zmq_input.h"
+#include "input/zmq_input.h"
 #endif
 
 class driver_mode : public application_mode {

application/driveruilayer.cpp

@@ -8,15 +8,15 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "driveruilayer.h"
+#include "application/driveruilayer.h"
 
-#include "Globals.h"
-#include "application.h"
-#include "translation.h"
-#include "simulation.h"
-#include "Train.h"
-#include "AnimModel.h"
-#include "renderer.h"
+#include "utilities/Globals.h"
+#include "application/application.h"
+#include "utilities/translation.h"
+#include "simulation/simulation.h"
+#include "vehicle/Train.h"
+#include "model/AnimModel.h"
+#include "rendering/renderer.h"
 
 driver_ui::driver_ui()
 {

application/driveruilayer.h

@@ -9,9 +9,9 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "uilayer.h"
-#include "driveruipanels.h"
-#include "command.h"
+#include "application/uilayer.h"
+#include "application/driveruipanels.h"
+#include "input/command.h"
 
 #include "widgets/vehiclelist.h"
 #include "widgets/vehicleparams.h"

application/driveruipanels.cpp

@@ -8,34 +8,34 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "driveruipanels.h"
+#include "application/driveruipanels.h"
 
-#include "Globals.h"
-#include "application.h"
-#include "translation.h"
-#include "simulation.h"
-#include "simulationtime.h"
-#include "simulationenvironment.h"
-#include "Timer.h"
-#include "Event.h"
-#include "TractionPower.h"
-#include "Camera.h"
-#include "mtable.h"
-#include "Train.h"
-#include "Driver.h"
-#include "AnimModel.h"
-#include "DynObj.h"
-#include "Model3d.h"
-#include "renderer.h"
-#include "utilities.h"
-#include "Logs.h"
+#include "utilities/Globals.h"
+#include "application/application.h"
+#include "utilities/translation.h"
+#include "simulation/simulation.h"
+#include "simulation/simulationtime.h"
+#include "simulation/simulationenvironment.h"
+#include "utilities/Timer.h"
+#include "world/Event.h"
+#include "world/TractionPower.h"
+#include "vehicle/Camera.h"
+#include "world/mtable.h"
+#include "vehicle/Train.h"
+#include "vehicle/Driver.h"
+#include "model/AnimModel.h"
+#include "vehicle/DynObj.h"
+#include "model/Model3d.h"
+#include "rendering/renderer.h"
+#include "utilities/utilities.h"
+#include "utilities/Logs.h"
 #include "widgets/vehicleparams.h"
 
 #define DRIVER_HINT_CONTENT
-#include "driverhints.h"
+#include "application/driverhints.h"
 
 #ifdef WITH_UART
-#include "uart.h"
+#include "utilities/uart.h"
 #endif
 
 void

application/driveruipanels.h

@@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "uilayer.h"
-#include "Classes.h"
+#include "application/uilayer.h"
+#include "utilities/Classes.h"
 
 class drivingaid_panel : public ui_expandable_panel {
 

application/editormode.cpp

@@ -8,23 +8,23 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "editormode.h"
-#include "editoruilayer.h"
+#include "application/editormode.h"
+#include "application/editoruilayer.h"
 
-#include "application.h"
-#include "Globals.h"
-#include "simulation.h"
-#include "simulationtime.h"
-#include "simulationenvironment.h"
-#include "Timer.h"
+#include "application/application.h"
+#include "utilities/Globals.h"
+#include "simulation/simulation.h"
+#include "simulation/simulationtime.h"
+#include "simulation/simulationenvironment.h"
+#include "utilities/Timer.h"
 #include "Console.h"
-#include "renderer.h"
-#include "AnimModel.h"
-#include "scene.h"
+#include "rendering/renderer.h"
+#include "model/AnimModel.h"
+#include "scene/scene.h"
 
 
 #include "imgui/imgui.h"
-#include "Logs.h"
+#include "utilities/Logs.h"
 #include <cmath>
 #include <functional>
 #include <vector>

application/editormode.h

@@ -9,12 +9,12 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "applicationmode.h"
-#include "editormouseinput.h"
-#include "editorkeyboardinput.h"
-#include "Camera.h"
-#include "sceneeditor.h"
-#include "scenenode.h"
+#include "application/applicationmode.h"
+#include "input/editormouseinput.h"
+#include "input/editorkeyboardinput.h"
+#include "vehicle/Camera.h"
+#include "scene/sceneeditor.h"
+#include "scene/scenenode.h"
 
 class editor_mode : public application_mode
 {

application/editoruilayer.cpp

@@ -8,11 +8,11 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "editoruilayer.h"
+#include "application/editoruilayer.h"
 
-#include "Globals.h"
-#include "scenenode.h"
-#include "renderer.h"
+#include "utilities/Globals.h"
+#include "scene/scenenode.h"
+#include "rendering/renderer.h"
 
 editor_ui::editor_ui()
 {

application/editoruilayer.h

@@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "uilayer.h"
-#include "editoruipanels.h"
+#include "application/uilayer.h"
+#include "application/editoruipanels.h"
 
 namespace scene
 {

application/editoruipanels.cpp

@@ -8,18 +8,18 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "editoruipanels.h"
-#include "scenenodegroups.h"
+#include "application/editoruipanels.h"
+#include "scene/scenenodegroups.h"
 
-#include "Globals.h"
-#include "Camera.h"
-#include "AnimModel.h"
-#include "Track.h"
-#include "Event.h"
-#include "MemCell.h"
-#include "editoruilayer.h"
-#include "renderer.h"
-#include "utilities.h"
+#include "utilities/Globals.h"
+#include "vehicle/Camera.h"
+#include "model/AnimModel.h"
+#include "world/Track.h"
+#include "world/Event.h"
+#include "world/MemCell.h"
+#include "application/editoruilayer.h"
+#include "rendering/renderer.h"
+#include "utilities/utilities.h"
 
 void itemproperties_panel::update(scene::basic_node const *Node)
 {

application/editoruipanels.h

@@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "uilayer.h"
-#include "Classes.h"
+#include "application/uilayer.h"
+#include "utilities/Classes.h"
 /*
 // helper, associated bool is set when the primary value was changed and expects processing at the observer's leisure
 template<typename Type_>

application/scenarioloadermode.cpp

@@ -8,17 +8,17 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "scenarioloadermode.h"
+#include "application/scenarioloadermode.h"
 
-#include "Globals.h"
-#include "simulation.h"
-#include "simulationtime.h"
-#include "simulationenvironment.h"
-#include "application.h"
-#include "scenarioloaderuilayer.h"
-#include "renderer.h"
-#include "Logs.h"
-#include "translation.h"
+#include "utilities/Globals.h"
+#include "simulation/simulation.h"
+#include "simulation/simulationtime.h"
+#include "simulation/simulationenvironment.h"
+#include "application/application.h"
+#include "application/scenarioloaderuilayer.h"
+#include "rendering/renderer.h"
+#include "utilities/Logs.h"
+#include "utilities/translation.h"
 
 scenarioloader_mode::scenarioloader_mode() {
     m_userinterface = std::make_shared<scenarioloader_ui>();

application/scenarioloadermode.h

@@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "applicationmode.h"
-#include "simulation.h"
+#include "application/applicationmode.h"
+#include "simulation/simulation.h"
 
 class scenarioloader_mode : public application_mode {
 	std::shared_ptr<simulation::deserializer_state> state;

application/scenarioloaderuilayer.cpp

@@ -7,12 +7,12 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "scenarioloaderuilayer.h"
+#include "application/scenarioloaderuilayer.h"
 
-#include "Globals.h"
-#include "translation.h"
+#include "utilities/Globals.h"
+#include "utilities/translation.h"
 #include <nlohmann/json.hpp>
-#include "Logs.h"
+#include "utilities/Logs.h"
 #include <sstream>
 
 using json = nlohmann::json;

application/scenarioloaderuilayer.h

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "uilayer.h"
+#include "application/uilayer.h"
 #include "launcher/deferred_image.h"
 
 class scenarioloader_ui : public ui_layer {

application/uilayer.cpp

@@ -8,17 +8,17 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "uilayer.h"
+#include "application/uilayer.h"
 
 #include <utility>
 
-#include "Globals.h"
-#include "renderer.h"
-#include "Logs.h"
-#include "simulation.h"
-#include "translation.h"
-#include "application.h"
-#include "editormode.h"
+#include "utilities/Globals.h"
+#include "rendering/renderer.h"
+#include "utilities/Logs.h"
+#include "simulation/simulation.h"
+#include "utilities/translation.h"
+#include "application/application.h"
+#include "application/editormode.h"
 
 #include "imgui/imgui_impl_glfw.h"
 

application/uilayer.h

@@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/.
 #pragma once
 
 #include <string>
-#include "Texture.h"
+#include "model/Texture.h"
 #include "widgets/popup.h"
 
 // GuiLayer -- basic user interface class. draws requested information on top of openGL screen

application/uitranscripts.cpp

@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include "uitranscripts.h"
+#include "application/uitranscripts.h"
 
-#include "Globals.h"
-#include "parser.h"
-#include "utilities.h"
+#include "utilities/Globals.h"
+#include "utilities/parser.h"
+#include "utilities/utilities.h"
 
 namespace ui {