Merge branch 'copilot/rebuild-files-structure' into ecs

CMakeLists.txt

@@ -45,7 +45,19 @@ file(GLOB HEADERS "*.h"
 "widgets/*.h"
 "launcher/*.h"
 "extras/*.h"
-"global_include/*.h")
+"global_include/*.h"
+"simulation/*.h"
+"scene/*.h"
+"rendering/*.h"
+"audio/*.h"
+"environment/*.h"
+"application/*.h"
+"input/*.h"
+"scripting/*.h"
+"model/*.h"
+"utilities/*.h"
+"world/*.h"
+"vehicle/*.h")
 
 set(GLOBAL_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(GLOBAL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/global_include")
@@ -79,101 +91,100 @@ list(APPEND CMAKE_PREFIX_PATH "${VCPKG_INSTALLED_PATH}")
 list(APPEND CMAKE_MODULE_PATH "${VCPKG_INSTALLED_PATH}/share")
 
 set(SOURCES
-"Texture.cpp"
-"Timer.cpp"
-"Track.cpp"
-"Traction.cpp"
-"TractionPower.cpp"
-"Train.cpp"
-"TrkFoll.cpp"
-"AirCoupler.cpp"
-"AnimModel.cpp"
-"Button.cpp"
-"Camera.cpp"
-"Driver.cpp"
-"driverhints.cpp"
-"dumb3d.cpp"
-"DynObj.cpp"
+"model/Texture.cpp"
+"utilities/Timer.cpp"
+"world/Track.cpp"
+"world/Traction.cpp"
+"world/TractionPower.cpp"
+"vehicle/Train.cpp"
+"world/TrkFoll.cpp"
+"vehicle/AirCoupler.cpp"
+"model/AnimModel.cpp"
+"vehicle/Button.cpp"
+"vehicle/Camera.cpp"
+"vehicle/Driver.cpp"
+"application/driverhints.cpp"
+"utilities/dumb3d.cpp"
+"vehicle/DynObj.cpp"
 "EU07.cpp"
 "export_e3d_standalone.cpp"
-"Event.cpp"
-"EvLaunch.cpp"
-"Float3d.cpp"
-"Gauge.cpp"
-"Globals.cpp"
-"Logs.cpp"
+"world/Event.cpp"
+"world/EvLaunch.cpp"
+"utilities/Float3d.cpp"
+"vehicle/Gauge.cpp"
+"utilities/Globals.cpp"
+"utilities/Logs.cpp"
 "McZapkie/friction.cpp"
 "McZapkie/hamulce.cpp"
 "McZapkie/Mover.cpp"
 "McZapkie/Oerlikon_ESt.cpp"
-"MdlMngr.cpp"
-"MemCell.cpp"
-"Model3d.cpp"
-"mtable.cpp"
-"parser.cpp"
-"nullrenderer.cpp"
-"renderer.cpp"
-"ResourceManager.cpp"
-"sn_utils.cpp"
-"Segment.cpp"
-"sky.cpp"
-"sun.cpp"
-"stars.cpp"
-"lightarray.cpp"
-"skydome.cpp"
-"sound.cpp"
-"Spring.cpp"
-"frustum.cpp"
-"uilayer.cpp"
-"openglmatrixstack.cpp"
-"moon.cpp"
-"command.cpp"
-"keyboardinput.cpp"
-"gamepadinput.cpp"
-"drivermouseinput.cpp"
-"translation.cpp"
-"material.cpp"
+"model/MdlMngr.cpp"
+"world/MemCell.cpp"
+"model/Model3d.cpp"
+"world/mtable.cpp"
+"utilities/parser.cpp"
+"rendering/nullrenderer.cpp"
+"rendering/renderer.cpp"
+"model/ResourceManager.cpp"
+"scene/sn_utils.cpp"
+"world/Segment.cpp"
+"environment/sky.cpp"
+"environment/sun.cpp"
+"environment/stars.cpp"
+"rendering/lightarray.cpp"
+"environment/skydome.cpp"
+"audio/sound.cpp"
+"world/Spring.cpp"
+"rendering/frustum.cpp"
+"application/uilayer.cpp"
+"rendering/openglmatrixstack.cpp"
+"environment/moon.cpp"
+"input/command.cpp"
+"input/keyboardinput.cpp"
+"input/gamepadinput.cpp"
+"input/drivermouseinput.cpp"
+"utilities/translation.cpp"
+"model/material.cpp"
 "stdafx.cpp"
-"messaging.cpp"
-"scene.cpp"
-"scenenode.cpp"
-"simulation.cpp"
-"vertex.cpp"
-"audio.cpp"
-"audiorenderer.cpp"
-"motiontelemetry.cpp"
-"utilities.cpp"
-"uitranscripts.cpp"
-"station.cpp"
-"application.cpp"
-"simulationtime.cpp"
-"sceneeditor.cpp"
-"screenshot.cpp"
-"driverkeyboardinput.cpp"
-"drivermode.cpp"
-"driveruilayer.cpp"
-"driveruipanels.cpp"
-"editorkeyboardinput.cpp"
-"editormode.cpp"
-"editormouseinput.cpp"
-"editoruilayer.cpp"
-"editoruipanels.cpp"
-"scenarioloadermode.cpp"
-"scenarioloaderuilayer.cpp"
-"scenenodegroups.cpp"
-"simulationenvironment.cpp"
-"simulationstateserializer.cpp"
-"precipitation.cpp"
-"pythonscreenviewer.cpp"
-"dictionary.cpp"
-"particles.cpp"
-"headtrack.cpp"
-"headtrack.h"
-"ladderlogic.cpp"
-"geometrybank.cpp"
-"openglcolor.cpp"
-"simulationsounds.cpp"
-"openglcamera.cpp"
+"input/messaging.cpp"
+"scene/scene.cpp"
+"scene/scenenode.cpp"
+"simulation/simulation.cpp"
+"model/vertex.cpp"
+"audio/audio.cpp"
+"audio/audiorenderer.cpp"
+"utilities/motiontelemetry.cpp"
+"utilities/utilities.cpp"
+"application/uitranscripts.cpp"
+"world/station.cpp"
+"application/application.cpp"
+"simulation/simulationtime.cpp"
+"scene/sceneeditor.cpp"
+"rendering/screenshot.cpp"
+"input/driverkeyboardinput.cpp"
+"application/drivermode.cpp"
+"application/driveruilayer.cpp"
+"application/driveruipanels.cpp"
+"input/editorkeyboardinput.cpp"
+"application/editormode.cpp"
+"input/editormouseinput.cpp"
+"application/editoruilayer.cpp"
+"application/editoruipanels.cpp"
+"application/scenarioloadermode.cpp"
+"application/scenarioloaderuilayer.cpp"
+"scene/scenenodegroups.cpp"
+"simulation/simulationenvironment.cpp"
+"simulation/simulationstateserializer.cpp"
+"rendering/precipitation.cpp"
+"scripting/pythonscreenviewer.cpp"
+"utilities/dictionary.cpp"
+"rendering/particles.cpp"
+"utilities/headtrack.cpp"
+"scripting/ladderlogic.cpp"
+"rendering/geometrybank.cpp"
+"rendering/openglcolor.cpp"
+"simulation/simulationsounds.cpp"
+"rendering/openglcamera.cpp"
 
 "network/network.cpp"
 "network/message.cpp"
@@ -232,7 +243,7 @@ set_source_files_properties("imgui/imgui_impl_opengl2.cpp" PROPERTIES SKIP_PRECO
 
 if (WITH_CRASHPAD)
 	set(DEFINITIONS ${DEFINITIONS} "WITH_CRASHPAD")
-	set(SOURCES ${SOURCES} "crashreporter.cpp")
+	set(SOURCES ${SOURCES} "utilities/crashreporter.cpp")
 	if (WIN32)
 		include_directories("${DEPS_DIR}/crashpad/include" "${DEPS_DIR}/crashpad/include/mini_chromium")
 	else()
@@ -242,19 +253,19 @@ endif()
 
 if (WITH_PYTHON)
 	set(DEFINITIONS ${DEFINITIONS} "WITH_PYTHON")
-	set(SOURCES ${SOURCES} "PyInt.cpp")
+	set(SOURCES ${SOURCES} "scripting/PyInt.cpp")
 else()
-	set(SOURCES ${SOURCES} "PyIntStub.cpp")
+	set(SOURCES ${SOURCES} "scripting/PyIntStub.cpp")
 endif()
 
 if (WITH_UART)
 	set(DEFINITIONS ${DEFINITIONS} "WITH_UART")
-	set(SOURCES ${SOURCES} "uart.cpp")
+	set(SOURCES ${SOURCES} "utilities/uart.cpp")
 endif()
 
 if (WITH_ZMQ)
 	set(DEFINITIONS ${DEFINITIONS} "WITH_ZMQ")
-	set(SOURCES ${SOURCES} "zmq_input.cpp")
+	set(SOURCES ${SOURCES} "input/zmq_input.cpp")
 endif()
 
 if (WITH_OPENVR)
@@ -264,7 +275,7 @@ endif()
 
 if (WITH_LUA)
 	set(DEFINITIONS ${DEFINITIONS} "WITH_LUA")
-	set(SOURCES ${SOURCES} "lua.cpp")
+	set(SOURCES ${SOURCES} "scripting/lua.cpp")
 endif()
 
 if (WITHDUMPGEN)
@@ -273,23 +284,23 @@ endif()
 
 if (WITH_OPENGL_MODERN)
         set(SOURCES ${SOURCES}
-            "opengl33geometrybank.cpp"
-            "opengl33light.cpp"
-            "opengl33skydome.cpp"
-            "opengl33precipitation.cpp"
-            "opengl33particles.cpp"
-            "opengl33renderer.cpp")
+            "rendering/opengl33geometrybank.cpp"
+            "rendering/opengl33light.cpp"
+            "rendering/opengl33skydome.cpp"
+            "rendering/opengl33precipitation.cpp"
+            "rendering/opengl33particles.cpp"
+            "rendering/opengl33renderer.cpp")
 		set(DEFINITIONS ${DEFINITIONS} "WITH_OPENGL_MODERN")
 endif()
 
 if (WITH_OPENGL_LEGACY)
         set(SOURCES ${SOURCES}
-            "openglgeometrybank.cpp"
-            "opengllight.cpp"
-            "openglskydome.cpp"
-            "openglprecipitation.cpp"
-            "openglparticles.cpp"
-            "openglrenderer.cpp")
+            "rendering/openglgeometrybank.cpp"
+            "rendering/opengllight.cpp"
+            "rendering/openglskydome.cpp"
+            "rendering/openglprecipitation.cpp"
+            "rendering/openglparticles.cpp"
+            "rendering/openglrenderer.cpp")
 		set(DEFINITIONS ${DEFINITIONS} "WITH_OPENGL_LEGACY")
 endif()
 

Console.cpp

@@ -9,12 +9,12 @@ http://mozilla.org/MPL/2.0/.
 
 #include "stdafx.h"
 #include "Console.h"
-#include "Globals.h"
-#include "application.h"
+#include "utilities/Globals.h"
+#include "application/application.h"
 #include "LPT.h"
-#include "Logs.h"
+#include "utilities/Logs.h"
 #include "PoKeys55.h"
-#include "utilities.h"
+#include "utilities/utilities.h"
 
 //---------------------------------------------------------------------------
 // Ra: klasa statyczna gromadząca sygnały sterujące oraz informacje zwrotne

Console.h

@@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/.
 
 #ifndef ConsoleH
 #define ConsoleH
-#include "Globals.h"
-#include "application.h"
+#include "utilities/Globals.h"
+#include "application/application.h"
 //---------------------------------------------------------------------------
 class TConsoleDevice; // urządzenie podłączalne za pomocą DLL
 class TPoKeys55;

Console/LPT.cpp

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
 
 #include "stdafx.h"
 #include "LPT.h"
-#include "Logs.h"
+#include "utilities/Logs.h"
 
 // LPT na USB:
 // USB\VID_067B&PID_2305&REV_0200

Console/PoKeys55.cpp

@@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/.
 #include "stdafx.h"
 #include "PoKeys55.h"
 #include <setupapi.h>
-#include "utilities.h"
+#include "utilities/utilities.h"
 
 //---------------------------------------------------------------------------
 // HIDscaner: http://forum.simflight.com/topic/68257-latest-lua-package-for-fsuipc-and-wideclient/

EU07.cpp

@@ -18,8 +18,8 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others
 
 #include "stdafx.h"
 
-#include "application.h"
-#include "Logs.h"
+#include "application/application.h"
+#include "utilities/Logs.h"
 #include <cstdlib>
 #ifdef WITHDUMPGEN
 #ifdef _WIN32
@@ -38,7 +38,7 @@ void export_e3d_standalone(std::string in, std::string out, int flags, bool dyna
 #include <string>
 #include <sstream>
 #include <iomanip>
-#include <Globals.h>
+#include <utilities/Globals.h>
 
 #ifdef _WIN32
 #pragma comment(lib, "Dbghelp.lib")

McZapkie/MOVER.h

@@ -12,7 +12,7 @@ http://mozilla.org/MPL/2.0/.
 //Q: 20160805 - odlaczenie pliku fizyki .pas od kompilacji
 #include <map>
 #include "hamulce.h"
-#include "ladderlogic.h"
+#include "scripting/ladderlogic.h"
 /*
 MaSzyna EU07 locomotive simulator
 Copyright (C) 2001-2004  Maciej Czapkiewicz and others
@@ -78,8 +78,8 @@ zwiekszenie nacisku przy duzych predkosciach w hamulcach Oerlikona
 ...
 */
 
-#include "dumb3d.h"
-#include "utilities.h"
+#include "utilities/dumb3d.h"
+#include "utilities/utilities.h"
 
 extern int ConversionError;
 

McZapkie/Mover.cpp

@@ -10,13 +10,13 @@ http://mozilla.org/MPL/2.0/.
 #include "stdafx.h"
 #include "MOVER.h"
 
-#include "utilities.h"
-#include "DynObj.h"
+#include "utilities/utilities.h"
+#include "vehicle/DynObj.h"
 #include "Oerlikon_ESt.h"
-#include "Globals.h"
-#include "Logs.h"
-#include "parser.h"
-#include "simulation.h"
+#include "utilities/Globals.h"
+#include "utilities/Logs.h"
+#include "utilities/parser.h"
+#include "simulation/simulation.h"
 //---------------------------------------------------------------------------
 
 // Ra: tu należy przenosić funcje z mover.pas, które nie są z niego wywoływane.

McZapkie/Oerlikon_ESt.cpp

@@ -14,7 +14,7 @@ Copyright (C) 2007-2014 Maciej Cierniak
 
 #include "stdafx.h"
 #include "Oerlikon_ESt.h"
-#include "utilities.h"
+#include "utilities/utilities.h"
 
 double d2A( double const d )
 {

McZapkie/hamulce.cpp

@@ -16,7 +16,7 @@ Copyright (C) 2007-2014 Maciej Cierniak
 #include "hamulce.h"
 #include <typeinfo>
 #include "MOVER.h"
-#include "utilities.h"
+#include "utilities/utilities.h"
 
 //---FUNKCJE OGOLNE---
 

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 {
 

audio/audio.cpp

@@ -11,11 +11,11 @@ http://mozilla.org/MPL/2.0/.
 
 #include <sndfile.h>
 
-#include "audio.h"
-#include "Globals.h"
-#include "Logs.h"
-#include "ResourceManager.h"
-#include "utilities.h"
+#include "audio/audio.h"
+#include "utilities/Globals.h"
+#include "utilities/Logs.h"
+#include "model/ResourceManager.h"
+#include "utilities/utilities.h"
 
 namespace audio {
 

audio/audiorenderer.cpp

@@ -8,15 +8,15 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "audiorenderer.h"
+#include "audio/audiorenderer.h"
 
-#include "sound.h"
-#include "Globals.h"
-#include "Camera.h"
-#include "Logs.h"
-#include "utilities.h"
-#include "simulation.h"
-#include "Train.h"
+#include "audio/sound.h"
+#include "utilities/Globals.h"
+#include "vehicle/Camera.h"
+#include "utilities/Logs.h"
+#include "utilities/utilities.h"
+#include "simulation/simulation.h"
+#include "vehicle/Train.h"
 
 namespace audio {
 

audio/audiorenderer.h

@@ -9,9 +9,9 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "audio.h"
-#include "ResourceManager.h"
-#include "uitranscripts.h"
+#include "audio/audio.h"
+#include "model/ResourceManager.h"
+#include "application/uitranscripts.h"
 
 #define EU07_SOUND_PROOFINGUSESRANGE
 

audio/sound.cpp

@@ -9,14 +9,14 @@ http://mozilla.org/MPL/2.0/.
 
 #include "stdafx.h"
 
-#include "sound.h"
-#include "parser.h"
-#include "Globals.h"
-#include "Camera.h"
-#include "Train.h"
-#include "DynObj.h"
-#include "simulation.h"
-#include "audiorenderer_extra.h"
+#include "audio/sound.h"
+#include "utilities/parser.h"
+#include "utilities/Globals.h"
+#include "vehicle/Camera.h"
+#include "vehicle/Train.h"
+#include "vehicle/DynObj.h"
+#include "simulation/simulation.h"
+#include "audio/audiorenderer_extra.h"
 
 // constructors
 sound_source::sound_source( sound_placement const Placement, float const Range ) :

audio/sound.h

@@ -9,9 +9,9 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "audiorenderer.h"
-#include "Classes.h"
-#include "Names.h"
+#include "audio/audiorenderer.h"
+#include "utilities/Classes.h"
+#include "utilities/Names.h"
 
 float const EU07_SOUND_GLOBALRANGE { -1.f };
 float const EU07_SOUND_CABCONTROLSCUTOFFRANGE { 7.5f };

betterRenderer/eu07_source/register.cpp

@@ -1,4 +1,4 @@
-#include "Logs.h"
+#include "utilities/Logs.h"
 #include "nvrenderer/nvrenderer.h"
 
 namespace {

betterRenderer/renderer/include/nvrenderer/nvrenderer.h

@@ -22,14 +22,14 @@
 #include <mutex>
 
 // EU07 includes
-#include <Classes.h>
-#include <scene.h>
+#include <utilities/Classes.h>
+#include <scene/scene.h>
 
 #include "nvrenderer_enums.h"
 #include "quadtree.h"
-#include "renderer.h"
+#include "rendering/renderer.h"
 #include "resource_registry.h"
-#include "sky.h"
+#include "environment/sky.h"
 
 namespace Rt {
 struct IRtModel;

betterRenderer/renderer/source/environment.cpp

@@ -8,7 +8,7 @@
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
 #include "nvtexture.h"
-#include "simulationenvironment.h"
+#include "simulation/simulationenvironment.h"
 #include "sky.h"
 
 int MaEnvironment::GetCurrentSetIndex() {

betterRenderer/renderer/source/fsr.cpp

@@ -13,7 +13,7 @@
 #include "nvrenderer_vulkan.h"
 #endif
 
-#include "Globals.h"
+#include "utilities/Globals.h"
 #include "gbuffer.h"
 #include "gbufferblitpass.h"
 

betterRenderer/renderer/source/gbufferblitpass.cpp

@@ -1,7 +1,7 @@
 #include "gbufferblitpass.h"
 
 #include <chrono>
-#include <Timer.h>
+#include <utilities/Timer.h>
 #include <nvrhi/utils.h>
 
 #include "contactshadows.h"

betterRenderer/renderer/source/materialparser.cpp

@@ -2,12 +2,12 @@
 
 #include "nvrenderer/nvrenderer.h"
 
-#include <Globals.h>
-#include <Logs.h>
+#include <utilities/Globals.h>
+#include <utilities/Logs.h>
 #include <fmt/format.h>
-#include <material.h>
+#include <model/material.h>
 #include <parser.h>
-#include <utilities.h>
+#include <utilities/utilities.h>
 #include <yaml-cpp/yaml.h>
 #include <string>
 

betterRenderer/renderer/source/nvmaterial.cpp

@@ -4,7 +4,7 @@
 #include <fmt/format.h>
 #include <nvrhi/utils.h>
 
-#include "Logs.h"
+#include "utilities/Logs.h"
 #include "csm.h"
 #include "environment.h"
 #include "gbuffer.h"

betterRenderer/renderer/source/nvrenderer.cpp

@@ -1,12 +1,12 @@
 #include "nvrenderer/nvrenderer.h"
 
-#include <AnimModel.h>
-#include <Logs.h>
-#include <Model3d.h>
-#include <Timer.h>
-#include <application.h>
+#include <model/AnimModel.h>
+#include <utilities/Logs.h>
+#include <model/Model3d.h>
+#include <utilities/Timer.h>
+#include <application/application.h>
 #include <nvrhi/utils.h>
-#include <simulation.h>
+#include <simulation/simulation.h>
 
 #include <future>
 #include <glm/gtx/transform.hpp>

betterRenderer/renderer/source/nvrenderer_d3d12.cpp

@@ -2,8 +2,8 @@
 
 #include <fmt/format.h>
 
-#include "Globals.h"
-#include "Logs.h"
+#include "utilities/Globals.h"
+#include "utilities/Logs.h"
 #include "config.h"
 #include "nvrenderer/nvrenderer.h"
 

betterRenderer/renderer/source/nvrenderer_vulkan.cpp

@@ -3,8 +3,8 @@
 #include <GLFW/glfw3.h>
 #include <fmt/format.h>
 
-#include "Globals.h"
-#include "Logs.h"
+#include "utilities/Globals.h"
+#include "utilities/Logs.h"
 #include "config.h"
 #include "nvrenderer/nvrenderer.h"
 

betterRenderer/renderer/source/nvrendererbackend.cpp

@@ -1,6 +1,6 @@
 #include "nvrendererbackend.h"
 
-#include "Logs.h"
+#include "utilities/Logs.h"
 #include <fmt/format.h>
 
 void NvRendererMessageCallback::message(nvrhi::MessageSeverity severity,

betterRenderer/renderer/source/nvtexture.cpp

@@ -1,14 +1,14 @@
 #include "nvtexture.h"
 #include "nvrenderer/nvrenderer.h"
 
-#include <Globals.h>
-#include <PyInt.h>
-#include <application.h>
-#include <dictionary.h>
+#include <utilities/Globals.h>
+#include <scripting/PyInt.h>
+#include <application/application.h>
+#include <utilities/dictionary.h>
 #include <fmt/format.h>
-#include <utilities.h>
+#include <utilities/utilities.h>
 
-#include "Logs.h"
+#include "utilities/Logs.h"
 // #include "Texture.h"
 #include "nvrendererbackend.h"
 #include "stbi/stb_image.h"

betterRenderer/renderer/source/resource_registry.cpp

@@ -1,6 +1,6 @@
 #include "nvrenderer/resource_registry.h"
 
-#include "Logs.h"
+#include "utilities/Logs.h"
 #include "fmt/compile.h"
 #include "nvtexture.h"
 #include "nvrenderer/nvrenderer.h"

betterRenderer/renderer/source/rt_model.cpp

@@ -9,7 +9,7 @@
 
 #include <vector>
 
-#include "Model3d.h"
+#include "model/Model3d.h"
 
 namespace Rt {
 

betterRenderer/renderer/source/sky.cpp

@@ -4,8 +4,8 @@
 
 #include "environment.h"
 #include "nvrendererbackend.h"
-#include "simulationenvironment.h"
-#include "simulationtime.h"
+#include "simulation/simulationenvironment.h"
+#include "simulation/simulationtime.h"
 
 namespace {
 static const float PI = 3.14159265358979323846f;

betterRenderer/renderer/source/track_batching.cpp

@@ -4,9 +4,9 @@
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
 
-#include <Timer.h>
-#include <AnimModel.h>
-#include <simulation.h>
+#include <utilities/Timer.h>
+#include <model/AnimModel.h>
+#include <simulation/simulation.h>
 
 namespace BatchingUtils {
 

environment/moon.cpp

@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include "moon.h"
-#include "Globals.h"
-#include "mtable.h"
-#include "utilities.h"
-#include "simulationtime.h"
+#include "environment/moon.h"
+#include "utilities/Globals.h"
+#include "world/mtable.h"
+#include "utilities/utilities.h"
+#include "simulation/simulationtime.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // cSun -- class responsible for dynamic calculation of position and intensity of the Sun,

environment/sky.cpp

@@ -8,9 +8,9 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "sky.h"
-#include "Globals.h"
-#include "MdlMngr.h"
+#include "environment/sky.h"
+#include "utilities/Globals.h"
+#include "model/MdlMngr.h"
 
 //---------------------------------------------------------------------------
 //GLfloat lightPos[4] = {0.0f, 0.0f, 0.0f, 1.0f};

environment/sky.h

@@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Classes.h"
+#include "utilities/Classes.h"
 
 class TSky {
 

environment/skydome.cpp

@@ -1,10 +1,10 @@
 
 #include "stdafx.h"
-#include "skydome.h"
-#include "color.h"
-#include "utilities.h"
-#include "simulationenvironment.h"
-#include "Globals.h"
+#include "environment/skydome.h"
+#include "utilities/color.h"
+#include "utilities/utilities.h"
+#include "simulation/simulationenvironment.h"
+#include "utilities/Globals.h"
 
 // sky gradient based on "A practical analytic model for daylight" 
 // by A. J. Preetham Peter Shirley Brian Smits (University of Utah)

environment/stars.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include "stars.h"
-#include "Globals.h"
-#include "MdlMngr.h"
+#include "environment/stars.h"
+#include "utilities/Globals.h"
+#include "model/MdlMngr.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // cStars -- simple starfield model, simulating appearance of starry sky

environment/stars.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Classes.h"
+#include "utilities/Classes.h"
 
 
 //////////////////////////////////////////////////////////////////////////////////////////

environment/sun.cpp

@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include "sun.h"
-#include "Globals.h"
-#include "mtable.h"
-#include "utilities.h"
-#include "simulationtime.h"
+#include "environment/sun.h"
+#include "utilities/Globals.h"
+#include "world/mtable.h"
+#include "utilities/utilities.h"
+#include "simulation/simulationtime.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // cSun -- class responsible for dynamic calculation of position and intensity of the Sun,

export_e3d_standalone.cpp

@@ -1,8 +1,8 @@
 #include "stdafx.h"
 
-#include "Model3d.h"
-#include "Globals.h"
-#include "renderer.h"
+#include "model/Model3d.h"
+#include "utilities/Globals.h"
+#include "rendering/renderer.h"
 
 void export_e3d_standalone(std::string in, std::string out, int flags, bool dynamic)
 {

extras/piped_proc.cpp

@@ -4,7 +4,7 @@
 
 #include "stdafx.h"
 #include "piped_proc.h"
-#include "Logs.h"
+#include "utilities/Logs.h"
 
 #ifdef __unix__
 piped_proc::piped_proc(std::string cmd, bool write)

gl/framebuffer.cpp

@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "framebuffer.h"
 
-#include "Logs.h"
-#include "utilities.h"
+#include "utilities/Logs.h"
+#include "utilities/utilities.h"
 
 gl::framebuffer::framebuffer()
 {

gl/framebuffer.h

@@ -3,7 +3,7 @@
 #include "object.h"
 #include "bindable.h"
 #include "renderbuffer.h"
-#include "Texture.h"
+#include "model/Texture.h"
 #include "cubemap.h"
 
 namespace gl

gl/glsl_common.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ubo.h"
-#include "Globals.h"
+#include "utilities/Globals.h"
 
 namespace gl
 {

gl/postfx.h

@@ -3,7 +3,7 @@
 #include "shader.h"
 #include "vao.h"
 #include "framebuffer.h"
-#include "Texture.h"
+#include "model/Texture.h"
 
 namespace gl
 {

gl/query.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "query.h"
-#include "Globals.h"
+#include "utilities/Globals.h"
 
 gl::query::query(targets target)
     : target(target)

gl/shader.cpp

@@ -4,7 +4,7 @@
 #include <sstream>
 #include "shader.h"
 #include "glsl_common.h"
-#include "Logs.h"
+#include "utilities/Logs.h"
 
 inline bool strcend(std::string const &value, std::string const &ending)
 {

imgui/imgui_impl_opengl3.cpp

@@ -62,7 +62,7 @@
 //----------------------------------------
 
 #include "stdafx.h"
-#include "Globals.h"
+#include "utilities/Globals.h"
 
 #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
 #define _CRT_SECURE_NO_WARNINGS

input/command.cpp

@@ -8,14 +8,14 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "command.h"
+#include "input/command.h"
 
-#include "Globals.h"
-#include "Logs.h"
-#include "Timer.h"
-#include "utilities.h"
-#include "simulation.h"
-#include "Train.h"
+#include "utilities/Globals.h"
+#include "utilities/Logs.h"
+#include "utilities/Timer.h"
+#include "utilities/utilities.h"
+#include "simulation/simulation.h"
+#include "vehicle/Train.h"
 
 namespace simulation {
 

input/driverkeyboardinput.cpp

@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "driverkeyboardinput.h"
+#include "input/driverkeyboardinput.h"
 
 bool
 driverkeyboard_input::init() {

input/driverkeyboardinput.h

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "keyboardinput.h"
+#include "input/keyboardinput.h"
 
 class driverkeyboard_input : public keyboard_input {
 

input/drivermouseinput.cpp

@@ -8,19 +8,19 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "drivermouseinput.h"
+#include "input/drivermouseinput.h"
 
-#include "Globals.h"
-#include "application.h"
-#include "utilities.h"
-#include "Globals.h"
-#include "Timer.h"
-#include "simulation.h"
-#include "Train.h"
-#include "AnimModel.h"
-#include "renderer.h"
-#include "uilayer.h"
-#include "Logs.h"
+#include "utilities/Globals.h"
+#include "application/application.h"
+#include "utilities/utilities.h"
+#include "utilities/Globals.h"
+#include "utilities/Timer.h"
+#include "simulation/simulation.h"
+#include "vehicle/Train.h"
+#include "model/AnimModel.h"
+#include "rendering/renderer.h"
+#include "application/uilayer.h"
+#include "utilities/Logs.h"
 
 auto const EU07_CONTROLLER_MOUSESLIDERSIZE{ 0.6 };
 

input/drivermouseinput.h

@@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/.
 #pragma once
 
 #include <unordered_map>
-#include "command.h"
+#include "input/command.h"
 
 // virtual slider; value determined by position of the mouse
 class mouse_slider {

input/editorkeyboardinput.cpp

@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "editorkeyboardinput.h"
+#include "input/editorkeyboardinput.h"
 
 bool
 editorkeyboard_input::init() {

input/editorkeyboardinput.h

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "keyboardinput.h"
+#include "input/keyboardinput.h"
 
 class editorkeyboard_input : public keyboard_input {
 

input/editormouseinput.cpp

@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "editormouseinput.h"
+#include "input/editormouseinput.h"
 
 bool
 editormouse_input::init() {

input/editormouseinput.h

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "command.h"
+#include "input/command.h"
 
 class editormouse_input {
 

input/gamepadinput.cpp

@@ -8,11 +8,11 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "gamepadinput.h"
-#include "Logs.h"
-#include "Timer.h"
-#include "utilities.h"
-#include "parser.h"
+#include "input/gamepadinput.h"
+#include "utilities/Logs.h"
+#include "utilities/Timer.h"
+#include "utilities/utilities.h"
+#include "utilities/parser.h"
 
 glm::vec2 circle_to_square( glm::vec2 const &Point, int const Roundness = 0 ) {
 
@@ -172,7 +172,7 @@ gamepad_input::recall_bindings() {
 	}
 #endif
 
-	// bindingparser tworzony zawsze, z wybran¹ œcie¿k¹
+	// bindingparser tworzony zawsze, z wybran<EFBFBD> <20>cie<69>k<EFBFBD>
 	cParser bindingparser(filePath.c_str(), cParser::buffer_FILE);
 
     if( false == bindingparser.ok() ) {

input/gamepadinput.h

@@ -10,8 +10,8 @@ http://mozilla.org/MPL/2.0/.
 #pragma once
 
 #include <vector>
-#include "command.h"
-#include "parser.h"
+#include "input/command.h"
+#include "utilities/parser.h"
 
 class gamepad_input {
 

input/keyboardinput.cpp

@@ -8,10 +8,10 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "keyboardinput.h"
-#include "Globals.h"
-#include "Logs.h"
-#include "parser.h"
+#include "input/keyboardinput.h"
+#include "utilities/Globals.h"
+#include "utilities/Logs.h"
+#include "utilities/parser.h"
 
 namespace input {
 
@@ -143,7 +143,7 @@ keyboard_input::recall_bindings() {
 	}
 	else
 	{
-		// Fallback – plik w folderze symulatora
+		// Fallback <EFBFBD> plik w folderze symulatora
 		path = "eu07_input-keyboard.ini";
 	}
 	cParser bindingparser(path.c_str(), cParser::buffer_FILE);

input/keyboardinput.h

@@ -11,7 +11,7 @@ http://mozilla.org/MPL/2.0/.
 
 #include <unordered_map>
 #include <array>
-#include "command.h"
+#include "input/command.h"
 
 namespace input {
 

input/messaging.cpp

@@ -8,17 +8,17 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "messaging.h"
+#include "input/messaging.h"
 
-#include "Globals.h"
-#include "application.h"
-#include "simulation.h"
-#include "simulationtime.h"
-#include "Event.h"
-#include "DynObj.h"
-#include "Driver.h"
-#include "mtable.h"
-#include "Logs.h"
+#include "utilities/Globals.h"
+#include "application/application.h"
+#include "simulation/simulation.h"
+#include "simulation/simulationtime.h"
+#include "world/Event.h"
+#include "vehicle/DynObj.h"
+#include "vehicle/Driver.h"
+#include "world/mtable.h"
+#include "utilities/Logs.h"
 
 #ifdef _WIN32
 extern "C"

input/zmq_input.cpp

@@ -1,10 +1,10 @@
 #include "stdafx.h"
-#include "zmq_input.h"
-#include "Globals.h"
-#include "Logs.h"
-#include "simulation.h"
-#include "simulationtime.h"
-#include "Train.h"
+#include "input/zmq_input.h"
+#include "utilities/Globals.h"
+#include "utilities/Logs.h"
+#include "simulation/simulation.h"
+#include "simulation/simulationtime.h"
+#include "vehicle/Train.h"
 
 zmq_input::zmq_input()
 {

input/zmq_input.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <zmq_addon.hpp>
-#include "command.h"
+#include "input/command.h"
 
 class zmq_input
 {

launcher/deferred_image.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Texture.h"
-#include "renderer.h"
+#include "model/Texture.h"
+#include "rendering/renderer.h"
 
 class deferred_image {
 public:

launcher/keymapper.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "keymapper.h"
-#include "simulation.h"
+#include "simulation/simulation.h"
 
 ui::keymapper_panel::keymapper_panel()
     : ui_panel(STR("Keymapper"), false)

launcher/keymapper.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "uilayer.h"
-#include "driverkeyboardinput.h"
+#include "application/uilayer.h"
+#include "input/driverkeyboardinput.h"
 
 namespace ui
 {

launcher/launchermode.cpp

@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "launcher/launchermode.h"
 #include "launcher/launcheruilayer.h"
-#include "application.h"
-#include "simulation.h"
-#include "Globals.h"
+#include "application/application.h"
+#include "simulation/simulation.h"
+#include "utilities/Globals.h"
 
 launcher_mode::launcher_mode()
 {