Rewrite #includes to use explicit subdirectory paths

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

widgets/cameraview_extcam.cpp

@@ -5,8 +5,8 @@
 #include "stdafx.h"
 #include "widgets/cameraview_extcam.h"
 #include "stb/stb_image.h"
-#include "Globals.h"
-#include "translation.h"
+#include "utilities/Globals.h"
+#include "utilities/translation.h"
 #include "extras/piped_proc.h"
 
 ui::cameraview_panel::cameraview_panel()

widgets/cameraview_extcam.h

@@ -5,7 +5,7 @@
 #pragma once
 
 #include "stdafx.h"
-#include "uilayer.h"
+#include "application/uilayer.h"
 
 namespace ui
 {

widgets/map.cpp

@@ -1,13 +1,13 @@
 #include "stdafx.h"
 #include "widgets/map.h"
 #include "widgets/map_objects.h"
-#include "Logs.h"
-#include "Train.h"
-#include "Camera.h"
-#include "simulation.h"
-#include "Driver.h"
-#include "AnimModel.h"
-#include "application.h"
+#include "utilities/Logs.h"
+#include "vehicle/Train.h"
+#include "vehicle/Camera.h"
+#include "simulation/simulation.h"
+#include "vehicle/Driver.h"
+#include "model/AnimModel.h"
+#include "application/application.h"
 
 ui::map_panel::map_panel() : ui_panel(STR_C("Map"), false)
 {

widgets/map.h

@@ -1,14 +1,14 @@
 #pragma once
 
 #include "gl/shader.h"
-#include "Texture.h"
-#include "uilayer.h"
+#include "model/Texture.h"
+#include "application/uilayer.h"
 #include "widgets/map_objects.h"
 #include "widgets/popup.h"
 #include "gl/framebuffer.h"
-#include "frustum.h"
+#include "rendering/frustum.h"
 #ifdef WITH_OPENGL_MODERN
-#include "opengl33renderer.h"
+#include "rendering/opengl33renderer.h"
 #endif
 
 namespace ui

widgets/map_objects.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "widgets/map_objects.h"
-#include "simulation.h"
-#include "DynObj.h"
+#include "simulation/simulation.h"
+#include "vehicle/DynObj.h"
 
 map::objects map::Objects;
 

widgets/map_objects.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "simulation.h"
-#include "Event.h"
-#include "scene.h"
-#include "MemCell.h"
+#include "simulation/simulation.h"
+#include "world/Event.h"
+#include "scene/scene.h"
+#include "world/MemCell.h"
 
 namespace map
 {

widgets/perfgraphs.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "widgets/perfgraphs.h"
-#include "Timer.h"
-#include "translation.h"
+#include "utilities/Timer.h"
+#include "utilities/translation.h"
 
 perfgraph_panel::perfgraph_panel() : ui_panel(STR("Performance"), false) {}
 

widgets/perfgraphs.h

@@ -1,4 +1,4 @@
-#include "uilayer.h"
+#include "application/uilayer.h"
 
 class perfgraph_panel : public ui_panel
 {

widgets/time.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "widgets/time.h"
-#include "simulationtime.h"
-#include "Globals.h"
+#include "simulation/simulationtime.h"
+#include "utilities/Globals.h"
 
 ui::time_panel::time_panel() : ui_panel(STR_C("Time and environment"), false)
 {

widgets/time.h

@@ -1,6 +1,6 @@
-#include "uilayer.h"
-#include "translation.h"
-#include "command.h"
+#include "application/uilayer.h"
+#include "utilities/translation.h"
+#include "input/command.h"
 
 namespace ui
 {

widgets/trainingcard.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "widgets/trainingcard.h"
-#include "simulation.h"
+#include "simulation/simulation.h"
 
 #ifdef __linux__
 #include <unistd.h>

widgets/trainingcard.h

@@ -1,4 +1,4 @@
-#include "uilayer.h"
+#include "application/uilayer.h"
 
 class trainingcard_panel : public ui_panel
 {

widgets/vehiclelist.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "widgets/vehiclelist.h"
-#include "simulation.h"
-#include "Driver.h"
+#include "simulation/simulation.h"
+#include "vehicle/Driver.h"
 #include "widgets/vehicleparams.h"
 
 ui::vehiclelist_panel::vehiclelist_panel(ui_layer &parent)

widgets/vehiclelist.h

@@ -1,4 +1,4 @@
-#include "uilayer.h"
+#include "application/uilayer.h"
 
 namespace ui
 {

widgets/vehicleparams.cpp

@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "widgets/vehicleparams.h"
-#include "simulation.h"
-#include "driveruipanels.h"
-#include "Driver.h"
-#include "Train.h"
+#include "simulation/simulation.h"
+#include "application/driveruipanels.h"
+#include "vehicle/Driver.h"
+#include "vehicle/Train.h"
 
 ui::vehicleparams_panel::vehicleparams_panel(const std::string &vehicle) : ui_panel(std::string(STR("Vehicle parameters")) + ": " + vehicle, false), m_vehicle_name(vehicle)
 {

widgets/vehicleparams.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "uilayer.h"
-#include "translation.h"
-#include "command.h"
-#include "renderer.h"
+#include "application/uilayer.h"
+#include "utilities/translation.h"
+#include "input/command.h"
+#include "rendering/renderer.h"
 
 namespace ui
 {