Rewrite #includes to use explicit subdirectory paths

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

utilities/Float3d.cpp

@@ -8,8 +8,8 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "Float3d.h"
-#include "sn_utils.h"
+#include "utilities/Float3d.h"
+#include "scene/sn_utils.h"
 
 //---------------------------------------------------------------------------
 

utilities/Globals.cpp

@@ -12,15 +12,15 @@ http://mozilla.org/MPL/2.0/.
 
 */
 #include "stdafx.h"
-#include "Globals.h"
+#include "utilities/Globals.h"
 
-#include "simulation.h"
-#include "simulationenvironment.h"
-#include "Driver.h"
-#include "Logs.h"
+#include "simulation/simulation.h"
+#include "simulation/simulationenvironment.h"
+#include "vehicle/Driver.h"
+#include "utilities/Logs.h"
 #include "Console.h"
-#include "PyInt.h"
-#include "Timer.h"
+#include "scripting/PyInt.h"
+#include "utilities/Timer.h"
 #include "vao.h"
 
 void

utilities/Globals.h

@@ -9,20 +9,20 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Classes.h"
-#include "Camera.h"
-#include "dumb3d.h"
-#include "Float3d.h"
-#include "light.h"
-#include "utilities.h"
-#include "motiontelemetry.h"
+#include "utilities/Classes.h"
+#include "vehicle/Camera.h"
+#include "utilities/dumb3d.h"
+#include "utilities/Float3d.h"
+#include "rendering/light.h"
+#include "utilities/utilities.h"
+#include "utilities/motiontelemetry.h"
 #include <map>
 
 #ifdef WITH_UART
-#include "uart.h"
+#include "utilities/uart.h"
 #endif
 #ifdef WITH_ZMQ
-#include "zmq_input.h"
+#include "input/zmq_input.h"
 #endif
 
 struct global_settings {

utilities/Logs.cpp

@@ -8,12 +8,12 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "Logs.h"
+#include "utilities/Logs.h"
 
-#include "Globals.h"
+#include "utilities/Globals.h"
 #include "winheaders.h"
-#include "utilities.h"
-#include "uilayer.h"
+#include "utilities/utilities.h"
+#include "application/uilayer.h"
 #include <deque>
 
 std::ofstream output; // standardowy "log.txt", można go wyłączyć

utilities/Timer.cpp

@@ -8,8 +8,8 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "Timer.h"
-#include "Globals.h"
+#include "utilities/Timer.h"
+#include "utilities/Globals.h"
 #include "winheaders.h"
 
 namespace Timer {

utilities/dictionary.cpp

@@ -8,13 +8,13 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "dictionary.h"
+#include "utilities/dictionary.h"
 
-#include "simulation.h"
-#include "utilities.h"
-#include "DynObj.h"
-#include "Driver.h"
-#include "mtable.h"
+#include "simulation/simulation.h"
+#include "utilities/utilities.h"
+#include "vehicle/DynObj.h"
+#include "vehicle/Driver.h"
+#include "world/mtable.h"
 
 dictionary_source::dictionary_source( std::string const &Input ) {
 

utilities/dumb3d.cpp

@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "dumb3d.h"
+#include "utilities/dumb3d.h"
 #include <cassert>
 
 namespace Math3D

utilities/headtrack.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "headtrack.h"
-#include "Globals.h"
+#include "utilities/headtrack.h"
+#include "utilities/Globals.h"
 
 headtrack::headtrack()
 {

utilities/motiontelemetry.cpp

@@ -1,11 +1,11 @@
 #include "stdafx.h"
-#include "motiontelemetry.h"
-#include "Globals.h"
-#include "Logs.h"
-#include "Train.h"
-#include "Timer.h"
-#include "Driver.h"
-#include "simulation.h"
+#include "utilities/motiontelemetry.h"
+#include "utilities/Globals.h"
+#include "utilities/Logs.h"
+#include "vehicle/Train.h"
+#include "utilities/Timer.h"
+#include "vehicle/Driver.h"
+#include "simulation/simulation.h"
 
 #ifdef _WIN32
 #include <winsock2.h>

utilities/parser.cpp

@@ -8,11 +8,11 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "parser.h"
-#include "utilities.h"
-#include "Logs.h"
+#include "utilities/parser.h"
+#include "utilities/utilities.h"
+#include "utilities/Logs.h"
 
-#include "scenenodegroups.h"
+#include "scene/scenenodegroups.h"
 
 /*
     MaSzyna EU07 locomotive simulator parser

utilities/translation.cpp

@@ -12,9 +12,9 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "translation.h"
-#include "Logs.h"
-#include "Globals.h"
+#include "utilities/translation.h"
+#include "utilities/Logs.h"
+#include "utilities/Globals.h"
 #include "MOVER.h"
 
 void locale::init()

utilities/uart.cpp

@@ -1,13 +1,13 @@
 #include "stdafx.h"
-#include "uart.h"
+#include "utilities/uart.h"
 
-#include "Globals.h"
-#include "simulation.h"
-#include "Train.h"
-#include "parser.h"
-#include "Logs.h"
-#include "simulationtime.h"
-#include "application.h"
+#include "utilities/Globals.h"
+#include "simulation/simulation.h"
+#include "vehicle/Train.h"
+#include "utilities/parser.h"
+#include "utilities/Logs.h"
+#include "simulation/simulationtime.h"
+#include "application/application.h"
 
 const char* uart_baudrates_list[] = {
     "300",

utilities/uart.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <libserialport.h>
-#include "command.h"
+#include "input/command.h"
 
 extern const char* uart_baudrates_list[];
 extern const size_t uart_baudrates_list_num;

utilities/utilities.cpp

@@ -23,11 +23,11 @@ Copyright (C) 2007-2014 Maciej Cierniak
 #define stat _stat
 #endif
 
-#include "utilities.h"
-#include "Globals.h"
-#include "parser.h"
+#include "utilities/utilities.h"
+#include "utilities/Globals.h"
+#include "utilities/parser.h"
 
-#include "Logs.h"
+#include "utilities/Logs.h"
 
 bool DebugModeFlag = false;
 bool FreeFlyModeFlag = false;

utilities/utilities.h

@@ -16,7 +16,7 @@ http://mozilla.org/MPL/2.0/.
 #include <ctime>
 #include <vector>
 #include <sstream>
-#include "parser.h"
+#include "utilities/parser.h"
 
 /*rozne takie duperele do operacji na stringach w paszczalu, pewnie w delfi sa lepsze*/
 /*konwersja zmiennych na stringi, funkcje matematyczne, logiczne, lancuchowe, I/O etc*/