From 7e49aa87409888ac4ad65c7324f1546063c81a61 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 14 Mar 2026 19:16:48 +0000 Subject: [PATCH] Rewrite #includes to use explicit subdirectory paths Co-authored-by: Hirek193 <23196899+Hirek193@users.noreply.github.com> --- CMakeLists.txt | 14 +------- Console.cpp | 8 ++--- Console.h | 4 +-- Console/LPT.cpp | 2 +- Console/PoKeys55.cpp | 2 +- EU07.cpp | 4 +-- McZapkie/MOVER.h | 6 ++-- McZapkie/Mover.cpp | 12 +++---- McZapkie/Oerlikon_ESt.cpp | 2 +- McZapkie/hamulce.cpp | 2 +- application/application.cpp | 40 ++++++++++----------- application/application.h | 8 ++--- application/applicationmode.h | 2 +- application/driverhints.cpp | 4 +-- application/driverhints.h | 4 +-- application/drivermode.cpp | 42 +++++++++++----------- application/drivermode.h | 16 ++++----- application/driveruilayer.cpp | 16 ++++----- application/driveruilayer.h | 6 ++-- application/driveruipanels.cpp | 44 ++++++++++++------------ application/driveruipanels.h | 4 +-- application/editormode.cpp | 24 ++++++------- application/editormode.h | 12 +++---- application/editoruilayer.cpp | 8 ++--- application/editoruilayer.h | 4 +-- application/editoruipanels.cpp | 22 ++++++------ application/editoruipanels.h | 4 +-- application/scenarioloadermode.cpp | 20 +++++------ application/scenarioloadermode.h | 4 +-- application/scenarioloaderuilayer.cpp | 8 ++--- application/scenarioloaderuilayer.h | 2 +- application/uilayer.cpp | 16 ++++----- application/uilayer.h | 2 +- application/uitranscripts.cpp | 8 ++--- audio/audio.cpp | 10 +++--- audio/audiorenderer.cpp | 16 ++++----- audio/audiorenderer.h | 6 ++-- audio/sound.cpp | 16 ++++----- audio/sound.h | 6 ++-- ci_shadervalidator/main.cpp | 2 +- environment/moon.cpp | 10 +++--- environment/sky.cpp | 6 ++-- environment/sky.h | 2 +- environment/skydome.cpp | 10 +++--- environment/stars.cpp | 6 ++-- environment/stars.h | 2 +- environment/sun.cpp | 10 +++--- export_e3d_standalone.cpp | 6 ++-- extras/piped_proc.cpp | 2 +- gl/framebuffer.cpp | 4 +-- gl/framebuffer.h | 2 +- gl/glsl_common.h | 2 +- gl/postfx.h | 2 +- gl/query.cpp | 2 +- gl/shader.cpp | 2 +- imgui/imgui_impl_opengl3.cpp | 2 +- input/command.cpp | 14 ++++---- input/driverkeyboardinput.cpp | 2 +- input/driverkeyboardinput.h | 2 +- input/drivermouseinput.cpp | 24 ++++++------- input/drivermouseinput.h | 2 +- input/editorkeyboardinput.cpp | 2 +- input/editorkeyboardinput.h | 2 +- input/editormouseinput.cpp | 2 +- input/editormouseinput.h | 2 +- input/gamepadinput.cpp | 12 +++---- input/gamepadinput.h | 4 +-- input/keyboardinput.cpp | 10 +++--- input/keyboardinput.h | 2 +- input/messaging.cpp | 20 +++++------ input/zmq_input.cpp | 12 +++---- input/zmq_input.h | 2 +- launcher/deferred_image.h | 4 +-- launcher/keymapper.cpp | 2 +- launcher/keymapper.h | 4 +-- launcher/launchermode.cpp | 6 ++-- launcher/launchermode.h | 2 +- launcher/launcheruilayer.cpp | 4 +-- launcher/launcheruilayer.h | 2 +- launcher/scenery_list.cpp | 10 +++--- launcher/scenery_list.h | 4 +-- launcher/scenery_scanner.cpp | 2 +- launcher/scenery_scanner.h | 6 ++-- launcher/textures_scanner.cpp | 2 +- launcher/vehicle_picker.cpp | 4 +-- launcher/vehicle_picker.h | 4 +-- model/AnimModel.cpp | 20 +++++------ model/AnimModel.h | 12 +++---- model/MdlMngr.cpp | 10 +++--- model/MdlMngr.h | 2 +- model/Model3d.cpp | 20 +++++------ model/Model3d.h | 10 +++--- model/ResourceManager.cpp | 4 +-- model/Texture.cpp | 18 +++++----- model/Texture.h | 2 +- model/material.cpp | 16 ++++----- model/material.h | 4 +-- model/vertex.cpp | 4 +-- model/vertex.h | 2 +- network/backend/asio.cpp | 4 +-- network/manager.cpp | 4 +-- network/manager.h | 2 +- network/message.cpp | 2 +- network/message.h | 2 +- network/network.cpp | 10 +++--- network/network.h | 2 +- rendering/frustum.cpp | 2 +- rendering/frustum.h | 4 +-- rendering/geometrybank.cpp | 10 +++--- rendering/geometrybank.h | 2 +- rendering/light.h | 2 +- rendering/lightarray.cpp | 4 +-- rendering/lightarray.h | 2 +- rendering/nullrenderer.cpp | 2 +- rendering/nullrenderer.h | 8 ++--- rendering/opengl33geometrybank.cpp | 4 +-- rendering/opengl33geometrybank.h | 2 +- rendering/opengl33light.cpp | 2 +- rendering/opengl33light.h | 2 +- rendering/opengl33particles.cpp | 10 +++--- rendering/opengl33precipitation.cpp | 8 ++--- rendering/opengl33precipitation.h | 2 +- rendering/opengl33renderer.cpp | 28 +++++++-------- rendering/opengl33renderer.h | 20 +++++------ rendering/opengl33skydome.cpp | 4 +-- rendering/openglcamera.cpp | 4 +-- rendering/openglcamera.h | 4 +-- rendering/openglcolor.cpp | 2 +- rendering/openglcolor.h | 2 +- rendering/openglgeometrybank.cpp | 6 ++-- rendering/openglgeometrybank.h | 2 +- rendering/opengllight.cpp | 4 +-- rendering/opengllight.h | 2 +- rendering/openglparticles.cpp | 10 +++--- rendering/openglprecipitation.cpp | 8 ++--- rendering/openglprecipitation.h | 2 +- rendering/openglrenderer.cpp | 34 +++++++++--------- rendering/openglrenderer.h | 20 +++++------ rendering/openglskydome.cpp | 4 +-- rendering/particles.cpp | 12 +++---- rendering/particles.h | 4 +-- rendering/precipitation.cpp | 10 +++--- rendering/renderer.cpp | 4 +-- rendering/renderer.h | 4 +-- rendering/screenshot.cpp | 6 ++-- scene/scene.cpp | 22 ++++++------ scene/scene.h | 14 ++++---- scene/sceneeditor.cpp | 18 +++++----- scene/sceneeditor.h | 2 +- scene/scenenode.cpp | 12 +++---- scene/scenenode.h | 8 ++--- scene/scenenodegroups.cpp | 8 ++--- scene/scenenodegroups.h | 2 +- scene/sn_utils.cpp | 2 +- scripting/PyInt.cpp | 10 +++--- scripting/PyInt.h | 6 ++-- scripting/PyIntStub.cpp | 2 +- scripting/ladderlogic.cpp | 8 ++--- scripting/ladderlogic.h | 2 +- scripting/lua.cpp | 14 ++++---- scripting/pythonscreenviewer.cpp | 6 ++-- scripting/pythonscreenviewer.h | 4 +-- simulation/simulation.cpp | 38 ++++++++++---------- simulation/simulation.h | 12 +++---- simulation/simulationenvironment.cpp | 8 ++--- simulation/simulationenvironment.h | 14 ++++---- simulation/simulationsounds.cpp | 4 +-- simulation/simulationsounds.h | 2 +- simulation/simulationstateserializer.cpp | 36 +++++++++---------- simulation/simulationstateserializer.h | 4 +-- simulation/simulationtime.cpp | 6 ++-- stdafx.h | 4 +-- utilities/Float3d.cpp | 4 +-- utilities/Globals.cpp | 14 ++++---- utilities/Globals.h | 18 +++++----- utilities/Logs.cpp | 8 ++--- utilities/Timer.cpp | 4 +-- utilities/dictionary.cpp | 12 +++---- utilities/dumb3d.cpp | 2 +- utilities/headtrack.cpp | 4 +-- utilities/motiontelemetry.cpp | 14 ++++---- utilities/parser.cpp | 8 ++--- utilities/translation.cpp | 6 ++-- utilities/uart.cpp | 16 ++++----- utilities/uart.h | 2 +- utilities/utilities.cpp | 8 ++--- utilities/utilities.h | 2 +- vehicle/AirCoupler.cpp | 6 ++-- vehicle/AirCoupler.h | 2 +- vehicle/Button.cpp | 12 +++---- vehicle/Button.h | 4 +-- vehicle/Camera.cpp | 12 +++---- vehicle/Camera.h | 6 ++-- vehicle/Driver.cpp | 28 +++++++-------- vehicle/Driver.h | 12 +++---- vehicle/DynObj.cpp | 34 +++++++++--------- vehicle/DynObj.h | 12 +++---- vehicle/Gauge.cpp | 14 ++++---- vehicle/Gauge.h | 4 +-- vehicle/Train.cpp | 32 ++++++++--------- vehicle/Train.h | 18 +++++----- vr/openvr_imp.cpp | 10 +++--- vr/vr_interface.cpp | 2 +- vr/vr_interface.h | 6 ++-- widgets/cameraview_extcam.cpp | 4 +-- widgets/cameraview_extcam.h | 2 +- widgets/map.cpp | 14 ++++---- widgets/map.h | 8 ++--- widgets/map_objects.cpp | 4 +-- widgets/map_objects.h | 8 ++--- widgets/perfgraphs.cpp | 4 +-- widgets/perfgraphs.h | 2 +- widgets/time.cpp | 4 +-- widgets/time.h | 6 ++-- widgets/trainingcard.cpp | 2 +- widgets/trainingcard.h | 2 +- widgets/vehiclelist.cpp | 4 +-- widgets/vehiclelist.h | 2 +- widgets/vehicleparams.cpp | 8 ++--- widgets/vehicleparams.h | 8 ++--- windows.cpp | 4 +-- world/EvLaunch.cpp | 18 +++++----- world/EvLaunch.h | 4 +-- world/Event.cpp | 34 +++++++++--------- world/Event.h | 16 ++++----- world/MemCell.cpp | 10 +++--- world/MemCell.h | 8 ++--- world/Segment.cpp | 14 ++++---- world/Segment.h | 8 ++--- world/Spring.cpp | 2 +- world/Spring.h | 2 +- world/Track.cpp | 28 +++++++-------- world/Track.h | 10 +++--- world/Traction.cpp | 14 ++++---- world/Traction.h | 8 ++--- world/TractionPower.cpp | 6 ++-- world/TractionPower.h | 6 ++-- world/TrkFoll.cpp | 12 +++---- world/TrkFoll.h | 4 +-- world/mtable.cpp | 10 +++--- world/mtable.h | 4 +-- world/station.cpp | 6 ++-- world/station.h | 2 +- 243 files changed, 994 insertions(+), 1006 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 88355f0b..593f2238 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -404,19 +404,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE "${DEPS_DIR}/glad/include" "${DEPS_DIR}/dds-ktx/include" "${CMAKE_BINARY_DIR}/geninc" - "${GLOBAL_INCLUDE_DIR}" - "simulation" - "scene" - "rendering" - "audio" - "environment" - "application" - "input" - "scripting" - "model" - "utilities" - "world" - "vehicle") + "${GLOBAL_INCLUDE_DIR}") if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC) # override cmake defaults diff --git a/Console.cpp b/Console.cpp index 6510d1bd..82e8d162 100644 --- a/Console.cpp +++ b/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 diff --git a/Console.h b/Console.h index ce403487..e99beb4b 100644 --- a/Console.h +++ b/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; diff --git a/Console/LPT.cpp b/Console/LPT.cpp index 3271d8eb..c7be8275 100644 --- a/Console/LPT.cpp +++ b/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 diff --git a/Console/PoKeys55.cpp b/Console/PoKeys55.cpp index 5774947b..e770417b 100644 --- a/Console/PoKeys55.cpp +++ b/Console/PoKeys55.cpp @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "PoKeys55.h" #include -#include "utilities.h" +#include "utilities/utilities.h" //--------------------------------------------------------------------------- // HIDscaner: http://forum.simflight.com/topic/68257-latest-lua-package-for-fsuipc-and-wideclient/ diff --git a/EU07.cpp b/EU07.cpp index e4dba5ad..a8e5817e 100644 --- a/EU07.cpp +++ b/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 #ifdef WITHDUMPGEN #ifdef _WIN32 diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 82a48f4a..c9c3bb04 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -12,7 +12,7 @@ http://mozilla.org/MPL/2.0/. //Q: 20160805 - odlaczenie pliku fizyki .pas od kompilacji #include #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; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index ccde0754..ca62fb72 100644 --- a/McZapkie/Mover.cpp +++ b/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. diff --git a/McZapkie/Oerlikon_ESt.cpp b/McZapkie/Oerlikon_ESt.cpp index 13b100dd..e5761ef6 100644 --- a/McZapkie/Oerlikon_ESt.cpp +++ b/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 ) { diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index ea37533d..35538eea 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -16,7 +16,7 @@ Copyright (C) 2007-2014 Maciej Cierniak #include "hamulce.h" #include #include "MOVER.h" -#include "utilities.h" +#include "utilities/utilities.h" //---FUNKCJE OGOLNE--- diff --git a/application/application.cpp b/application/application.cpp index 1a9b61cd..95cc1d52 100644 --- a/application/application.cpp +++ b/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 -#include "translation.h" +#include "utilities/translation.h" #if WITH_DISCORD_RPC #include #endif #include -#include "translation.h" +#include "utilities/translation.h" #ifdef _WIN32 #pragma comment(lib, "dsound.lib") diff --git a/application/application.h b/application/application.h index 07a3b90f..d461a0c9 100644 --- a/application/application.h +++ b/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 { diff --git a/application/applicationmode.h b/application/applicationmode.h index 39cd4a23..feea3bdb 100644 --- a/application/applicationmode.h +++ b/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 diff --git a/application/driverhints.cpp b/application/driverhints.cpp index 45bc6498..792b2bd2 100644 --- a/application/driverhints.cpp +++ b/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 ) { diff --git a/application/driverhints.h b/application/driverhints.h index 3f95cb31..7b6130c2 100644 --- a/application/driverhints.h +++ b/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 diff --git a/application/drivermode.cpp b/application/drivermode.cpp index 5aeafc81..394aad1c 100644 --- a/application/drivermode.cpp +++ b/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 { diff --git a/application/drivermode.h b/application/drivermode.h index d9c0cffa..85caecba 100644 --- a/application/drivermode.h +++ b/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 { diff --git a/application/driveruilayer.cpp b/application/driveruilayer.cpp index 99a4dc36..a89f19fd 100644 --- a/application/driveruilayer.cpp +++ b/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() { diff --git a/application/driveruilayer.h b/application/driveruilayer.h index 3c1ea344..8ad1d775 100644 --- a/application/driveruilayer.h +++ b/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" diff --git a/application/driveruipanels.cpp b/application/driveruipanels.cpp index 2eafcce3..16465d50 100644 --- a/application/driveruipanels.cpp +++ b/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 diff --git a/application/driveruipanels.h b/application/driveruipanels.h index f34a601e..11b65c35 100644 --- a/application/driveruipanels.h +++ b/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 { diff --git a/application/editormode.cpp b/application/editormode.cpp index 1c42242e..1e97e9de 100644 --- a/application/editormode.cpp +++ b/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 #include #include diff --git a/application/editormode.h b/application/editormode.h index 9c5488b9..8f1e8e12 100644 --- a/application/editormode.h +++ b/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 { diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index b8129783..0a225fe3 100644 --- a/application/editoruilayer.cpp +++ b/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() { diff --git a/application/editoruilayer.h b/application/editoruilayer.h index 94e864ba..ad3d5447 100644 --- a/application/editoruilayer.h +++ b/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 { diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index 0819e920..11c1e4f0 100644 --- a/application/editoruipanels.cpp +++ b/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) { diff --git a/application/editoruipanels.h b/application/editoruipanels.h index 4a2a9867..c90f3eda 100644 --- a/application/editoruipanels.h +++ b/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 diff --git a/application/scenarioloadermode.cpp b/application/scenarioloadermode.cpp index 6a47ae68..e49493c4 100644 --- a/application/scenarioloadermode.cpp +++ b/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(); diff --git a/application/scenarioloadermode.h b/application/scenarioloadermode.h index 5e642582..db23458d 100644 --- a/application/scenarioloadermode.h +++ b/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 state; diff --git a/application/scenarioloaderuilayer.cpp b/application/scenarioloaderuilayer.cpp index 74707b4d..1beb5de8 100644 --- a/application/scenarioloaderuilayer.cpp +++ b/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 -#include "Logs.h" +#include "utilities/Logs.h" #include using json = nlohmann::json; diff --git a/application/scenarioloaderuilayer.h b/application/scenarioloaderuilayer.h index 753cb197..3be9cba1 100644 --- a/application/scenarioloaderuilayer.h +++ b/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 { diff --git a/application/uilayer.cpp b/application/uilayer.cpp index 806c72f3..b1c40292 100644 --- a/application/uilayer.cpp +++ b/application/uilayer.cpp @@ -8,17 +8,17 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "uilayer.h" +#include "application/uilayer.h" #include -#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" diff --git a/application/uilayer.h b/application/uilayer.h index 25399612..6d4019c6 100644 --- a/application/uilayer.h +++ b/application/uilayer.h @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#include "Texture.h" +#include "model/Texture.h" #include "widgets/popup.h" // GuiLayer -- basic user interface class. draws requested information on top of openGL screen diff --git a/application/uitranscripts.cpp b/application/uitranscripts.cpp index 1c054910..6de03d34 100644 --- a/application/uitranscripts.cpp +++ b/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 { diff --git a/audio/audio.cpp b/audio/audio.cpp index 8c4e3e3c..65bd5ec9 100644 --- a/audio/audio.cpp +++ b/audio/audio.cpp @@ -11,11 +11,11 @@ http://mozilla.org/MPL/2.0/. #include -#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 { diff --git a/audio/audiorenderer.cpp b/audio/audiorenderer.cpp index da66ab51..0cd4b4e4 100644 --- a/audio/audiorenderer.cpp +++ b/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 { diff --git a/audio/audiorenderer.h b/audio/audiorenderer.h index 94ccb4e0..763279ce 100644 --- a/audio/audiorenderer.h +++ b/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 diff --git a/audio/sound.cpp b/audio/sound.cpp index 7aa6a36a..8fcdd033 100644 --- a/audio/sound.cpp +++ b/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 ) : diff --git a/audio/sound.h b/audio/sound.h index 837325c1..ff85ec03 100644 --- a/audio/sound.h +++ b/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 }; diff --git a/ci_shadervalidator/main.cpp b/ci_shadervalidator/main.cpp index 7a4b53aa..83d079f9 100644 --- a/ci_shadervalidator/main.cpp +++ b/ci_shadervalidator/main.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "../gl/shader.h" #include "../gl/glsl_common.h" -#include "Globals.h" +#include "utilities/Globals.h" #include #include #include diff --git a/environment/moon.cpp b/environment/moon.cpp index a9cfcc9d..d7b4ab58 100644 --- a/environment/moon.cpp +++ b/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, diff --git a/environment/sky.cpp b/environment/sky.cpp index 42a57cac..6bab884c 100644 --- a/environment/sky.cpp +++ b/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}; diff --git a/environment/sky.h b/environment/sky.h index 2df0a143..34b1ae75 100644 --- a/environment/sky.h +++ b/environment/sky.h @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "Classes.h" +#include "utilities/Classes.h" class TSky { diff --git a/environment/skydome.cpp b/environment/skydome.cpp index cc7ad696..e0a1afe1 100644 --- a/environment/skydome.cpp +++ b/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) diff --git a/environment/stars.cpp b/environment/stars.cpp index 9b0d1572..5fd112c5 100644 --- a/environment/stars.cpp +++ b/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 diff --git a/environment/stars.h b/environment/stars.h index bae1ada6..f3643d26 100644 --- a/environment/stars.h +++ b/environment/stars.h @@ -1,6 +1,6 @@ #pragma once -#include "Classes.h" +#include "utilities/Classes.h" ////////////////////////////////////////////////////////////////////////////////////////// diff --git a/environment/sun.cpp b/environment/sun.cpp index 986b3aef..fd28f7f3 100644 --- a/environment/sun.cpp +++ b/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, diff --git a/export_e3d_standalone.cpp b/export_e3d_standalone.cpp index 1451877c..ecdd4ab9 100644 --- a/export_e3d_standalone.cpp +++ b/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) { diff --git a/extras/piped_proc.cpp b/extras/piped_proc.cpp index 4e482d39..de9303ce 100644 --- a/extras/piped_proc.cpp +++ b/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) diff --git a/gl/framebuffer.cpp b/gl/framebuffer.cpp index 9c4e5a82..af1f63de 100644 --- a/gl/framebuffer.cpp +++ b/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() { diff --git a/gl/framebuffer.h b/gl/framebuffer.h index cda76d9e..e5dccf57 100644 --- a/gl/framebuffer.h +++ b/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 diff --git a/gl/glsl_common.h b/gl/glsl_common.h index 85e6cc9f..17e46723 100644 --- a/gl/glsl_common.h +++ b/gl/glsl_common.h @@ -1,7 +1,7 @@ #pragma once #include "ubo.h" -#include "Globals.h" +#include "utilities/Globals.h" namespace gl { diff --git a/gl/postfx.h b/gl/postfx.h index 85c57a76..cc0c5450 100644 --- a/gl/postfx.h +++ b/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 { diff --git a/gl/query.cpp b/gl/query.cpp index 600164a4..3f3b56af 100644 --- a/gl/query.cpp +++ b/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) diff --git a/gl/shader.cpp b/gl/shader.cpp index 92a31949..edc52a54 100644 --- a/gl/shader.cpp +++ b/gl/shader.cpp @@ -4,7 +4,7 @@ #include #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) { diff --git a/imgui/imgui_impl_opengl3.cpp b/imgui/imgui_impl_opengl3.cpp index 519bff27..e4bf631c 100644 --- a/imgui/imgui_impl_opengl3.cpp +++ b/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 diff --git a/input/command.cpp b/input/command.cpp index 1b97e895..305b1a3d 100644 --- a/input/command.cpp +++ b/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 { diff --git a/input/driverkeyboardinput.cpp b/input/driverkeyboardinput.cpp index ded09670..829185c9 100644 --- a/input/driverkeyboardinput.cpp +++ b/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() { diff --git a/input/driverkeyboardinput.h b/input/driverkeyboardinput.h index c18871df..1e3f11b1 100644 --- a/input/driverkeyboardinput.h +++ b/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 { diff --git a/input/drivermouseinput.cpp b/input/drivermouseinput.cpp index 0cf8b250..b829521b 100644 --- a/input/drivermouseinput.cpp +++ b/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 }; diff --git a/input/drivermouseinput.h b/input/drivermouseinput.h index 6ff66f02..142ef99c 100644 --- a/input/drivermouseinput.h +++ b/input/drivermouseinput.h @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#include "command.h" +#include "input/command.h" // virtual slider; value determined by position of the mouse class mouse_slider { diff --git a/input/editorkeyboardinput.cpp b/input/editorkeyboardinput.cpp index 2b306f5c..fa1e95d0 100644 --- a/input/editorkeyboardinput.cpp +++ b/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() { diff --git a/input/editorkeyboardinput.h b/input/editorkeyboardinput.h index 138ba99d..1628fe04 100644 --- a/input/editorkeyboardinput.h +++ b/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 { diff --git a/input/editormouseinput.cpp b/input/editormouseinput.cpp index 43b6d29e..cc1a522d 100644 --- a/input/editormouseinput.cpp +++ b/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() { diff --git a/input/editormouseinput.h b/input/editormouseinput.h index 3f33af2c..46cfd335 100644 --- a/input/editormouseinput.h +++ b/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 { diff --git a/input/gamepadinput.cpp b/input/gamepadinput.cpp index 8292a25d..1eea53f3 100644 --- a/input/gamepadinput.cpp +++ b/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� �cie�k� cParser bindingparser(filePath.c_str(), cParser::buffer_FILE); if( false == bindingparser.ok() ) { diff --git a/input/gamepadinput.h b/input/gamepadinput.h index ab6da934..ba8d4e38 100644 --- a/input/gamepadinput.h +++ b/input/gamepadinput.h @@ -10,8 +10,8 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#include "command.h" -#include "parser.h" +#include "input/command.h" +#include "utilities/parser.h" class gamepad_input { diff --git a/input/keyboardinput.cpp b/input/keyboardinput.cpp index e1b499d0..f9d83938 100644 --- a/input/keyboardinput.cpp +++ b/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 � plik w folderze symulatora path = "eu07_input-keyboard.ini"; } cParser bindingparser(path.c_str(), cParser::buffer_FILE); diff --git a/input/keyboardinput.h b/input/keyboardinput.h index efb4921f..fffa4630 100644 --- a/input/keyboardinput.h +++ b/input/keyboardinput.h @@ -11,7 +11,7 @@ http://mozilla.org/MPL/2.0/. #include #include -#include "command.h" +#include "input/command.h" namespace input { diff --git a/input/messaging.cpp b/input/messaging.cpp index 918dd779..23f4dbb1 100644 --- a/input/messaging.cpp +++ b/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" diff --git a/input/zmq_input.cpp b/input/zmq_input.cpp index 505c1587..1c6e29ac 100644 --- a/input/zmq_input.cpp +++ b/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() { diff --git a/input/zmq_input.h b/input/zmq_input.h index d96df3b5..503a6a59 100644 --- a/input/zmq_input.h +++ b/input/zmq_input.h @@ -1,7 +1,7 @@ #pragma once #include -#include "command.h" +#include "input/command.h" class zmq_input { diff --git a/launcher/deferred_image.h b/launcher/deferred_image.h index bfd98ab8..fcd25fd6 100644 --- a/launcher/deferred_image.h +++ b/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: diff --git a/launcher/keymapper.cpp b/launcher/keymapper.cpp index f03d3523..6ec882bd 100644 --- a/launcher/keymapper.cpp +++ b/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) diff --git a/launcher/keymapper.h b/launcher/keymapper.h index f5eaaa9d..65e789b5 100644 --- a/launcher/keymapper.h +++ b/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 { diff --git a/launcher/launchermode.cpp b/launcher/launchermode.cpp index 2de55215..053f1d88 100644 --- a/launcher/launchermode.cpp +++ b/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() { diff --git a/launcher/launchermode.h b/launcher/launchermode.h index 7cd8d0e9..53a65f4d 100644 --- a/launcher/launchermode.h +++ b/launcher/launchermode.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "applicationmode.h" +#include "application/applicationmode.h" class launcher_mode : public application_mode { diff --git a/launcher/launcheruilayer.cpp b/launcher/launcheruilayer.cpp index 5700bf95..bf9dddb0 100644 --- a/launcher/launcheruilayer.cpp +++ b/launcher/launcheruilayer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "launcher/launcheruilayer.h" -#include "application.h" -#include "translation.h" +#include "application/application.h" +#include "utilities/translation.h" launcher_ui::launcher_ui() : m_scenery_scanner(m_vehicles_bank), m_scenerylist_panel(m_scenery_scanner) { diff --git a/launcher/launcheruilayer.h b/launcher/launcheruilayer.h index 691802c1..91e36bbd 100644 --- a/launcher/launcheruilayer.h +++ b/launcher/launcheruilayer.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "uilayer.h" +#include "application/uilayer.h" #include "launcher/scenery_list.h" #include "launcher/keymapper.h" #include "launcher/vehicle_picker.h" diff --git a/launcher/scenery_list.cpp b/launcher/scenery_list.cpp index 86c513ed..c17d06a0 100644 --- a/launcher/scenery_list.cpp +++ b/launcher/scenery_list.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "scenery_list.h" #include "imgui/imgui.h" -#include "utilities.h" -#include "renderer.h" -#include "application.h" -#include "Logs.h" -#include "translation.h" +#include "utilities/utilities.h" +#include "rendering/renderer.h" +#include "application/application.h" +#include "utilities/Logs.h" +#include "utilities/translation.h" #include diff --git a/launcher/scenery_list.h b/launcher/scenery_list.h index fbaca275..957f1b5e 100644 --- a/launcher/scenery_list.h +++ b/launcher/scenery_list.h @@ -1,7 +1,7 @@ #pragma once -#include "driverkeyboardinput.h" -#include "uilayer.h" +#include "input/driverkeyboardinput.h" +#include "application/uilayer.h" #include "scenery_scanner.h" #include "widgets/popup.h" diff --git a/launcher/scenery_scanner.cpp b/launcher/scenery_scanner.cpp index 22007035..53e816ad 100644 --- a/launcher/scenery_scanner.cpp +++ b/launcher/scenery_scanner.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "scenery_scanner.h" -#include "Logs.h" +#include "utilities/Logs.h" scenery_scanner::scenery_scanner(ui::vehicles_bank &bank) : bank(bank) diff --git a/launcher/scenery_scanner.h b/launcher/scenery_scanner.h index ebde6062..573c2994 100644 --- a/launcher/scenery_scanner.h +++ b/launcher/scenery_scanner.h @@ -1,9 +1,9 @@ #pragma once #include -#include "Texture.h" -#include "utilities.h" -#include "parser.h" +#include "model/Texture.h" +#include "utilities/utilities.h" +#include "utilities/parser.h" #include "textures_scanner.h" struct dynamic_desc { diff --git a/launcher/textures_scanner.cpp b/launcher/textures_scanner.cpp index 1a511774..92e44dea 100644 --- a/launcher/textures_scanner.cpp +++ b/launcher/textures_scanner.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "textures_scanner.h" -#include "utilities.h" +#include "utilities/utilities.h" void ui::vehicles_bank::scan_textures() { diff --git a/launcher/vehicle_picker.cpp b/launcher/vehicle_picker.cpp index ac548f40..252993e4 100644 --- a/launcher/vehicle_picker.cpp +++ b/launcher/vehicle_picker.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "launcher/vehicle_picker.h" -#include "renderer.h" -#include "translation.h" +#include "rendering/renderer.h" +#include "utilities/translation.h" ui::vehiclepicker_panel::vehiclepicker_panel() : ui_panel(STR("Select vehicle"), false), placeholder_mini("textures/mini/other") diff --git a/launcher/vehicle_picker.h b/launcher/vehicle_picker.h index b44ffefe..ad6e6dc2 100644 --- a/launcher/vehicle_picker.h +++ b/launcher/vehicle_picker.h @@ -1,8 +1,8 @@ #pragma once -#include "uilayer.h" +#include "application/uilayer.h" #include "textures_scanner.h" -#include "translation.h" +#include "utilities/translation.h" namespace ui { diff --git a/model/AnimModel.cpp b/model/AnimModel.cpp index 4f0daba2..20fdd628 100644 --- a/model/AnimModel.cpp +++ b/model/AnimModel.cpp @@ -13,17 +13,17 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "AnimModel.h" +#include "model/AnimModel.h" -#include "renderer.h" -#include "MdlMngr.h" -#include "simulation.h" -#include "simulationtime.h" -#include "Event.h" -#include "Globals.h" -#include "Timer.h" -#include "Logs.h" -#include "renderer.h" +#include "rendering/renderer.h" +#include "model/MdlMngr.h" +#include "simulation/simulation.h" +#include "simulation/simulationtime.h" +#include "world/Event.h" +#include "utilities/Globals.h" +#include "utilities/Timer.h" +#include "utilities/Logs.h" +#include "rendering/renderer.h" std::list> TAnimModel::acAnimList; diff --git a/model/AnimModel.h b/model/AnimModel.h index e62685df..802cb21c 100644 --- a/model/AnimModel.h +++ b/model/AnimModel.h @@ -14,12 +14,12 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "Classes.h" -#include "dumb3d.h" -#include "Float3d.h" -#include "Model3d.h" -#include "DynObj.h" -#include "scenenode.h" +#include "utilities/Classes.h" +#include "utilities/dumb3d.h" +#include "utilities/Float3d.h" +#include "model/Model3d.h" +#include "vehicle/DynObj.h" +#include "scene/scenenode.h" const int iMaxNumLights = 8; float const DefaultDarkThresholdLevel { 0.325f }; diff --git a/model/MdlMngr.cpp b/model/MdlMngr.cpp index 2ee4073c..b0a7ba76 100644 --- a/model/MdlMngr.cpp +++ b/model/MdlMngr.cpp @@ -14,12 +14,12 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "MdlMngr.h" +#include "model/MdlMngr.h" -#include "Model3d.h" -#include "Globals.h" -#include "Logs.h" -#include "utilities.h" +#include "model/Model3d.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" +#include "utilities/utilities.h" // wczytanie modelu do kontenerka TModel3d * diff --git a/model/MdlMngr.h b/model/MdlMngr.h index 896dff42..94baf3d4 100644 --- a/model/MdlMngr.h +++ b/model/MdlMngr.h @@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/. */ #pragma once -#include "Classes.h" +#include "utilities/Classes.h" class TMdlContainer { friend class TModelsManager; diff --git a/model/Model3d.cpp b/model/Model3d.cpp index 4335f188..d4132f9e 100644 --- a/model/Model3d.cpp +++ b/model/Model3d.cpp @@ -13,17 +13,17 @@ Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others */ #include "stdafx.h" -#include "Model3d.h" +#include "model/Model3d.h" -#include "Globals.h" -#include "Logs.h" -#include "utilities.h" -#include "renderer.h" -#include "Timer.h" -#include "simulation.h" -#include "simulationtime.h" -#include "mtable.h" -#include "sn_utils.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" +#include "utilities/utilities.h" +#include "rendering/renderer.h" +#include "utilities/Timer.h" +#include "simulation/simulation.h" +#include "simulation/simulationtime.h" +#include "world/mtable.h" +#include "scene/sn_utils.h" //--------------------------------------------------------------------------- diff --git a/model/Model3d.h b/model/Model3d.h index b9ae7028..f6ba3298 100644 --- a/model/Model3d.h +++ b/model/Model3d.h @@ -9,11 +9,11 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "Classes.h" -#include "dumb3d.h" -#include "Float3d.h" -#include "geometrybank.h" -#include "material.h" +#include "utilities/Classes.h" +#include "utilities/dumb3d.h" +#include "utilities/Float3d.h" +#include "rendering/geometrybank.h" +#include "model/material.h" #include "gl/query.h" #define EU07_USE_GEOMETRYINDEXING diff --git a/model/ResourceManager.cpp b/model/ResourceManager.cpp index adbf4bf4..0d91f788 100644 --- a/model/ResourceManager.cpp +++ b/model/ResourceManager.cpp @@ -10,8 +10,8 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" /* -#include "ResourceManager.h" -#include "Logs.h" +#include "model/ResourceManager.h" +#include "utilities/Logs.h" ResourceManager::Resources ResourceManager::_resources; double ResourceManager::_expiry = 5.0f; diff --git a/model/Texture.cpp b/model/Texture.cpp index 4710c6f3..f4085edf 100644 --- a/model/Texture.cpp +++ b/model/Texture.cpp @@ -14,16 +14,16 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "Texture.h" +#include "model/Texture.h" -#include "application.h" -#include "dictionary.h" -#include "Globals.h" -#include "Logs.h" -#include "utilities.h" -#include "sn_utils.h" -#include "utilities.h" -#include "flip-s3tc.h" +#include "application/application.h" +#include "utilities/dictionary.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" +#include "utilities/utilities.h" +#include "scene/sn_utils.h" +#include "utilities/utilities.h" +#include "rendering/flip-s3tc.h" #include "stb/stb_image.h" //#include #include "dds-ktx/dds-ktx.h" diff --git a/model/Texture.h b/model/Texture.h index 6df64684..b402d64c 100644 --- a/model/Texture.h +++ b/model/Texture.h @@ -12,7 +12,7 @@ http://mozilla.org/MPL/2.0/. #include #include "winheaders.h" #include -#include "ResourceManager.h" +#include "model/ResourceManager.h" #include "gl/ubo.h" #include "interfaces/ITexture.h" diff --git a/model/material.cpp b/model/material.cpp index 253f09e6..99261338 100644 --- a/model/material.cpp +++ b/model/material.cpp @@ -9,14 +9,14 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" -#include "material.h" -#include "renderer.h" -#include "parser.h" -#include "utilities.h" -#include "Logs.h" -#include "sn_utils.h" -#include "Globals.h" -#include "Logs.h" +#include "model/material.h" +#include "rendering/renderer.h" +#include "utilities/parser.h" +#include "utilities/utilities.h" +#include "utilities/Logs.h" +#include "scene/sn_utils.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" opengl_material::path_data opengl_material::paths; diff --git a/model/material.h b/model/material.h index 226ffb67..6d3f2b8d 100644 --- a/model/material.h +++ b/model/material.h @@ -10,8 +10,8 @@ http://mozilla.org/MPL/2.0/. #pragma once #include "interfaces/IMaterial.h" -#include "Classes.h" -#include "Texture.h" +#include "utilities/Classes.h" +#include "model/Texture.h" #include "gl/shader.h" #include "gl/ubo.h" diff --git a/model/vertex.cpp b/model/vertex.cpp index badcab8e..41b655b5 100644 --- a/model/vertex.cpp +++ b/model/vertex.cpp @@ -8,8 +8,8 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "vertex.h" -#include "sn_utils.h" +#include "model/vertex.h" +#include "scene/sn_utils.h" void world_vertex::serialize( std::ostream &s ) const { diff --git a/model/vertex.h b/model/vertex.h index 91bf1ca0..28b63b69 100644 --- a/model/vertex.h +++ b/model/vertex.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "utilities.h" +#include "utilities/utilities.h" // geometry vertex with double precision position struct world_vertex { diff --git a/network/backend/asio.cpp b/network/backend/asio.cpp index f5d2d13d..958b084e 100644 --- a/network/backend/asio.cpp +++ b/network/backend/asio.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "network/backend/asio.h" -#include "sn_utils.h" -#include "Logs.h" +#include "scene/sn_utils.h" +#include "utilities/Logs.h" network::tcp::connection::connection(asio::io_context &io_ctx, bool client, size_t counter) : network::connection(client, counter), diff --git a/network/manager.cpp b/network/manager.cpp index 4f21b08e..37d72401 100644 --- a/network/manager.cpp +++ b/network/manager.cpp @@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "network/manager.h" -#include "simulation.h" -#include "Logs.h" +#include "simulation/simulation.h" +#include "utilities/Logs.h" network::server_manager::server_manager() { diff --git a/network/manager.h b/network/manager.h index a2ecd91d..572a8c6b 100644 --- a/network/manager.h +++ b/network/manager.h @@ -1,7 +1,7 @@ #pragma once #include #include "network/network.h" -#include "command.h" +#include "input/command.h" namespace network { diff --git a/network/message.cpp b/network/message.cpp index d26dd950..12609905 100644 --- a/network/message.cpp +++ b/network/message.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "network/message.h" -#include "sn_utils.h" +#include "scene/sn_utils.h" void network::client_hello::serialize(std::ostream &stream) const { diff --git a/network/message.h b/network/message.h index 4ddc0b40..43ad13ec 100644 --- a/network/message.h +++ b/network/message.h @@ -1,6 +1,6 @@ #pragma once #include "network/message.h" -#include "command.h" +#include "input/command.h" #include namespace network diff --git a/network/network.cpp b/network/network.cpp index 1f5a1f87..342db5a3 100644 --- a/network/network.cpp +++ b/network/network.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "network/network.h" #include "network/message.h" -#include "Logs.h" -#include "sn_utils.h" -#include "Timer.h" -#include "application.h" -#include "Globals.h" +#include "utilities/Logs.h" +#include "scene/sn_utils.h" +#include "utilities/Timer.h" +#include "application/application.h" +#include "utilities/Globals.h" std::uint32_t const EU07_NETWORK_VERSION = 2; diff --git a/network/network.h b/network/network.h index 787d3262..1ce802be 100644 --- a/network/network.h +++ b/network/network.h @@ -5,7 +5,7 @@ #include #include #include "network/message.h" -#include "command.h" +#include "input/command.h" namespace network { diff --git a/rendering/frustum.cpp b/rendering/frustum.cpp index a92f395f..afe16441 100644 --- a/rendering/frustum.cpp +++ b/rendering/frustum.cpp @@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "frustum.h" +#include "rendering/frustum.h" void cFrustum::calculate() { diff --git a/rendering/frustum.h b/rendering/frustum.h index b1f0ee83..eb1f8df6 100644 --- a/rendering/frustum.h +++ b/rendering/frustum.h @@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "Float3d.h" -#include "dumb3d.h" +#include "utilities/Float3d.h" +#include "utilities/dumb3d.h" inline std::vector const ndcfrustumshapepoints // { diff --git a/rendering/geometrybank.cpp b/rendering/geometrybank.cpp index 4371bb3f..137dfca2 100644 --- a/rendering/geometrybank.cpp +++ b/rendering/geometrybank.cpp @@ -8,12 +8,12 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "geometrybank.h" -#include "vertex.h" +#include "rendering/geometrybank.h" +#include "model/vertex.h" -#include "sn_utils.h" -#include "Logs.h" -#include "Globals.h" +#include "scene/sn_utils.h" +#include "utilities/Logs.h" +#include "utilities/Globals.h" namespace gfx { diff --git a/rendering/geometrybank.h b/rendering/geometrybank.h index e12d51ba..9828d578 100644 --- a/rendering/geometrybank.h +++ b/rendering/geometrybank.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "ResourceManager.h" +#include "model/ResourceManager.h" struct world_vertex; diff --git a/rendering/light.h b/rendering/light.h index f3d68e5f..246056d3 100644 --- a/rendering/light.h +++ b/rendering/light.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "color.h" +#include "utilities/color.h" // a simple light source, either omni- or directional struct basic_light { diff --git a/rendering/lightarray.cpp b/rendering/lightarray.cpp index 08e2af86..db6097f8 100644 --- a/rendering/lightarray.cpp +++ b/rendering/lightarray.cpp @@ -14,8 +14,8 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "lightarray.h" -#include "DynObj.h" +#include "rendering/lightarray.h" +#include "vehicle/DynObj.h" void light_array::insert( TDynamicObject const *Owner ) { diff --git a/rendering/lightarray.h b/rendering/lightarray.h index e826440f..670cbea8 100644 --- a/rendering/lightarray.h +++ b/rendering/lightarray.h @@ -1,6 +1,6 @@ #pragma once -#include "Classes.h" +#include "utilities/Classes.h" // collection of virtual light sources present in the scene // used by the renderer to determine most suitable placement for actual light sources during render diff --git a/rendering/nullrenderer.cpp b/rendering/nullrenderer.cpp index 452ce971..a37eddb9 100644 --- a/rendering/nullrenderer.cpp +++ b/rendering/nullrenderer.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "nullrenderer.h" +#include "rendering/nullrenderer.h" std::unique_ptr null_renderer::create_func() { diff --git a/rendering/nullrenderer.h b/rendering/nullrenderer.h index e67cdc59..69839f11 100644 --- a/rendering/nullrenderer.h +++ b/rendering/nullrenderer.h @@ -4,10 +4,10 @@ #pragma once -#include "Texture.h" -#include "geometrybank.h" -#include "material.h" -#include "renderer.h" +#include "model/Texture.h" +#include "rendering/geometrybank.h" +#include "model/material.h" +#include "rendering/renderer.h" #include "stdafx.h" #include #include diff --git a/rendering/opengl33geometrybank.cpp b/rendering/opengl33geometrybank.cpp index 63f0ef8c..28ad6b1b 100644 --- a/rendering/opengl33geometrybank.cpp +++ b/rendering/opengl33geometrybank.cpp @@ -8,9 +8,9 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "opengl33geometrybank.h" +#include "rendering/opengl33geometrybank.h" -#include "Logs.h" +#include "utilities/Logs.h" namespace gfx { diff --git a/rendering/opengl33geometrybank.h b/rendering/opengl33geometrybank.h index f6f8af0a..7dd54ba8 100644 --- a/rendering/opengl33geometrybank.h +++ b/rendering/opengl33geometrybank.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "geometrybank.h" +#include "rendering/geometrybank.h" #include "gl/buffer.h" #include "gl/vao.h" diff --git a/rendering/opengl33light.cpp b/rendering/opengl33light.cpp index 5be0cf98..ea1baf78 100644 --- a/rendering/opengl33light.cpp +++ b/rendering/opengl33light.cpp @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" -#include "opengl33light.h" +#include "rendering/opengl33light.h" void opengl33_light::apply_intensity(float const Factor) { diff --git a/rendering/opengl33light.h b/rendering/opengl33light.h index 6f363061..b87564aa 100644 --- a/rendering/opengl33light.h +++ b/rendering/opengl33light.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "light.h" +#include "rendering/light.h" struct opengl33_light : public basic_light { diff --git a/rendering/opengl33particles.cpp b/rendering/opengl33particles.cpp index b56d2e28..57f93ca4 100644 --- a/rendering/opengl33particles.cpp +++ b/rendering/opengl33particles.cpp @@ -8,12 +8,12 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "opengl33particles.h" +#include "rendering/opengl33particles.h" -#include "particles.h" -#include "openglcamera.h" -#include "simulation.h" -#include "simulationenvironment.h" +#include "rendering/particles.h" +#include "rendering/openglcamera.h" +#include "simulation/simulation.h" +#include "simulation/simulationenvironment.h" std::vector> const billboard_vertices { diff --git a/rendering/opengl33precipitation.cpp b/rendering/opengl33precipitation.cpp index 308ccec6..e31eb25f 100644 --- a/rendering/opengl33precipitation.cpp +++ b/rendering/opengl33precipitation.cpp @@ -8,11 +8,11 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "opengl33precipitation.h" +#include "rendering/opengl33precipitation.h" -#include "Globals.h" -#include "renderer.h" -#include "simulationenvironment.h" +#include "utilities/Globals.h" +#include "rendering/renderer.h" +#include "simulation/simulationenvironment.h" opengl33_precipitation::~opengl33_precipitation() { // TODO: release allocated resources diff --git a/rendering/opengl33precipitation.h b/rendering/opengl33precipitation.h index 0487bd60..9aab5ec5 100644 --- a/rendering/opengl33precipitation.h +++ b/rendering/opengl33precipitation.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "Texture.h" +#include "model/Texture.h" #include "gl/vao.h" #include "gl/shader.h" diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 6d728232..44a0c7a5 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -8,20 +8,20 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "opengl33renderer.h" -#include "color.h" -#include "Globals.h" -#include "Timer.h" -#include "Train.h" -#include "Camera.h" -#include "simulation.h" -#include "Logs.h" -#include "utilities.h" -#include "simulationtime.h" -#include "application.h" -#include "AnimModel.h" -#include "opengl33geometrybank.h" -#include "screenshot.h" +#include "rendering/opengl33renderer.h" +#include "utilities/color.h" +#include "utilities/Globals.h" +#include "utilities/Timer.h" +#include "vehicle/Train.h" +#include "vehicle/Camera.h" +#include "simulation/simulation.h" +#include "utilities/Logs.h" +#include "utilities/utilities.h" +#include "simulation/simulationtime.h" +#include "application/application.h" +#include "model/AnimModel.h" +#include "rendering/opengl33geometrybank.h" +#include "rendering/screenshot.h" #include //#define EU07_DEBUG_OPENGL diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index 021bef78..04ead7f0 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -9,16 +9,16 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "renderer.h" -#include "openglcamera.h" -#include "opengl33light.h" -#include "opengl33particles.h" -#include "opengl33skydome.h" -#include "opengl33precipitation.h" -#include "simulationenvironment.h" -#include "scene.h" -#include "MemCell.h" -#include "lightarray.h" +#include "rendering/renderer.h" +#include "rendering/openglcamera.h" +#include "rendering/opengl33light.h" +#include "rendering/opengl33particles.h" +#include "rendering/opengl33skydome.h" +#include "rendering/opengl33precipitation.h" +#include "simulation/simulationenvironment.h" +#include "scene/scene.h" +#include "world/MemCell.h" +#include "rendering/lightarray.h" #include "vr/vr_interface.h" #include "gl/ubo.h" #include "gl/framebuffer.h" diff --git a/rendering/opengl33skydome.cpp b/rendering/opengl33skydome.cpp index 2054a6d0..35e1d8c0 100644 --- a/rendering/opengl33skydome.cpp +++ b/rendering/opengl33skydome.cpp @@ -8,9 +8,9 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "opengl33skydome.h" +#include "rendering/opengl33skydome.h" -#include "simulationenvironment.h" +#include "simulation/simulationenvironment.h" void opengl33_skydome::update() { diff --git a/rendering/openglcamera.cpp b/rendering/openglcamera.cpp index f45134fe..97891e63 100644 --- a/rendering/openglcamera.cpp +++ b/rendering/openglcamera.cpp @@ -8,9 +8,9 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "openglcamera.h" +#include "rendering/openglcamera.h" -#include "DynObj.h" +#include "vehicle/DynObj.h" void opengl_camera::update_frustum( glm::mat4 const &Projection, glm::mat4 const &Modelview ) { diff --git a/rendering/openglcamera.h b/rendering/openglcamera.h index ed4c87a4..569a798c 100644 --- a/rendering/openglcamera.h +++ b/rendering/openglcamera.h @@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "frustum.h" -#include "scene.h" +#include "rendering/frustum.h" +#include "scene/scene.h" // simple camera object. paired with 'virtual camera' in the scene class opengl_camera { diff --git a/rendering/openglcolor.cpp b/rendering/openglcolor.cpp index cb427ec3..3ca8ad66 100644 --- a/rendering/openglcolor.cpp +++ b/rendering/openglcolor.cpp @@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "openglcolor.h" +#include "rendering/openglcolor.h" opengl_color OpenGLColor; diff --git a/rendering/openglcolor.h b/rendering/openglcolor.h index 3f7d4d8c..f6777bed 100644 --- a/rendering/openglcolor.h +++ b/rendering/openglcolor.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "Globals.h" +#include "utilities/Globals.h" // encapsulation of the fixed pipeline opengl color class opengl_color { diff --git a/rendering/openglgeometrybank.cpp b/rendering/openglgeometrybank.cpp index 43aeb0f3..ec950c0f 100644 --- a/rendering/openglgeometrybank.cpp +++ b/rendering/openglgeometrybank.cpp @@ -8,10 +8,10 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "openglgeometrybank.h" -#include "openglcolor.h" +#include "rendering/openglgeometrybank.h" +#include "rendering/openglcolor.h" -#include "Logs.h" +#include "utilities/Logs.h" namespace gfx { diff --git a/rendering/openglgeometrybank.h b/rendering/openglgeometrybank.h index 7e1d243c..ec6bdd89 100644 --- a/rendering/openglgeometrybank.h +++ b/rendering/openglgeometrybank.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "geometrybank.h" +#include "rendering/geometrybank.h" namespace gfx { diff --git a/rendering/opengllight.cpp b/rendering/opengllight.cpp index 7532d498..f29cc5fb 100644 --- a/rendering/opengllight.cpp +++ b/rendering/opengllight.cpp @@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" -#include "opengllight.h" -#include "utilities.h" +#include "rendering/opengllight.h" +#include "utilities/utilities.h" void opengl_light::apply_intensity( float const Factor ) { diff --git a/rendering/opengllight.h b/rendering/opengllight.h index 64880201..1fe71b9d 100644 --- a/rendering/opengllight.h +++ b/rendering/opengllight.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "light.h" +#include "rendering/light.h" struct opengl_light : public basic_light { diff --git a/rendering/openglparticles.cpp b/rendering/openglparticles.cpp index 4b4e0163..cdb0a66f 100644 --- a/rendering/openglparticles.cpp +++ b/rendering/openglparticles.cpp @@ -8,12 +8,12 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "openglparticles.h" +#include "rendering/openglparticles.h" -#include "particles.h" -#include "openglcamera.h" -#include "simulation.h" -#include "Logs.h" +#include "rendering/particles.h" +#include "rendering/openglcamera.h" +#include "simulation/simulation.h" +#include "utilities/Logs.h" std::vector> const billboard_vertices { diff --git a/rendering/openglprecipitation.cpp b/rendering/openglprecipitation.cpp index e06e1bc7..fc93b2a9 100644 --- a/rendering/openglprecipitation.cpp +++ b/rendering/openglprecipitation.cpp @@ -8,11 +8,11 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "openglprecipitation.h" +#include "rendering/openglprecipitation.h" -#include "Globals.h" -#include "renderer.h" -#include "simulationenvironment.h" +#include "utilities/Globals.h" +#include "rendering/renderer.h" +#include "simulation/simulationenvironment.h" opengl_precipitation::~opengl_precipitation() { diff --git a/rendering/openglprecipitation.h b/rendering/openglprecipitation.h index ced4fddf..a0bb2dcd 100644 --- a/rendering/openglprecipitation.h +++ b/rendering/openglprecipitation.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "Texture.h" +#include "model/Texture.h" class opengl_precipitation { diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp index 4c35946d..386a725e 100644 --- a/rendering/openglrenderer.cpp +++ b/rendering/openglrenderer.cpp @@ -8,24 +8,24 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "openglrenderer.h" +#include "rendering/openglrenderer.h" -#include "color.h" -#include "Globals.h" -#include "Camera.h" -#include "Timer.h" -#include "simulation.h" -#include "simulationtime.h" -#include "Train.h" -#include "DynObj.h" -#include "AnimModel.h" -#include "Traction.h" -#include "application.h" -#include "Logs.h" -#include "utilities.h" -#include "openglgeometrybank.h" -#include "openglcolor.h" -#include "screenshot.h" +#include "utilities/color.h" +#include "utilities/Globals.h" +#include "vehicle/Camera.h" +#include "utilities/Timer.h" +#include "simulation/simulation.h" +#include "simulation/simulationtime.h" +#include "vehicle/Train.h" +#include "vehicle/DynObj.h" +#include "model/AnimModel.h" +#include "world/Traction.h" +#include "application/application.h" +#include "utilities/Logs.h" +#include "utilities/utilities.h" +#include "rendering/openglgeometrybank.h" +#include "rendering/openglcolor.h" +#include "rendering/screenshot.h" #include int const EU07_PICKBUFFERSIZE { 1024 }; // size of (square) textures bound with the pick framebuffer diff --git a/rendering/openglrenderer.h b/rendering/openglrenderer.h index a055da12..aa01a805 100644 --- a/rendering/openglrenderer.h +++ b/rendering/openglrenderer.h @@ -9,16 +9,16 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "renderer.h" -#include "opengllight.h" -#include "openglcamera.h" -#include "openglparticles.h" -#include "openglskydome.h" -#include "openglprecipitation.h" -#include "lightarray.h" -#include "scene.h" -#include "simulationenvironment.h" -#include "MemCell.h" +#include "rendering/renderer.h" +#include "rendering/opengllight.h" +#include "rendering/openglcamera.h" +#include "rendering/openglparticles.h" +#include "rendering/openglskydome.h" +#include "rendering/openglprecipitation.h" +#include "rendering/lightarray.h" +#include "scene/scene.h" +#include "simulation/simulationenvironment.h" +#include "world/MemCell.h" #define EU07_USE_PICKING_FRAMEBUFFER //#define EU07_USE_DEBUG_SHADOWMAP diff --git a/rendering/openglskydome.cpp b/rendering/openglskydome.cpp index 6c2f7b09..1ff66548 100644 --- a/rendering/openglskydome.cpp +++ b/rendering/openglskydome.cpp @@ -8,9 +8,9 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "openglskydome.h" +#include "rendering/openglskydome.h" -#include "simulationenvironment.h" +#include "simulation/simulationenvironment.h" opengl_skydome::~opengl_skydome() { diff --git a/rendering/particles.cpp b/rendering/particles.cpp index 58bc2f22..9ec3839f 100644 --- a/rendering/particles.cpp +++ b/rendering/particles.cpp @@ -8,13 +8,13 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "particles.h" +#include "rendering/particles.h" -#include "Timer.h" -#include "Globals.h" -#include "AnimModel.h" -#include "simulationenvironment.h" -#include "Logs.h" +#include "utilities/Timer.h" +#include "utilities/Globals.h" +#include "model/AnimModel.h" +#include "simulation/simulationenvironment.h" +#include "utilities/Logs.h" void diff --git a/rendering/particles.h b/rendering/particles.h index cb1d6785..5ee44230 100644 --- a/rendering/particles.h +++ b/rendering/particles.h @@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "Classes.h" -#include "scene.h" +#include "utilities/Classes.h" +#include "scene/scene.h" // particle specialized for drawing smoke // given smoke features we can take certain shortcuts diff --git a/rendering/precipitation.cpp b/rendering/precipitation.cpp index d5968895..fdb4d3d1 100644 --- a/rendering/precipitation.cpp +++ b/rendering/precipitation.cpp @@ -8,12 +8,12 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "precipitation.h" +#include "rendering/precipitation.h" -#include "Globals.h" -#include "Timer.h" -#include "simulation.h" -#include "Train.h" +#include "utilities/Globals.h" +#include "utilities/Timer.h" +#include "simulation/simulation.h" +#include "vehicle/Train.h" basic_precipitation::~basic_precipitation() { // TODO: release allocated resources diff --git a/rendering/renderer.cpp b/rendering/renderer.cpp index 2dc24bdb..610473a3 100644 --- a/rendering/renderer.cpp +++ b/rendering/renderer.cpp @@ -8,8 +8,8 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "renderer.h" -#include "Logs.h" +#include "rendering/renderer.h" +#include "utilities/Logs.h" std::unique_ptr GfxRenderer; diff --git a/rendering/renderer.h b/rendering/renderer.h index e30ac645..89eb7c80 100644 --- a/rendering/renderer.h +++ b/rendering/renderer.h @@ -9,10 +9,10 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "geometrybank.h" +#include "rendering/geometrybank.h" #include "interfaces/IMaterial.h" #include "interfaces/ITexture.h" -#include "Globals.h" +#include "utilities/Globals.h" struct lighting_data; diff --git a/rendering/screenshot.cpp b/rendering/screenshot.cpp index 1685f64a..285679b7 100644 --- a/rendering/screenshot.cpp +++ b/rendering/screenshot.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "screenshot.h" -#include "Globals.h" -#include "Logs.h" +#include "rendering/screenshot.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" #include void screenshot_manager::screenshot_save_thread( char *img, int w, int h ) diff --git a/scene/scene.cpp b/scene/scene.cpp index 896e1987..d147f0d7 100644 --- a/scene/scene.cpp +++ b/scene/scene.cpp @@ -8,18 +8,18 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "scene.h" +#include "scene/scene.h" -#include "simulation.h" -#include "Globals.h" -#include "Camera.h" -#include "AnimModel.h" -#include "Event.h" -#include "EvLaunch.h" -#include "Timer.h" -#include "Logs.h" -#include "sn_utils.h" -#include "renderer.h" +#include "simulation/simulation.h" +#include "utilities/Globals.h" +#include "vehicle/Camera.h" +#include "model/AnimModel.h" +#include "world/Event.h" +#include "world/EvLaunch.h" +#include "utilities/Timer.h" +#include "utilities/Logs.h" +#include "scene/sn_utils.h" +#include "rendering/renderer.h" #include "widgets/map_objects.h" namespace scene { diff --git a/scene/scene.h b/scene/scene.h index dd430eaf..df641d02 100644 --- a/scene/scene.h +++ b/scene/scene.h @@ -16,13 +16,13 @@ http://mozilla.org/MPL/2.0/. #include #include -#include "parser.h" -#include "geometrybank.h" -#include "scenenode.h" -#include "Track.h" -#include "Traction.h" -#include "sound.h" -#include "command.h" +#include "utilities/parser.h" +#include "rendering/geometrybank.h" +#include "scene/scenenode.h" +#include "world/Track.h" +#include "world/Traction.h" +#include "audio/sound.h" +#include "input/command.h" class opengl_renderer; class opengl33_renderer; diff --git a/scene/sceneeditor.cpp b/scene/sceneeditor.cpp index 6c6c0420..792de5a1 100644 --- a/scene/sceneeditor.cpp +++ b/scene/sceneeditor.cpp @@ -8,16 +8,16 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "sceneeditor.h" -#include "scenenodegroups.h" +#include "scene/sceneeditor.h" +#include "scene/scenenodegroups.h" -#include "Globals.h" -#include "application.h" -#include "simulation.h" -#include "MemCell.h" -#include "Camera.h" -#include "AnimModel.h" -#include "renderer.h" +#include "utilities/Globals.h" +#include "application/application.h" +#include "simulation/simulation.h" +#include "world/MemCell.h" +#include "vehicle/Camera.h" +#include "model/AnimModel.h" +#include "rendering/renderer.h" namespace scene { diff --git a/scene/sceneeditor.h b/scene/sceneeditor.h index 75e0ff6c..8b0344ee 100644 --- a/scene/sceneeditor.h +++ b/scene/sceneeditor.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "scenenode.h" +#include "scene/scenenode.h" namespace scene { diff --git a/scene/scenenode.cpp b/scene/scenenode.cpp index 1ad0d021..38fe7f02 100644 --- a/scene/scenenode.cpp +++ b/scene/scenenode.cpp @@ -8,13 +8,13 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "scenenode.h" +#include "scene/scenenode.h" -#include "Model3d.h" -#include "renderer.h" -#include "parser.h" -#include "Logs.h" -#include "sn_utils.h" +#include "model/Model3d.h" +#include "rendering/renderer.h" +#include "utilities/parser.h" +#include "utilities/Logs.h" +#include "scene/sn_utils.h" // stores content of the struct in provided output stream void diff --git a/scene/scenenode.h b/scene/scenenode.h index 89598280..fb0959a7 100644 --- a/scene/scenenode.h +++ b/scene/scenenode.h @@ -11,10 +11,10 @@ http://mozilla.org/MPL/2.0/. #include -#include "Classes.h" -#include "material.h" -#include "vertex.h" -#include "geometrybank.h" +#include "utilities/Classes.h" +#include "model/material.h" +#include "model/vertex.h" +#include "rendering/geometrybank.h" #include "utils/uuid.hpp" struct lighting_data { diff --git a/scene/scenenodegroups.cpp b/scene/scenenodegroups.cpp index 6ce84a12..4ee1f0e4 100644 --- a/scene/scenenodegroups.cpp +++ b/scene/scenenodegroups.cpp @@ -8,12 +8,12 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "scenenodegroups.h" +#include "scene/scenenodegroups.h" -#include "Event.h" -#include "MemCell.h" +#include "world/Event.h" +#include "world/MemCell.h" -#include "AnimModel.h" +#include "model/AnimModel.h" #include "widgets/map_objects.h" namespace scene { diff --git a/scene/scenenodegroups.h b/scene/scenenodegroups.h index d3fa36ad..350fa3d3 100644 --- a/scene/scenenodegroups.h +++ b/scene/scenenodegroups.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "scenenode.h" +#include "scene/scenenode.h" #include "widgets/map_objects.h" namespace scene { diff --git a/scene/sn_utils.cpp b/scene/sn_utils.cpp index 56b18ff9..292c18c3 100644 --- a/scene/sn_utils.cpp +++ b/scene/sn_utils.cpp @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "sn_utils.h" +#include "scene/sn_utils.h" // sanity checks static_assert(std::numeric_limits::is_iec559, "IEEE754 required"); diff --git a/scripting/PyInt.cpp b/scripting/PyInt.cpp index d3efbca6..7504e96b 100644 --- a/scripting/PyInt.cpp +++ b/scripting/PyInt.cpp @@ -8,12 +8,12 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "PyInt.h" +#include "scripting/PyInt.h" -#include "dictionary.h" -#include "application.h" -#include "Logs.h" -#include "Globals.h" +#include "utilities/dictionary.h" +#include "application/application.h" +#include "utilities/Logs.h" +#include "utilities/Globals.h" #ifdef __GNUC__ #pragma GCC diagnostic ignored "-Wwrite-strings" diff --git a/scripting/PyInt.h b/scripting/PyInt.h index 70341227..eb2f423a 100644 --- a/scripting/PyInt.h +++ b/scripting/PyInt.h @@ -47,9 +47,9 @@ http://mozilla.org/MPL/2.0/. #pragma warning(pop) #endif -#include "Classes.h" -#include "utilities.h" -#include "Texture.h" +#include "utilities/Classes.h" +#include "utilities/utilities.h" +#include "model/Texture.h" #include #define PyGetFloat(param) PyFloat_FromDouble(param) diff --git a/scripting/PyIntStub.cpp b/scripting/PyIntStub.cpp index d19290b1..767228e4 100644 --- a/scripting/PyIntStub.cpp +++ b/scripting/PyIntStub.cpp @@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "PyInt.h" +#include "scripting/PyInt.h" bool python_taskqueue::init() { diff --git a/scripting/ladderlogic.cpp b/scripting/ladderlogic.cpp index 62fff1b1..56699818 100644 --- a/scripting/ladderlogic.cpp +++ b/scripting/ladderlogic.cpp @@ -8,11 +8,11 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "ladderlogic.h" +#include "scripting/ladderlogic.h" -#include "parser.h" -#include "utilities.h" -#include "Logs.h" +#include "utilities/parser.h" +#include "utilities/utilities.h" +#include "utilities/Logs.h" namespace plc { diff --git a/scripting/ladderlogic.h b/scripting/ladderlogic.h index 2ec9f144..f05afa76 100644 --- a/scripting/ladderlogic.h +++ b/scripting/ladderlogic.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "Classes.h" +#include "utilities/Classes.h" namespace plc { diff --git a/scripting/lua.cpp b/scripting/lua.cpp index ede8e197..c6585e76 100644 --- a/scripting/lua.cpp +++ b/scripting/lua.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "lua.h" -#include "Event.h" -#include "Logs.h" -#include "MemCell.h" -#include "Driver.h" -#include "lua_ffi.h" -#include "simulation.h" +#include "scripting/lua.h" +#include "world/Event.h" +#include "utilities/Logs.h" +#include "world/MemCell.h" +#include "vehicle/Driver.h" +#include "scripting/lua_ffi.h" +#include "simulation/simulation.h" lua::lua() { diff --git a/scripting/pythonscreenviewer.cpp b/scripting/pythonscreenviewer.cpp index 9d323397..fa15e9fa 100644 --- a/scripting/pythonscreenviewer.cpp +++ b/scripting/pythonscreenviewer.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "pythonscreenviewer.h" -#include "application.h" +#include "scripting/pythonscreenviewer.h" +#include "application/application.h" #include "gl/shader.h" #include "gl/vao.h" -#include "Logs.h" +#include "utilities/Logs.h" void texture_window_resize(GLFWwindow *win, int w, int h) { diff --git a/scripting/pythonscreenviewer.h b/scripting/pythonscreenviewer.h index 1c16d5e5..bd0634c3 100644 --- a/scripting/pythonscreenviewer.h +++ b/scripting/pythonscreenviewer.h @@ -1,5 +1,5 @@ -#include "renderer.h" -#include "PyInt.h" +#include "rendering/renderer.h" +#include "scripting/PyInt.h" #include class python_screen_viewer diff --git a/simulation/simulation.cpp b/simulation/simulation.cpp index b40782c1..390970df 100644 --- a/simulation/simulation.cpp +++ b/simulation/simulation.cpp @@ -8,26 +8,26 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "simulation.h" -#include "simulationtime.h" -#include "simulationenvironment.h" +#include "simulation/simulation.h" +#include "simulation/simulationtime.h" +#include "simulation/simulationenvironment.h" -#include "Globals.h" -#include "Event.h" -#include "MemCell.h" -#include "Track.h" -#include "Traction.h" -#include "TractionPower.h" -#include "sound.h" -#include "AnimModel.h" -#include "DynObj.h" -#include "lightarray.h" -#include "particles.h" -#include "scene.h" -#include "Train.h" -#include "application.h" -#include "Logs.h" -#include "Driver.h" +#include "utilities/Globals.h" +#include "world/Event.h" +#include "world/MemCell.h" +#include "world/Track.h" +#include "world/Traction.h" +#include "world/TractionPower.h" +#include "audio/sound.h" +#include "model/AnimModel.h" +#include "vehicle/DynObj.h" +#include "rendering/lightarray.h" +#include "rendering/particles.h" +#include "scene/scene.h" +#include "vehicle/Train.h" +#include "application/application.h" +#include "utilities/Logs.h" +#include "vehicle/Driver.h" namespace simulation { diff --git a/simulation/simulation.h b/simulation/simulation.h index 6cc8ea53..09ea4d42 100644 --- a/simulation/simulation.h +++ b/simulation/simulation.h @@ -9,14 +9,14 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "simulationstateserializer.h" -#include "Classes.h" -#include "Event.h" -#include "Train.h" -#include "particles.h" +#include "simulation/simulationstateserializer.h" +#include "utilities/Classes.h" +#include "world/Event.h" +#include "vehicle/Train.h" +#include "rendering/particles.h" #ifdef WITH_LUA -#include "lua.h" +#include "scripting/lua.h" #endif namespace simulation { diff --git a/simulation/simulationenvironment.cpp b/simulation/simulationenvironment.cpp index 0006899f..e7bae9ca 100644 --- a/simulation/simulationenvironment.cpp +++ b/simulation/simulationenvironment.cpp @@ -8,11 +8,11 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "simulationenvironment.h" +#include "simulation/simulationenvironment.h" -#include "simulationsounds.h" -#include "Globals.h" -#include "Timer.h" +#include "simulation/simulationsounds.h" +#include "utilities/Globals.h" +#include "utilities/Timer.h" namespace simulation { diff --git a/simulation/simulationenvironment.h b/simulation/simulationenvironment.h index 3f0759e7..f4114d53 100644 --- a/simulation/simulationenvironment.h +++ b/simulation/simulationenvironment.h @@ -9,13 +9,13 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "sky.h" -#include "sun.h" -#include "moon.h" -#include "stars.h" -#include "skydome.h" -#include "precipitation.h" -#include "sound.h" +#include "environment/sky.h" +#include "environment/sun.h" +#include "environment/moon.h" +#include "environment/stars.h" +#include "environment/skydome.h" +#include "rendering/precipitation.h" +#include "audio/sound.h" class opengl_renderer; class opengl33_renderer; diff --git a/simulation/simulationsounds.cpp b/simulation/simulationsounds.cpp index 16703726..43005589 100644 --- a/simulation/simulationsounds.cpp +++ b/simulation/simulationsounds.cpp @@ -8,9 +8,9 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "simulationsounds.h" +#include "simulation/simulationsounds.h" -#include "utilities.h" +#include "utilities/utilities.h" namespace simulation { diff --git a/simulation/simulationsounds.h b/simulation/simulationsounds.h index f3c2717f..b1ef7bbd 100644 --- a/simulation/simulationsounds.h +++ b/simulation/simulationsounds.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "sound.h" +#include "audio/sound.h" namespace simulation { diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index b7274691..cbd7dd53 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -8,25 +8,25 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "simulationstateserializer.h" +#include "simulation/simulationstateserializer.h" -#include "Globals.h" -#include "simulation.h" -#include "simulationtime.h" -#include "simulationsounds.h" -#include "simulationenvironment.h" -#include "scenenodegroups.h" -#include "particles.h" -#include "Event.h" -#include "MemCell.h" -#include "Driver.h" -#include "DynObj.h" -#include "AnimModel.h" -#include "lightarray.h" -#include "TractionPower.h" -#include "application.h" -#include "renderer.h" -#include "Logs.h" +#include "utilities/Globals.h" +#include "simulation/simulation.h" +#include "simulation/simulationtime.h" +#include "simulation/simulationsounds.h" +#include "simulation/simulationenvironment.h" +#include "scene/scenenodegroups.h" +#include "rendering/particles.h" +#include "world/Event.h" +#include "world/MemCell.h" +#include "vehicle/Driver.h" +#include "vehicle/DynObj.h" +#include "model/AnimModel.h" +#include "rendering/lightarray.h" +#include "world/TractionPower.h" +#include "application/application.h" +#include "rendering/renderer.h" +#include "utilities/Logs.h" namespace simulation { diff --git a/simulation/simulationstateserializer.h b/simulation/simulationstateserializer.h index 67ba7ad8..fb0dd4ed 100644 --- a/simulation/simulationstateserializer.h +++ b/simulation/simulationstateserializer.h @@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "parser.h" -#include "scene.h" +#include "utilities/parser.h" +#include "scene/scene.h" namespace simulation { diff --git a/simulation/simulationtime.cpp b/simulation/simulationtime.cpp index 70230b95..0a0c5711 100644 --- a/simulation/simulationtime.cpp +++ b/simulation/simulationtime.cpp @@ -8,10 +8,10 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "simulationtime.h" +#include "simulation/simulationtime.h" -#include "Globals.h" -#include "utilities.h" +#include "utilities/Globals.h" +#include "utilities/utilities.h" namespace simulation { diff --git a/stdafx.h b/stdafx.h index 36f1c19d..8138b138 100644 --- a/stdafx.h +++ b/stdafx.h @@ -107,7 +107,7 @@ -#include "openglmatrixstack.h" +#include "rendering/openglmatrixstack.h" #define STRINGIZE_DETAIL(x) #x #define STRINGIZE(x) STRINGIZE_DETAIL(x) #define glDebug(x) if (GLAD_GL_GREMEDY_string_marker) glStringMarkerGREMEDY(0, __FILE__ ":" STRINGIZE(__LINE__) ": " x); @@ -115,6 +115,6 @@ #include "imgui/imgui.h" #define ImVec2S(a, b) ImVec2(a * Global.ui_scale, b * Global.ui_scale) -#include "crashreporter.h" +#include "utilities/crashreporter.h" #endif \ No newline at end of file diff --git a/utilities/Float3d.cpp b/utilities/Float3d.cpp index de7c66fc..29a63456 100644 --- a/utilities/Float3d.cpp +++ b/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" //--------------------------------------------------------------------------- diff --git a/utilities/Globals.cpp b/utilities/Globals.cpp index c2d6b096..241d8c2f 100644 --- a/utilities/Globals.cpp +++ b/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 diff --git a/utilities/Globals.h b/utilities/Globals.h index e4833c51..fc5a4f8f 100644 --- a/utilities/Globals.h +++ b/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 #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 { diff --git a/utilities/Logs.cpp b/utilities/Logs.cpp index d8610dcc..b6a09a8d 100644 --- a/utilities/Logs.cpp +++ b/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 std::ofstream output; // standardowy "log.txt", można go wyÅ‚Ä…czyć diff --git a/utilities/Timer.cpp b/utilities/Timer.cpp index 2e0e2b43..5cc9f93a 100644 --- a/utilities/Timer.cpp +++ b/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 { diff --git a/utilities/dictionary.cpp b/utilities/dictionary.cpp index b33b89da..244b5a51 100644 --- a/utilities/dictionary.cpp +++ b/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 ) { diff --git a/utilities/dumb3d.cpp b/utilities/dumb3d.cpp index 187777ee..7eb28abc 100644 --- a/utilities/dumb3d.cpp +++ b/utilities/dumb3d.cpp @@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "dumb3d.h" +#include "utilities/dumb3d.h" #include namespace Math3D diff --git a/utilities/headtrack.cpp b/utilities/headtrack.cpp index c60910d1..caf62bee 100644 --- a/utilities/headtrack.cpp +++ b/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() { diff --git a/utilities/motiontelemetry.cpp b/utilities/motiontelemetry.cpp index ead7bf25..c7f690f8 100644 --- a/utilities/motiontelemetry.cpp +++ b/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 diff --git a/utilities/parser.cpp b/utilities/parser.cpp index 81bbccec..9631ebb9 100644 --- a/utilities/parser.cpp +++ b/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 diff --git a/utilities/translation.cpp b/utilities/translation.cpp index 840d1a0b..ddf8c031 100644 --- a/utilities/translation.cpp +++ b/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() diff --git a/utilities/uart.cpp b/utilities/uart.cpp index ad26b15a..525453bf 100644 --- a/utilities/uart.cpp +++ b/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", diff --git a/utilities/uart.h b/utilities/uart.h index 78c6d194..a418dc22 100644 --- a/utilities/uart.h +++ b/utilities/uart.h @@ -1,7 +1,7 @@ #pragma once #include -#include "command.h" +#include "input/command.h" extern const char* uart_baudrates_list[]; extern const size_t uart_baudrates_list_num; diff --git a/utilities/utilities.cpp b/utilities/utilities.cpp index 917fef05..7d4cfd6d 100644 --- a/utilities/utilities.cpp +++ b/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; diff --git a/utilities/utilities.h b/utilities/utilities.h index 1a072e7d..0844b085 100644 --- a/utilities/utilities.h +++ b/utilities/utilities.h @@ -16,7 +16,7 @@ http://mozilla.org/MPL/2.0/. #include #include #include -#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*/ diff --git a/vehicle/AirCoupler.cpp b/vehicle/AirCoupler.cpp index 70e1c3e8..cf452edf 100644 --- 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() { diff --git a/vehicle/AirCoupler.h b/vehicle/AirCoupler.h index 8d303568..77f91f4c 100644 --- 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 { diff --git a/vehicle/Button.cpp b/vehicle/Button.cpp index 7eabef7b..6649a4de 100644 --- 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) { diff --git a/vehicle/Button.h b/vehicle/Button.h index 80f365e0..5e43056f 100644 --- 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 { diff --git a/vehicle/Camera.cpp b/vehicle/Camera.cpp index 6b46fa6c..cff526d3 100644 --- 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" //--------------------------------------------------------------------------- diff --git a/vehicle/Camera.h b/vehicle/Camera.h index dce04079..ee5a259c 100644 --- 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" //--------------------------------------------------------------------------- diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index e350979f..ae6b256d 100644 --- 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 diff --git a/vehicle/Driver.h b/vehicle/Driver.h index b0da06f3..554ffc87 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -10,13 +10,13 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#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; diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index 3120277c..63e6940d 100644 --- 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) diff --git a/vehicle/DynObj.h b/vehicle/DynObj.h index 1f6c8c75..70748d69 100644 --- a/vehicle/DynObj.h +++ b/vehicle/DynObj.h @@ -12,15 +12,15 @@ http://mozilla.org/MPL/2.0/. #include #include -#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 diff --git a/vehicle/Gauge.cpp b/vehicle/Gauge.cpp index 71f78d32..cf5c2c98 100644 --- 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 ) diff --git a/vehicle/Gauge.h b/vehicle/Gauge.h index 1bc3fdf8..c8302666 100644 --- 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 diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 1fdaec8f..50fdb489 100644 --- 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 /* namespace input { diff --git a/vehicle/Train.h b/vehicle/Train.h index 7ea49776..2831e825 100644 --- a/vehicle/Train.h +++ b/vehicle/Train.h @@ -10,15 +10,15 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#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 diff --git a/vr/openvr_imp.cpp b/vr/openvr_imp.cpp index a2d295d2..5e09547c 100644 --- a/vr/openvr_imp.cpp +++ b/vr/openvr_imp.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "openvr_imp.h" -#include "Logs.h" -#include "Globals.h" -#include "renderer.h" -#include "simulation.h" -#include "application.h" +#include "utilities/Logs.h" +#include "utilities/Globals.h" +#include "rendering/renderer.h" +#include "simulation/simulation.h" +#include "application/application.h" vr_openvr::vr_openvr() { diff --git a/vr/vr_interface.cpp b/vr/vr_interface.cpp index b789bc44..9f9ff4e4 100644 --- a/vr/vr_interface.cpp +++ b/vr/vr_interface.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "vr_interface.h" -#include "Logs.h" +#include "utilities/Logs.h" vr_interface::~vr_interface() {} diff --git a/vr/vr_interface.h b/vr/vr_interface.h index e9d15cb3..ccfa4510 100644 --- a/vr/vr_interface.h +++ b/vr/vr_interface.h @@ -1,7 +1,7 @@ #pragma once -#include "Camera.h" -#include "Model3d.h" -#include "Texture.h" +#include "vehicle/Camera.h" +#include "model/Model3d.h" +#include "model/Texture.h" class vr_interface { diff --git a/widgets/cameraview_extcam.cpp b/widgets/cameraview_extcam.cpp index ce2dc35c..1328b485 100644 --- a/widgets/cameraview_extcam.cpp +++ b/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() diff --git a/widgets/cameraview_extcam.h b/widgets/cameraview_extcam.h index 362bd065..520fcdda 100644 --- a/widgets/cameraview_extcam.h +++ b/widgets/cameraview_extcam.h @@ -5,7 +5,7 @@ #pragma once #include "stdafx.h" -#include "uilayer.h" +#include "application/uilayer.h" namespace ui { diff --git a/widgets/map.cpp b/widgets/map.cpp index b841bcb0..297c0351 100644 --- a/widgets/map.cpp +++ b/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) { diff --git a/widgets/map.h b/widgets/map.h index f6c670e2..9cb8a064 100644 --- a/widgets/map.h +++ b/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 diff --git a/widgets/map_objects.cpp b/widgets/map_objects.cpp index b6d47bcb..4ed6c98a 100644 --- a/widgets/map_objects.cpp +++ b/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; diff --git a/widgets/map_objects.h b/widgets/map_objects.h index 44deb371..f5d07ebf 100644 --- a/widgets/map_objects.h +++ b/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 { diff --git a/widgets/perfgraphs.cpp b/widgets/perfgraphs.cpp index 5d37a332..574cc7ef 100644 --- a/widgets/perfgraphs.cpp +++ b/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) {} diff --git a/widgets/perfgraphs.h b/widgets/perfgraphs.h index 302a2e12..d3ddb3c6 100644 --- a/widgets/perfgraphs.h +++ b/widgets/perfgraphs.h @@ -1,4 +1,4 @@ -#include "uilayer.h" +#include "application/uilayer.h" class perfgraph_panel : public ui_panel { diff --git a/widgets/time.cpp b/widgets/time.cpp index e19fb589..191e4b16 100644 --- a/widgets/time.cpp +++ b/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) { diff --git a/widgets/time.h b/widgets/time.h index 92928ca4..748093ea 100644 --- a/widgets/time.h +++ b/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 { diff --git a/widgets/trainingcard.cpp b/widgets/trainingcard.cpp index 81bce900..d4d11e5b 100644 --- a/widgets/trainingcard.cpp +++ b/widgets/trainingcard.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "widgets/trainingcard.h" -#include "simulation.h" +#include "simulation/simulation.h" #ifdef __linux__ #include diff --git a/widgets/trainingcard.h b/widgets/trainingcard.h index 5fcbf8bd..9e4eafe9 100644 --- a/widgets/trainingcard.h +++ b/widgets/trainingcard.h @@ -1,4 +1,4 @@ -#include "uilayer.h" +#include "application/uilayer.h" class trainingcard_panel : public ui_panel { diff --git a/widgets/vehiclelist.cpp b/widgets/vehiclelist.cpp index d38ae2f5..e8ee1e12 100644 --- a/widgets/vehiclelist.cpp +++ b/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) diff --git a/widgets/vehiclelist.h b/widgets/vehiclelist.h index fe42a207..b1dd509a 100644 --- a/widgets/vehiclelist.h +++ b/widgets/vehiclelist.h @@ -1,4 +1,4 @@ -#include "uilayer.h" +#include "application/uilayer.h" namespace ui { diff --git a/widgets/vehicleparams.cpp b/widgets/vehicleparams.cpp index dbefb4b1..51ad7a07 100644 --- a/widgets/vehicleparams.cpp +++ b/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) { diff --git a/widgets/vehicleparams.h b/widgets/vehicleparams.h index 732ebe32..787e1e81 100644 --- a/widgets/vehicleparams.h +++ b/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 { diff --git a/windows.cpp b/windows.cpp index a919d848..df036435 100644 --- a/windows.cpp +++ b/windows.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "messaging.h" -#include "utilities.h" +#include "input/messaging.h" +#include "utilities/utilities.h" #pragma warning (disable: 4091) diff --git a/world/EvLaunch.cpp b/world/EvLaunch.cpp index 5e88567e..a59af9d1 100644 --- a/world/EvLaunch.cpp +++ b/world/EvLaunch.cpp @@ -14,17 +14,17 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "EvLaunch.h" +#include "world/EvLaunch.h" -#include "Globals.h" -#include "Logs.h" -#include "Event.h" -#include "MemCell.h" -#include "Timer.h" -#include "parser.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" +#include "world/Event.h" +#include "world/MemCell.h" +#include "utilities/Timer.h" +#include "utilities/parser.h" #include "Console.h" -#include "simulationtime.h" -#include "utilities.h" +#include "simulation/simulationtime.h" +#include "utilities/utilities.h" //--------------------------------------------------------------------------- diff --git a/world/EvLaunch.h b/world/EvLaunch.h index 15b18515..a38e9e4a 100644 --- a/world/EvLaunch.h +++ b/world/EvLaunch.h @@ -11,8 +11,8 @@ http://mozilla.org/MPL/2.0/. #include -#include "Classes.h" -#include "scenenode.h" +#include "utilities/Classes.h" +#include "scene/scenenode.h" // radio-transmitted event launch messages enum radio_message { diff --git a/world/Event.cpp b/world/Event.cpp index 03a8780e..015ad7b2 100644 --- a/world/Event.cpp +++ b/world/Event.cpp @@ -14,24 +14,24 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "Event.h" +#include "world/Event.h" -#include "simulation.h" -#include "simulationtime.h" -#include "simulationsounds.h" -#include "messaging.h" -#include "Globals.h" -#include "MemCell.h" -#include "Track.h" -#include "Traction.h" -#include "TractionPower.h" -#include "sound.h" -#include "AnimModel.h" -#include "DynObj.h" -#include "Driver.h" -#include "renderer.h" -#include "Timer.h" -#include "Logs.h" +#include "simulation/simulation.h" +#include "simulation/simulationtime.h" +#include "simulation/simulationsounds.h" +#include "input/messaging.h" +#include "utilities/Globals.h" +#include "world/MemCell.h" +#include "world/Track.h" +#include "world/Traction.h" +#include "world/TractionPower.h" +#include "audio/sound.h" +#include "model/AnimModel.h" +#include "vehicle/DynObj.h" +#include "vehicle/Driver.h" +#include "rendering/renderer.h" +#include "utilities/Timer.h" +#include "utilities/Logs.h" #include "widgets/map_objects.h" void diff --git a/world/Event.h b/world/Event.h index 44a9c40d..2f67d8bb 100644 --- a/world/Event.h +++ b/world/Event.h @@ -9,16 +9,16 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "Classes.h" -#include "scene.h" -#include "Names.h" -#include "EvLaunch.h" -#include "Logs.h" -#include "command.h" -#include "comparison.h" +#include "utilities/Classes.h" +#include "scene/scene.h" +#include "utilities/Names.h" +#include "world/EvLaunch.h" +#include "utilities/Logs.h" +#include "input/command.h" +#include "utilities/comparison.h" #ifdef WITH_LUA -#include "lua.h" +#include "scripting/lua.h" #endif // common event interface diff --git a/world/MemCell.cpp b/world/MemCell.cpp index 751543fb..a5e79ce0 100644 --- a/world/MemCell.cpp +++ b/world/MemCell.cpp @@ -14,12 +14,12 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "MemCell.h" +#include "world/MemCell.h" -#include "simulation.h" -#include "Driver.h" -#include "Event.h" -#include "Logs.h" +#include "simulation/simulation.h" +#include "vehicle/Driver.h" +#include "world/Event.h" +#include "utilities/Logs.h" //--------------------------------------------------------------------------- diff --git a/world/MemCell.h b/world/MemCell.h index e3671bbf..c2960f27 100644 --- a/world/MemCell.h +++ b/world/MemCell.h @@ -9,10 +9,10 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "Classes.h" -#include "scenenode.h" -#include "Names.h" -#include "comparison.h" +#include "utilities/Classes.h" +#include "scene/scenenode.h" +#include "utilities/Names.h" +#include "utilities/comparison.h" class TMemCell : public scene::basic_node { diff --git a/world/Segment.cpp b/world/Segment.cpp index a277b7a6..8e31ac8a 100644 --- a/world/Segment.cpp +++ b/world/Segment.cpp @@ -8,14 +8,14 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "Segment.h" +#include "world/Segment.h" -#include "Globals.h" -#include "Logs.h" -#include "parser.h" -#include "utilities.h" -#include "Track.h" -#include "renderer.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" +#include "utilities/parser.h" +#include "utilities/utilities.h" +#include "world/Track.h" +#include "rendering/renderer.h" void segment_data::deserialize( cParser &Input, glm::dvec3 const &Offset ) { diff --git a/world/Segment.h b/world/Segment.h index d9b06575..3e1b64c1 100644 --- a/world/Segment.h +++ b/world/Segment.h @@ -9,10 +9,10 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "Classes.h" -#include "dumb3d.h" -#include "geometrybank.h" -#include "utilities.h" +#include "utilities/Classes.h" +#include "utilities/dumb3d.h" +#include "rendering/geometrybank.h" +#include "utilities/utilities.h" struct map_colored_paths { std::vector switches; diff --git a/world/Spring.cpp b/world/Spring.cpp index 59e5c55d..05ec3a9b 100644 --- a/world/Spring.cpp +++ b/world/Spring.cpp @@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "Spring.h" +#include "world/Spring.h" void TSpring::Init(double nKs, double nKd) { Ks = nKs; diff --git a/world/Spring.h b/world/Spring.h index 761bff53..d527041d 100644 --- a/world/Spring.h +++ b/world/Spring.h @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #ifndef ParticlesH #define ParticlesH -#include "dumb3d.h" +#include "utilities/dumb3d.h" /* #define STATIC_THRESHOLD 0.17f const double m_Kd = 0.02f; // DAMPING FACTOR diff --git a/world/Track.cpp b/world/Track.cpp index 9bd3a49a..f1fb356b 100644 --- a/world/Track.cpp +++ b/world/Track.cpp @@ -14,20 +14,20 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" -#include "Track.h" -#include "simulation.h" -#include "Globals.h" -#include "Event.h" -#include "MemCell.h" -#include "messaging.h" -#include "DynObj.h" -#include "Driver.h" -#include "AnimModel.h" -#include "Track.h" -#include "Timer.h" -#include "Logs.h" -#include "renderer.h" -#include "utilities.h" +#include "world/Track.h" +#include "simulation/simulation.h" +#include "utilities/Globals.h" +#include "world/Event.h" +#include "world/MemCell.h" +#include "input/messaging.h" +#include "vehicle/DynObj.h" +#include "vehicle/Driver.h" +#include "model/AnimModel.h" +#include "world/Track.h" +#include "utilities/Timer.h" +#include "utilities/Logs.h" +#include "rendering/renderer.h" +#include "utilities/utilities.h" // 101206 Ra: trapezoidalne drogi i tory // 110720 Ra: rozprucie zwrotnicy i odcinki izolowane diff --git a/world/Track.h b/world/Track.h index c156fa7b..ffc622db 100644 --- a/world/Track.h +++ b/world/Track.h @@ -13,11 +13,11 @@ http://mozilla.org/MPL/2.0/. #include #include -#include "Classes.h" -#include "Segment.h" -#include "material.h" -#include "scenenode.h" -#include "Names.h" +#include "utilities/Classes.h" +#include "world/Segment.h" +#include "model/material.h" +#include "scene/scenenode.h" +#include "utilities/Names.h" namespace scene { class basic_cell; diff --git a/world/Traction.cpp b/world/Traction.cpp index 1a2811c9..db7d033b 100644 --- a/world/Traction.cpp +++ b/world/Traction.cpp @@ -13,14 +13,14 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "Traction.h" +#include "world/Traction.h" -#include "simulation.h" -#include "Globals.h" -#include "TractionPower.h" -#include "Logs.h" -#include "renderer.h" -#include "utilities.h" +#include "simulation/simulation.h" +#include "utilities/Globals.h" +#include "world/TractionPower.h" +#include "utilities/Logs.h" +#include "rendering/renderer.h" +#include "utilities/utilities.h" //--------------------------------------------------------------------------- /* diff --git a/world/Traction.h b/world/Traction.h index 7714b874..638f46b0 100644 --- a/world/Traction.h +++ b/world/Traction.h @@ -11,10 +11,10 @@ http://mozilla.org/MPL/2.0/. #include -#include "scenenode.h" -#include "Segment.h" -#include "material.h" -#include "Names.h" +#include "scene/scenenode.h" +#include "world/Segment.h" +#include "model/material.h" +#include "utilities/Names.h" class TTractionPowerSource; diff --git a/world/TractionPower.cpp b/world/TractionPower.cpp index 36edeacf..bb7862c0 100644 --- a/world/TractionPower.cpp +++ b/world/TractionPower.cpp @@ -14,10 +14,10 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "TractionPower.h" +#include "world/TractionPower.h" -#include "parser.h" -#include "Logs.h" +#include "utilities/parser.h" +#include "utilities/Logs.h" //--------------------------------------------------------------------------- diff --git a/world/TractionPower.h b/world/TractionPower.h index 3bdeacf1..d84b6b81 100644 --- a/world/TractionPower.h +++ b/world/TractionPower.h @@ -9,9 +9,9 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "Classes.h" -#include "scenenode.h" -#include "Names.h" +#include "utilities/Classes.h" +#include "scene/scenenode.h" +#include "utilities/Names.h" class TTractionPowerSource : public scene::basic_node { diff --git a/world/TrkFoll.cpp b/world/TrkFoll.cpp index a079a7e7..40871030 100644 --- a/world/TrkFoll.cpp +++ b/world/TrkFoll.cpp @@ -14,13 +14,13 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "TrkFoll.h" +#include "world/TrkFoll.h" -#include "simulation.h" -#include "Globals.h" -#include "DynObj.h" -#include "Driver.h" -#include "Logs.h" +#include "simulation/simulation.h" +#include "utilities/Globals.h" +#include "vehicle/DynObj.h" +#include "vehicle/Driver.h" +#include "utilities/Logs.h" TTrackFollower::~TTrackFollower() { diff --git a/world/TrkFoll.h b/world/TrkFoll.h index c2a118f5..3bcea7ae 100644 --- a/world/TrkFoll.h +++ b/world/TrkFoll.h @@ -10,8 +10,8 @@ http://mozilla.org/MPL/2.0/. #ifndef TrkFollH #define TrkFollH -#include "Classes.h" -#include "Segment.h" +#include "utilities/Classes.h" +#include "world/Segment.h" // oÅ› poruszajÄ…ca siÄ™ po torze class TTrackFollower { diff --git a/world/mtable.cpp b/world/mtable.cpp index ac2546ef..c6460248 100644 --- a/world/mtable.cpp +++ b/world/mtable.cpp @@ -8,11 +8,11 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "mtable.h" -#include "Globals.h" -#include "simulationtime.h" -#include "dictionary.h" -#include "utilities.h" +#include "world/mtable.h" +#include "utilities/Globals.h" +#include "simulation/simulationtime.h" +#include "utilities/dictionary.h" +#include "utilities/utilities.h" double TTrainParameters::CheckTrainLatency() { diff --git a/world/mtable.h b/world/mtable.h index 15b66940..c58d120f 100644 --- a/world/mtable.h +++ b/world/mtable.h @@ -11,8 +11,8 @@ http://mozilla.org/MPL/2.0/. #include -#include "Classes.h" -#include "sound.h" +#include "utilities/Classes.h" +#include "audio/sound.h" namespace Mtable { diff --git a/world/station.cpp b/world/station.cpp index 8c6f2e57..7bd18587 100644 --- a/world/station.cpp +++ b/world/station.cpp @@ -8,10 +8,10 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "station.h" +#include "world/station.h" -#include "DynObj.h" -#include "mtable.h" +#include "vehicle/DynObj.h" +#include "world/mtable.h" namespace simulation { diff --git a/world/station.h b/world/station.h index 7d6e184d..ecc60992 100644 --- a/world/station.h +++ b/world/station.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "Classes.h" +#include "utilities/Classes.h" // a simple station, performs freight and passenger exchanges with visiting consists class basic_station {