diff --git a/CMakeLists.txt b/CMakeLists.txt index 73fe7ca9..9a5be825 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,19 @@ file(GLOB HEADERS "*.h" "widgets/*.h" "launcher/*.h" "extras/*.h" -"global_include/*.h") +"global_include/*.h" +"simulation/*.h" +"scene/*.h" +"rendering/*.h" +"audio/*.h" +"environment/*.h" +"application/*.h" +"input/*.h" +"scripting/*.h" +"model/*.h" +"utilities/*.h" +"world/*.h" +"vehicle/*.h") set(GLOBAL_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}") set(GLOBAL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/global_include") @@ -79,101 +91,100 @@ list(APPEND CMAKE_PREFIX_PATH "${VCPKG_INSTALLED_PATH}") list(APPEND CMAKE_MODULE_PATH "${VCPKG_INSTALLED_PATH}/share") set(SOURCES -"Texture.cpp" -"Timer.cpp" -"Track.cpp" -"Traction.cpp" -"TractionPower.cpp" -"Train.cpp" -"TrkFoll.cpp" -"AirCoupler.cpp" -"AnimModel.cpp" -"Button.cpp" -"Camera.cpp" -"Driver.cpp" -"driverhints.cpp" -"dumb3d.cpp" -"DynObj.cpp" +"model/Texture.cpp" +"utilities/Timer.cpp" +"world/Track.cpp" +"world/Traction.cpp" +"world/TractionPower.cpp" +"vehicle/Train.cpp" +"world/TrkFoll.cpp" +"vehicle/AirCoupler.cpp" +"model/AnimModel.cpp" +"vehicle/Button.cpp" +"vehicle/Camera.cpp" +"vehicle/Driver.cpp" +"application/driverhints.cpp" +"utilities/dumb3d.cpp" +"vehicle/DynObj.cpp" "EU07.cpp" "export_e3d_standalone.cpp" -"Event.cpp" -"EvLaunch.cpp" -"Float3d.cpp" -"Gauge.cpp" -"Globals.cpp" -"Logs.cpp" +"world/Event.cpp" +"world/EvLaunch.cpp" +"utilities/Float3d.cpp" +"vehicle/Gauge.cpp" +"utilities/Globals.cpp" +"utilities/Logs.cpp" "McZapkie/friction.cpp" "McZapkie/hamulce.cpp" "McZapkie/Mover.cpp" "McZapkie/Oerlikon_ESt.cpp" -"MdlMngr.cpp" -"MemCell.cpp" -"Model3d.cpp" -"mtable.cpp" -"parser.cpp" -"nullrenderer.cpp" -"renderer.cpp" -"ResourceManager.cpp" -"sn_utils.cpp" -"Segment.cpp" -"sky.cpp" -"sun.cpp" -"stars.cpp" -"lightarray.cpp" -"skydome.cpp" -"sound.cpp" -"Spring.cpp" -"frustum.cpp" -"uilayer.cpp" -"openglmatrixstack.cpp" -"moon.cpp" -"command.cpp" -"keyboardinput.cpp" -"gamepadinput.cpp" -"drivermouseinput.cpp" -"translation.cpp" -"material.cpp" +"model/MdlMngr.cpp" +"world/MemCell.cpp" +"model/Model3d.cpp" +"world/mtable.cpp" +"utilities/parser.cpp" +"rendering/nullrenderer.cpp" +"rendering/renderer.cpp" +"model/ResourceManager.cpp" +"scene/sn_utils.cpp" +"world/Segment.cpp" +"environment/sky.cpp" +"environment/sun.cpp" +"environment/stars.cpp" +"rendering/lightarray.cpp" +"environment/skydome.cpp" +"audio/sound.cpp" +"world/Spring.cpp" +"rendering/frustum.cpp" +"application/uilayer.cpp" +"rendering/openglmatrixstack.cpp" +"environment/moon.cpp" +"input/command.cpp" +"input/keyboardinput.cpp" +"input/gamepadinput.cpp" +"input/drivermouseinput.cpp" +"utilities/translation.cpp" +"model/material.cpp" "stdafx.cpp" -"messaging.cpp" -"scene.cpp" -"scenenode.cpp" -"simulation.cpp" -"vertex.cpp" -"audio.cpp" -"audiorenderer.cpp" -"motiontelemetry.cpp" -"utilities.cpp" -"uitranscripts.cpp" -"station.cpp" -"application.cpp" -"simulationtime.cpp" -"sceneeditor.cpp" -"screenshot.cpp" -"driverkeyboardinput.cpp" -"drivermode.cpp" -"driveruilayer.cpp" -"driveruipanels.cpp" -"editorkeyboardinput.cpp" -"editormode.cpp" -"editormouseinput.cpp" -"editoruilayer.cpp" -"editoruipanels.cpp" -"scenarioloadermode.cpp" -"scenarioloaderuilayer.cpp" -"scenenodegroups.cpp" -"simulationenvironment.cpp" -"simulationstateserializer.cpp" -"precipitation.cpp" -"pythonscreenviewer.cpp" -"dictionary.cpp" -"particles.cpp" -"headtrack.cpp" -"headtrack.h" -"ladderlogic.cpp" -"geometrybank.cpp" -"openglcolor.cpp" -"simulationsounds.cpp" -"openglcamera.cpp" +"input/messaging.cpp" +"scene/scene.cpp" +"scene/scenenode.cpp" +"simulation/simulation.cpp" +"model/vertex.cpp" +"audio/audio.cpp" +"audio/audiorenderer.cpp" +"utilities/motiontelemetry.cpp" +"utilities/utilities.cpp" +"application/uitranscripts.cpp" +"world/station.cpp" +"application/application.cpp" +"simulation/simulationtime.cpp" +"scene/sceneeditor.cpp" +"rendering/screenshot.cpp" +"input/driverkeyboardinput.cpp" +"application/drivermode.cpp" +"application/driveruilayer.cpp" +"application/driveruipanels.cpp" +"input/editorkeyboardinput.cpp" +"application/editormode.cpp" +"input/editormouseinput.cpp" +"application/editoruilayer.cpp" +"application/editoruipanels.cpp" +"application/scenarioloadermode.cpp" +"application/scenarioloaderuilayer.cpp" +"scene/scenenodegroups.cpp" +"simulation/simulationenvironment.cpp" +"simulation/simulationstateserializer.cpp" +"rendering/precipitation.cpp" +"scripting/pythonscreenviewer.cpp" +"utilities/dictionary.cpp" +"rendering/particles.cpp" +"utilities/headtrack.cpp" +"scripting/ladderlogic.cpp" +"rendering/geometrybank.cpp" +"rendering/openglcolor.cpp" +"simulation/simulationsounds.cpp" +"rendering/openglcamera.cpp" "network/network.cpp" "network/message.cpp" @@ -232,7 +243,7 @@ set_source_files_properties("imgui/imgui_impl_opengl2.cpp" PROPERTIES SKIP_PRECO if (WITH_CRASHPAD) set(DEFINITIONS ${DEFINITIONS} "WITH_CRASHPAD") - set(SOURCES ${SOURCES} "crashreporter.cpp") + set(SOURCES ${SOURCES} "utilities/crashreporter.cpp") if (WIN32) include_directories("${DEPS_DIR}/crashpad/include" "${DEPS_DIR}/crashpad/include/mini_chromium") else() @@ -242,19 +253,19 @@ endif() if (WITH_PYTHON) set(DEFINITIONS ${DEFINITIONS} "WITH_PYTHON") - set(SOURCES ${SOURCES} "PyInt.cpp") + set(SOURCES ${SOURCES} "scripting/PyInt.cpp") else() - set(SOURCES ${SOURCES} "PyIntStub.cpp") + set(SOURCES ${SOURCES} "scripting/PyIntStub.cpp") endif() if (WITH_UART) set(DEFINITIONS ${DEFINITIONS} "WITH_UART") - set(SOURCES ${SOURCES} "uart.cpp") + set(SOURCES ${SOURCES} "utilities/uart.cpp") endif() if (WITH_ZMQ) set(DEFINITIONS ${DEFINITIONS} "WITH_ZMQ") - set(SOURCES ${SOURCES} "zmq_input.cpp") + set(SOURCES ${SOURCES} "input/zmq_input.cpp") endif() if (WITH_OPENVR) @@ -264,7 +275,7 @@ endif() if (WITH_LUA) set(DEFINITIONS ${DEFINITIONS} "WITH_LUA") - set(SOURCES ${SOURCES} "lua.cpp") + set(SOURCES ${SOURCES} "scripting/lua.cpp") endif() if (WITHDUMPGEN) @@ -273,23 +284,23 @@ endif() if (WITH_OPENGL_MODERN) set(SOURCES ${SOURCES} - "opengl33geometrybank.cpp" - "opengl33light.cpp" - "opengl33skydome.cpp" - "opengl33precipitation.cpp" - "opengl33particles.cpp" - "opengl33renderer.cpp") + "rendering/opengl33geometrybank.cpp" + "rendering/opengl33light.cpp" + "rendering/opengl33skydome.cpp" + "rendering/opengl33precipitation.cpp" + "rendering/opengl33particles.cpp" + "rendering/opengl33renderer.cpp") set(DEFINITIONS ${DEFINITIONS} "WITH_OPENGL_MODERN") endif() if (WITH_OPENGL_LEGACY) set(SOURCES ${SOURCES} - "openglgeometrybank.cpp" - "opengllight.cpp" - "openglskydome.cpp" - "openglprecipitation.cpp" - "openglparticles.cpp" - "openglrenderer.cpp") + "rendering/openglgeometrybank.cpp" + "rendering/opengllight.cpp" + "rendering/openglskydome.cpp" + "rendering/openglprecipitation.cpp" + "rendering/openglparticles.cpp" + "rendering/openglrenderer.cpp") set(DEFINITIONS ${DEFINITIONS} "WITH_OPENGL_LEGACY") endif() 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..e1be8584 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 @@ -38,7 +38,7 @@ void export_e3d_standalone(std::string in, std::string out, int flags, bool dyna #include #include #include -#include +#include #ifdef _WIN32 #pragma comment(lib, "Dbghelp.lib") 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.cpp b/application/application.cpp similarity index 98% rename from application.cpp rename to application/application.cpp index 1a9b61cd..95cc1d52 100644 --- a/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.h b/application/application.h similarity index 96% rename from application.h rename to application/application.h index 07a3b90f..d461a0c9 100644 --- a/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/applicationmode.h b/application/applicationmode.h similarity index 98% rename from applicationmode.h rename to application/applicationmode.h index 39cd4a23..feea3bdb 100644 --- a/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/driverhints.cpp b/application/driverhints.cpp similarity index 99% rename from driverhints.cpp rename to application/driverhints.cpp index 45bc6498..792b2bd2 100644 --- a/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/driverhints.h b/application/driverhints.h similarity index 75% rename from driverhints.h rename to application/driverhints.h index 3f95cb31..7b6130c2 100644 --- a/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/driverhints_def.h b/application/driverhints_def.h similarity index 100% rename from driverhints_def.h rename to application/driverhints_def.h diff --git a/drivermode.cpp b/application/drivermode.cpp similarity index 98% rename from drivermode.cpp rename to application/drivermode.cpp index 5aeafc81..394aad1c 100644 --- a/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/drivermode.h b/application/drivermode.h similarity index 93% rename from drivermode.h rename to application/drivermode.h index d9c0cffa..85caecba 100644 --- a/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/driveruilayer.cpp b/application/driveruilayer.cpp similarity index 96% rename from driveruilayer.cpp rename to application/driveruilayer.cpp index 99a4dc36..a89f19fd 100644 --- a/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/driveruilayer.h b/application/driveruilayer.h similarity index 95% rename from driveruilayer.h rename to application/driveruilayer.h index 3c1ea344..8ad1d775 100644 --- a/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/driveruipanels.cpp b/application/driveruipanels.cpp similarity index 98% rename from driveruipanels.cpp rename to application/driveruipanels.cpp index 2eafcce3..16465d50 100644 --- a/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/driveruipanels.h b/application/driveruipanels.h similarity index 98% rename from driveruipanels.h rename to application/driveruipanels.h index f34a601e..11b65c35 100644 --- a/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/editormode.cpp b/application/editormode.cpp similarity index 98% rename from editormode.cpp rename to application/editormode.cpp index 1c42242e..1e97e9de 100644 --- a/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/editormode.h b/application/editormode.h similarity index 95% rename from editormode.h rename to application/editormode.h index 9c5488b9..8f1e8e12 100644 --- a/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/editoruilayer.cpp b/application/editoruilayer.cpp similarity index 93% rename from editoruilayer.cpp rename to application/editoruilayer.cpp index b8129783..0a225fe3 100644 --- a/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/editoruilayer.h b/application/editoruilayer.h similarity index 93% rename from editoruilayer.h rename to application/editoruilayer.h index 94e864ba..ad3d5447 100644 --- a/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/editoruipanels.cpp b/application/editoruipanels.cpp similarity index 98% rename from editoruipanels.cpp rename to application/editoruipanels.cpp index 0819e920..11c1e4f0 100644 --- a/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/editoruipanels.h b/application/editoruipanels.h similarity index 97% rename from editoruipanels.h rename to application/editoruipanels.h index 4a2a9867..c90f3eda 100644 --- a/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/scenarioloadermode.cpp b/application/scenarioloadermode.cpp similarity index 86% rename from scenarioloadermode.cpp rename to application/scenarioloadermode.cpp index 6a47ae68..e49493c4 100644 --- a/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/scenarioloadermode.h b/application/scenarioloadermode.h similarity index 94% rename from scenarioloadermode.h rename to application/scenarioloadermode.h index 5e642582..db23458d 100644 --- a/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/scenarioloaderuilayer.cpp b/application/scenarioloaderuilayer.cpp similarity index 98% rename from scenarioloaderuilayer.cpp rename to application/scenarioloaderuilayer.cpp index 74707b4d..1beb5de8 100644 --- a/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/scenarioloaderuilayer.h b/application/scenarioloaderuilayer.h similarity index 96% rename from scenarioloaderuilayer.h rename to application/scenarioloaderuilayer.h index 753cb197..3be9cba1 100644 --- a/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/uilayer.cpp b/application/uilayer.cpp similarity index 98% rename from uilayer.cpp rename to application/uilayer.cpp index 806c72f3..b1c40292 100644 --- a/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/uilayer.h b/application/uilayer.h similarity index 99% rename from uilayer.h rename to application/uilayer.h index 25399612..6d4019c6 100644 --- a/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/uitranscripts.cpp b/application/uitranscripts.cpp similarity index 95% rename from uitranscripts.cpp rename to application/uitranscripts.cpp index 1c054910..6de03d34 100644 --- a/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/uitranscripts.h b/application/uitranscripts.h similarity index 100% rename from uitranscripts.h rename to application/uitranscripts.h diff --git a/audio.cpp b/audio/audio.cpp similarity index 97% rename from audio.cpp rename to audio/audio.cpp index 8c4e3e3c..65bd5ec9 100644 --- a/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.h b/audio/audio.h similarity index 100% rename from audio.h rename to audio/audio.h diff --git a/audiorenderer.cpp b/audio/audiorenderer.cpp similarity index 98% rename from audiorenderer.cpp rename to audio/audiorenderer.cpp index da66ab51..0cd4b4e4 100644 --- a/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/audiorenderer.h b/audio/audiorenderer.h similarity index 98% rename from audiorenderer.h rename to audio/audiorenderer.h index 94ccb4e0..763279ce 100644 --- a/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/audiorenderer_extra.h b/audio/audiorenderer_extra.h similarity index 100% rename from audiorenderer_extra.h rename to audio/audiorenderer_extra.h diff --git a/sound.cpp b/audio/sound.cpp similarity index 99% rename from sound.cpp rename to audio/sound.cpp index 7aa6a36a..8fcdd033 100644 --- a/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/sound.h b/audio/sound.h similarity index 99% rename from sound.h rename to audio/sound.h index 837325c1..ff85ec03 100644 --- a/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/betterRenderer/eu07_source/register.cpp b/betterRenderer/eu07_source/register.cpp index 88a9d2b5..47ea5f14 100644 --- a/betterRenderer/eu07_source/register.cpp +++ b/betterRenderer/eu07_source/register.cpp @@ -1,4 +1,4 @@ -#include "Logs.h" +#include "utilities/Logs.h" #include "nvrenderer/nvrenderer.h" namespace { diff --git a/betterRenderer/renderer/include/nvrenderer/nvrenderer.h b/betterRenderer/renderer/include/nvrenderer/nvrenderer.h index 80a86d95..a572c6dc 100644 --- a/betterRenderer/renderer/include/nvrenderer/nvrenderer.h +++ b/betterRenderer/renderer/include/nvrenderer/nvrenderer.h @@ -22,14 +22,14 @@ #include // EU07 includes -#include -#include +#include +#include #include "nvrenderer_enums.h" #include "quadtree.h" -#include "renderer.h" +#include "rendering/renderer.h" #include "resource_registry.h" -#include "sky.h" +#include "environment/sky.h" namespace Rt { struct IRtModel; diff --git a/betterRenderer/renderer/source/environment.cpp b/betterRenderer/renderer/source/environment.cpp index e665a199..dea5f8c3 100644 --- a/betterRenderer/renderer/source/environment.cpp +++ b/betterRenderer/renderer/source/environment.cpp @@ -8,7 +8,7 @@ #include "nvrenderer/nvrenderer.h" #include "nvrendererbackend.h" #include "nvtexture.h" -#include "simulationenvironment.h" +#include "simulation/simulationenvironment.h" #include "sky.h" int MaEnvironment::GetCurrentSetIndex() { diff --git a/betterRenderer/renderer/source/fsr.cpp b/betterRenderer/renderer/source/fsr.cpp index c5a4fb55..2253d544 100644 --- a/betterRenderer/renderer/source/fsr.cpp +++ b/betterRenderer/renderer/source/fsr.cpp @@ -13,7 +13,7 @@ #include "nvrenderer_vulkan.h" #endif -#include "Globals.h" +#include "utilities/Globals.h" #include "gbuffer.h" #include "gbufferblitpass.h" diff --git a/betterRenderer/renderer/source/gbufferblitpass.cpp b/betterRenderer/renderer/source/gbufferblitpass.cpp index 97123f91..6a927b3c 100644 --- a/betterRenderer/renderer/source/gbufferblitpass.cpp +++ b/betterRenderer/renderer/source/gbufferblitpass.cpp @@ -1,7 +1,7 @@ #include "gbufferblitpass.h" #include -#include +#include #include #include "contactshadows.h" diff --git a/betterRenderer/renderer/source/materialparser.cpp b/betterRenderer/renderer/source/materialparser.cpp index ed949bac..20ef4322 100644 --- a/betterRenderer/renderer/source/materialparser.cpp +++ b/betterRenderer/renderer/source/materialparser.cpp @@ -2,12 +2,12 @@ #include "nvrenderer/nvrenderer.h" -#include -#include +#include +#include #include -#include +#include #include -#include +#include #include #include diff --git a/betterRenderer/renderer/source/nvmaterial.cpp b/betterRenderer/renderer/source/nvmaterial.cpp index 6afe4428..cde600de 100644 --- a/betterRenderer/renderer/source/nvmaterial.cpp +++ b/betterRenderer/renderer/source/nvmaterial.cpp @@ -4,7 +4,7 @@ #include #include -#include "Logs.h" +#include "utilities/Logs.h" #include "csm.h" #include "environment.h" #include "gbuffer.h" diff --git a/betterRenderer/renderer/source/nvrenderer.cpp b/betterRenderer/renderer/source/nvrenderer.cpp index 9156ab08..926666d5 100644 --- a/betterRenderer/renderer/source/nvrenderer.cpp +++ b/betterRenderer/renderer/source/nvrenderer.cpp @@ -1,12 +1,12 @@ #include "nvrenderer/nvrenderer.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include #include #include diff --git a/betterRenderer/renderer/source/nvrenderer_d3d12.cpp b/betterRenderer/renderer/source/nvrenderer_d3d12.cpp index 19e36033..ebfa718b 100644 --- a/betterRenderer/renderer/source/nvrenderer_d3d12.cpp +++ b/betterRenderer/renderer/source/nvrenderer_d3d12.cpp @@ -2,8 +2,8 @@ #include -#include "Globals.h" -#include "Logs.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" #include "config.h" #include "nvrenderer/nvrenderer.h" diff --git a/betterRenderer/renderer/source/nvrenderer_vulkan.cpp b/betterRenderer/renderer/source/nvrenderer_vulkan.cpp index a50789e5..f1e529c8 100644 --- a/betterRenderer/renderer/source/nvrenderer_vulkan.cpp +++ b/betterRenderer/renderer/source/nvrenderer_vulkan.cpp @@ -3,8 +3,8 @@ #include #include -#include "Globals.h" -#include "Logs.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" #include "config.h" #include "nvrenderer/nvrenderer.h" diff --git a/betterRenderer/renderer/source/nvrendererbackend.cpp b/betterRenderer/renderer/source/nvrendererbackend.cpp index 2fb7e969..d1e8f0b3 100644 --- a/betterRenderer/renderer/source/nvrendererbackend.cpp +++ b/betterRenderer/renderer/source/nvrendererbackend.cpp @@ -1,6 +1,6 @@ #include "nvrendererbackend.h" -#include "Logs.h" +#include "utilities/Logs.h" #include void NvRendererMessageCallback::message(nvrhi::MessageSeverity severity, diff --git a/betterRenderer/renderer/source/nvtexture.cpp b/betterRenderer/renderer/source/nvtexture.cpp index 192a88cc..47178111 100644 --- a/betterRenderer/renderer/source/nvtexture.cpp +++ b/betterRenderer/renderer/source/nvtexture.cpp @@ -1,14 +1,14 @@ #include "nvtexture.h" #include "nvrenderer/nvrenderer.h" -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include -#include "Logs.h" +#include "utilities/Logs.h" // #include "Texture.h" #include "nvrendererbackend.h" #include "stbi/stb_image.h" diff --git a/betterRenderer/renderer/source/resource_registry.cpp b/betterRenderer/renderer/source/resource_registry.cpp index a728c573..37a9e564 100644 --- a/betterRenderer/renderer/source/resource_registry.cpp +++ b/betterRenderer/renderer/source/resource_registry.cpp @@ -1,6 +1,6 @@ #include "nvrenderer/resource_registry.h" -#include "Logs.h" +#include "utilities/Logs.h" #include "fmt/compile.h" #include "nvtexture.h" #include "nvrenderer/nvrenderer.h" diff --git a/betterRenderer/renderer/source/rt_model.cpp b/betterRenderer/renderer/source/rt_model.cpp index e587348b..5ddff74b 100644 --- a/betterRenderer/renderer/source/rt_model.cpp +++ b/betterRenderer/renderer/source/rt_model.cpp @@ -9,7 +9,7 @@ #include -#include "Model3d.h" +#include "model/Model3d.h" namespace Rt { diff --git a/betterRenderer/renderer/source/sky.cpp b/betterRenderer/renderer/source/sky.cpp index a833656a..74a169e4 100644 --- a/betterRenderer/renderer/source/sky.cpp +++ b/betterRenderer/renderer/source/sky.cpp @@ -4,8 +4,8 @@ #include "environment.h" #include "nvrendererbackend.h" -#include "simulationenvironment.h" -#include "simulationtime.h" +#include "simulation/simulationenvironment.h" +#include "simulation/simulationtime.h" namespace { static const float PI = 3.14159265358979323846f; diff --git a/betterRenderer/renderer/source/track_batching.cpp b/betterRenderer/renderer/source/track_batching.cpp index 946e4599..4223ae31 100644 --- a/betterRenderer/renderer/source/track_batching.cpp +++ b/betterRenderer/renderer/source/track_batching.cpp @@ -4,9 +4,9 @@ #include "nvrenderer/nvrenderer.h" #include "nvrendererbackend.h" -#include -#include -#include +#include +#include +#include namespace BatchingUtils { diff --git a/moon.cpp b/environment/moon.cpp similarity index 98% rename from moon.cpp rename to environment/moon.cpp index a9cfcc9d..d7b4ab58 100644 --- a/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/moon.h b/environment/moon.h similarity index 100% rename from moon.h rename to environment/moon.h diff --git a/sky.cpp b/environment/sky.cpp similarity index 87% rename from sky.cpp rename to environment/sky.cpp index 42a57cac..6bab884c 100644 --- a/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/sky.h b/environment/sky.h similarity index 94% rename from sky.h rename to environment/sky.h index 2df0a143..34b1ae75 100644 --- a/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/skydome.cpp b/environment/skydome.cpp similarity index 98% rename from skydome.cpp rename to environment/skydome.cpp index cc7ad696..e0a1afe1 100644 --- a/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/skydome.h b/environment/skydome.h similarity index 100% rename from skydome.h rename to environment/skydome.h diff --git a/stars.cpp b/environment/stars.cpp similarity index 75% rename from stars.cpp rename to environment/stars.cpp index 9b0d1572..5fd112c5 100644 --- a/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/stars.h b/environment/stars.h similarity index 95% rename from stars.h rename to environment/stars.h index bae1ada6..f3643d26 100644 --- a/stars.h +++ b/environment/stars.h @@ -1,6 +1,6 @@ #pragma once -#include "Classes.h" +#include "utilities/Classes.h" ////////////////////////////////////////////////////////////////////////////////////////// diff --git a/sun.cpp b/environment/sun.cpp similarity index 98% rename from sun.cpp rename to environment/sun.cpp index 986b3aef..fd28f7f3 100644 --- a/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/sun.h b/environment/sun.h similarity index 100% rename from sun.h rename to environment/sun.h 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/command.cpp b/input/command.cpp similarity index 99% rename from command.cpp rename to input/command.cpp index 1b97e895..305b1a3d 100644 --- a/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/command.h b/input/command.h similarity index 100% rename from command.h rename to input/command.h diff --git a/driverkeyboardinput.cpp b/input/driverkeyboardinput.cpp similarity index 99% rename from driverkeyboardinput.cpp rename to input/driverkeyboardinput.cpp index ded09670..829185c9 100644 --- a/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/driverkeyboardinput.h b/input/driverkeyboardinput.h similarity index 93% rename from driverkeyboardinput.h rename to input/driverkeyboardinput.h index c18871df..1e3f11b1 100644 --- a/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/drivermouseinput.cpp b/input/drivermouseinput.cpp similarity index 99% rename from drivermouseinput.cpp rename to input/drivermouseinput.cpp index 0cf8b250..b829521b 100644 --- a/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/drivermouseinput.h b/input/drivermouseinput.h similarity index 99% rename from drivermouseinput.h rename to input/drivermouseinput.h index 6ff66f02..142ef99c 100644 --- a/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/editorkeyboardinput.cpp b/input/editorkeyboardinput.cpp similarity index 96% rename from editorkeyboardinput.cpp rename to input/editorkeyboardinput.cpp index 2b306f5c..fa1e95d0 100644 --- a/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/editorkeyboardinput.h b/input/editorkeyboardinput.h similarity index 93% rename from editorkeyboardinput.h rename to input/editorkeyboardinput.h index 138ba99d..1628fe04 100644 --- a/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/editormouseinput.cpp b/input/editormouseinput.cpp similarity index 97% rename from editormouseinput.cpp rename to input/editormouseinput.cpp index 43b6d29e..cc1a522d 100644 --- a/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/editormouseinput.h b/input/editormouseinput.h similarity index 97% rename from editormouseinput.h rename to input/editormouseinput.h index 3f33af2c..46cfd335 100644 --- a/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/gamepadinput.cpp b/input/gamepadinput.cpp similarity index 99% rename from gamepadinput.cpp rename to input/gamepadinput.cpp index 8292a25d..1eea53f3 100644 --- a/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/gamepadinput.h b/input/gamepadinput.h similarity index 98% rename from gamepadinput.h rename to input/gamepadinput.h index ab6da934..ba8d4e38 100644 --- a/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/keyboardinput.cpp b/input/keyboardinput.cpp similarity index 98% rename from keyboardinput.cpp rename to input/keyboardinput.cpp index e1b499d0..f9d83938 100644 --- a/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/keyboardinput.h b/input/keyboardinput.h similarity index 98% rename from keyboardinput.h rename to input/keyboardinput.h index efb4921f..fffa4630 100644 --- a/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/messaging.cpp b/input/messaging.cpp similarity index 98% rename from messaging.cpp rename to input/messaging.cpp index 918dd779..23f4dbb1 100644 --- a/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/messaging.h b/input/messaging.h similarity index 100% rename from messaging.h rename to input/messaging.h diff --git a/zmq_input.cpp b/input/zmq_input.cpp similarity index 98% rename from zmq_input.cpp rename to input/zmq_input.cpp index 505c1587..1c6e29ac 100644 --- a/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/zmq_input.h b/input/zmq_input.h similarity index 98% rename from zmq_input.h rename to input/zmq_input.h index d96df3b5..503a6a59 100644 --- a/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/AnimModel.cpp b/model/AnimModel.cpp similarity index 98% rename from AnimModel.cpp rename to model/AnimModel.cpp index 4f0daba2..20fdd628 100644 --- a/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/AnimModel.h b/model/AnimModel.h similarity index 97% rename from AnimModel.h rename to model/AnimModel.h index e62685df..802cb21c 100644 --- a/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/MdlMngr.cpp b/model/MdlMngr.cpp similarity index 97% rename from MdlMngr.cpp rename to model/MdlMngr.cpp index 2ee4073c..b0a7ba76 100644 --- a/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/MdlMngr.h b/model/MdlMngr.h similarity index 97% rename from MdlMngr.h rename to model/MdlMngr.h index 896dff42..94baf3d4 100644 --- a/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/Model3d.cpp b/model/Model3d.cpp similarity index 99% rename from Model3d.cpp rename to model/Model3d.cpp index 4335f188..d4132f9e 100644 --- a/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/Model3d.h b/model/Model3d.h similarity index 98% rename from Model3d.h rename to model/Model3d.h index b9ae7028..f6ba3298 100644 --- a/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/ResourceManager.cpp b/model/ResourceManager.cpp similarity index 96% rename from ResourceManager.cpp rename to model/ResourceManager.cpp index adbf4bf4..0d91f788 100644 --- a/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/ResourceManager.h b/model/ResourceManager.h similarity index 100% rename from ResourceManager.h rename to model/ResourceManager.h diff --git a/Texture.cpp b/model/Texture.cpp similarity index 99% rename from Texture.cpp rename to model/Texture.cpp index 4710c6f3..f4085edf 100644 --- a/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/Texture.h b/model/Texture.h similarity index 99% rename from Texture.h rename to model/Texture.h index 6df64684..b402d64c 100644 --- a/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/material.cpp b/model/material.cpp similarity index 98% rename from material.cpp rename to model/material.cpp index 253f09e6..99261338 100644 --- a/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/material.h b/model/material.h similarity index 98% rename from material.h rename to model/material.h index 226ffb67..6d3f2b8d 100644 --- a/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/vertex.cpp b/model/vertex.cpp similarity index 96% rename from vertex.cpp rename to model/vertex.cpp index badcab8e..41b655b5 100644 --- a/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/vertex.h b/model/vertex.h similarity index 98% rename from vertex.h rename to model/vertex.h index 91bf1ca0..28b63b69 100644 --- a/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/flip-s3tc.h b/rendering/flip-s3tc.h similarity index 100% rename from flip-s3tc.h rename to rendering/flip-s3tc.h diff --git a/frustum.cpp b/rendering/frustum.cpp similarity index 99% rename from frustum.cpp rename to rendering/frustum.cpp index a92f395f..afe16441 100644 --- a/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/frustum.h b/rendering/frustum.h similarity index 98% rename from frustum.h rename to rendering/frustum.h index b1f0ee83..eb1f8df6 100644 --- a/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/geometrybank.cpp b/rendering/geometrybank.cpp similarity index 99% rename from geometrybank.cpp rename to rendering/geometrybank.cpp index 4371bb3f..137dfca2 100644 --- a/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/geometrybank.h b/rendering/geometrybank.h similarity index 99% rename from geometrybank.h rename to rendering/geometrybank.h index e12d51ba..9828d578 100644 --- a/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/light.h b/rendering/light.h similarity index 94% rename from light.h rename to rendering/light.h index f3d68e5f..246056d3 100644 --- a/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/lightarray.cpp b/rendering/lightarray.cpp similarity index 98% rename from lightarray.cpp rename to rendering/lightarray.cpp index 08e2af86..db6097f8 100644 --- a/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/lightarray.h b/rendering/lightarray.h similarity index 97% rename from lightarray.h rename to rendering/lightarray.h index e826440f..670cbea8 100644 --- a/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/nullrenderer.cpp b/rendering/nullrenderer.cpp similarity index 88% rename from nullrenderer.cpp rename to rendering/nullrenderer.cpp index 452ce971..a37eddb9 100644 --- a/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/nullrenderer.h b/rendering/nullrenderer.h similarity index 98% rename from nullrenderer.h rename to rendering/nullrenderer.h index e67cdc59..69839f11 100644 --- a/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/opengl33geometrybank.cpp b/rendering/opengl33geometrybank.cpp similarity index 99% rename from opengl33geometrybank.cpp rename to rendering/opengl33geometrybank.cpp index 63f0ef8c..28ad6b1b 100644 --- a/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/opengl33geometrybank.h b/rendering/opengl33geometrybank.h similarity index 98% rename from opengl33geometrybank.h rename to rendering/opengl33geometrybank.h index f6f8af0a..7dd54ba8 100644 --- a/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/opengl33light.cpp b/rendering/opengl33light.cpp similarity index 91% rename from opengl33light.cpp rename to rendering/opengl33light.cpp index 5be0cf98..ea1baf78 100644 --- a/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/opengl33light.h b/rendering/opengl33light.h similarity index 95% rename from opengl33light.h rename to rendering/opengl33light.h index 6f363061..b87564aa 100644 --- a/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/opengl33particles.cpp b/rendering/opengl33particles.cpp similarity index 95% rename from opengl33particles.cpp rename to rendering/opengl33particles.cpp index b56d2e28..57f93ca4 100644 --- a/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/opengl33particles.h b/rendering/opengl33particles.h similarity index 100% rename from opengl33particles.h rename to rendering/opengl33particles.h diff --git a/opengl33precipitation.cpp b/rendering/opengl33precipitation.cpp similarity index 97% rename from opengl33precipitation.cpp rename to rendering/opengl33precipitation.cpp index 308ccec6..e31eb25f 100644 --- a/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/opengl33precipitation.h b/rendering/opengl33precipitation.h similarity index 97% rename from opengl33precipitation.h rename to rendering/opengl33precipitation.h index 0487bd60..9aab5ec5 100644 --- a/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/opengl33renderer.cpp b/rendering/opengl33renderer.cpp similarity index 99% rename from opengl33renderer.cpp rename to rendering/opengl33renderer.cpp index 6d728232..44a0c7a5 100644 --- a/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/opengl33renderer.h b/rendering/opengl33renderer.h similarity index 97% rename from opengl33renderer.h rename to rendering/opengl33renderer.h index 021bef78..04ead7f0 100644 --- a/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/opengl33skydome.cpp b/rendering/opengl33skydome.cpp similarity index 96% rename from opengl33skydome.cpp rename to rendering/opengl33skydome.cpp index 2054a6d0..35e1d8c0 100644 --- a/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/opengl33skydome.h b/rendering/opengl33skydome.h similarity index 100% rename from opengl33skydome.h rename to rendering/opengl33skydome.h diff --git a/openglcamera.cpp b/rendering/openglcamera.cpp similarity index 96% rename from openglcamera.cpp rename to rendering/openglcamera.cpp index f45134fe..97891e63 100644 --- a/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/openglcamera.h b/rendering/openglcamera.h similarity index 97% rename from openglcamera.h rename to rendering/openglcamera.h index ed4c87a4..569a798c 100644 --- a/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/openglcolor.cpp b/rendering/openglcolor.cpp similarity index 87% rename from openglcolor.cpp rename to rendering/openglcolor.cpp index cb427ec3..3ca8ad66 100644 --- a/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/openglcolor.h b/rendering/openglcolor.h similarity index 98% rename from openglcolor.h rename to rendering/openglcolor.h index 3f7d4d8c..f6777bed 100644 --- a/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/openglgeometrybank.cpp b/rendering/openglgeometrybank.cpp similarity index 99% rename from openglgeometrybank.cpp rename to rendering/openglgeometrybank.cpp index 43aeb0f3..ec950c0f 100644 --- a/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/openglgeometrybank.h b/rendering/openglgeometrybank.h similarity index 99% rename from openglgeometrybank.h rename to rendering/openglgeometrybank.h index 7e1d243c..ec6bdd89 100644 --- a/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/opengllight.cpp b/rendering/opengllight.cpp similarity index 95% rename from opengllight.cpp rename to rendering/opengllight.cpp index 7532d498..f29cc5fb 100644 --- a/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/opengllight.h b/rendering/opengllight.h similarity index 95% rename from opengllight.h rename to rendering/opengllight.h index 64880201..1fe71b9d 100644 --- a/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/openglmatrixstack.cpp b/rendering/openglmatrixstack.cpp similarity index 100% rename from openglmatrixstack.cpp rename to rendering/openglmatrixstack.cpp diff --git a/openglmatrixstack.h b/rendering/openglmatrixstack.h similarity index 100% rename from openglmatrixstack.h rename to rendering/openglmatrixstack.h diff --git a/openglparticles.cpp b/rendering/openglparticles.cpp similarity index 97% rename from openglparticles.cpp rename to rendering/openglparticles.cpp index 4b4e0163..cdb0a66f 100644 --- a/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/openglparticles.h b/rendering/openglparticles.h similarity index 100% rename from openglparticles.h rename to rendering/openglparticles.h diff --git a/openglprecipitation.cpp b/rendering/openglprecipitation.cpp similarity index 97% rename from openglprecipitation.cpp rename to rendering/openglprecipitation.cpp index e06e1bc7..fc93b2a9 100644 --- a/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/openglprecipitation.h b/rendering/openglprecipitation.h similarity index 97% rename from openglprecipitation.h rename to rendering/openglprecipitation.h index ced4fddf..a0bb2dcd 100644 --- a/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/openglrenderer.cpp b/rendering/openglrenderer.cpp similarity index 99% rename from openglrenderer.cpp rename to rendering/openglrenderer.cpp index 4c35946d..386a725e 100644 --- a/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/openglrenderer.h b/rendering/openglrenderer.h similarity index 97% rename from openglrenderer.h rename to rendering/openglrenderer.h index a055da12..aa01a805 100644 --- a/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/openglskydome.cpp b/rendering/openglskydome.cpp similarity index 98% rename from openglskydome.cpp rename to rendering/openglskydome.cpp index 6c2f7b09..1ff66548 100644 --- a/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/openglskydome.h b/rendering/openglskydome.h similarity index 100% rename from openglskydome.h rename to rendering/openglskydome.h diff --git a/particles.cpp b/rendering/particles.cpp similarity index 98% rename from particles.cpp rename to rendering/particles.cpp index 58bc2f22..9ec3839f 100644 --- a/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/particles.h b/rendering/particles.h similarity index 99% rename from particles.h rename to rendering/particles.h index cb1d6785..5ee44230 100644 --- a/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/precipitation.cpp b/rendering/precipitation.cpp similarity index 94% rename from precipitation.cpp rename to rendering/precipitation.cpp index d5968895..fdb4d3d1 100644 --- a/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/precipitation.h b/rendering/precipitation.h similarity index 100% rename from precipitation.h rename to rendering/precipitation.h diff --git a/renderer.cpp b/rendering/renderer.cpp similarity index 94% rename from renderer.cpp rename to rendering/renderer.cpp index 2dc24bdb..610473a3 100644 --- a/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/renderer.h b/rendering/renderer.h similarity index 98% rename from renderer.h rename to rendering/renderer.h index e30ac645..89eb7c80 100644 --- a/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/screenshot.cpp b/rendering/screenshot.cpp similarity index 94% rename from screenshot.cpp rename to rendering/screenshot.cpp index 1685f64a..285679b7 100644 --- a/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/screenshot.h b/rendering/screenshot.h similarity index 100% rename from screenshot.h rename to rendering/screenshot.h diff --git a/scene.cpp b/scene/scene.cpp similarity index 99% rename from scene.cpp rename to scene/scene.cpp index 896e1987..d147f0d7 100644 --- a/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.h b/scene/scene.h similarity index 98% rename from scene.h rename to scene/scene.h index dd430eaf..df641d02 100644 --- a/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/sceneeditor.cpp b/scene/sceneeditor.cpp similarity index 95% rename from sceneeditor.cpp rename to scene/sceneeditor.cpp index 6c6c0420..792de5a1 100644 --- a/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/sceneeditor.h b/scene/sceneeditor.h similarity index 98% rename from sceneeditor.h rename to scene/sceneeditor.h index 75e0ff6c..8b0344ee 100644 --- a/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/scenenode.cpp b/scene/scenenode.cpp similarity index 99% rename from scenenode.cpp rename to scene/scenenode.cpp index 1ad0d021..38fe7f02 100644 --- a/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/scenenode.h b/scene/scenenode.h similarity index 99% rename from scenenode.h rename to scene/scenenode.h index 89598280..fb0959a7 100644 --- a/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/scenenodegroups.cpp b/scene/scenenodegroups.cpp similarity index 98% rename from scenenodegroups.cpp rename to scene/scenenodegroups.cpp index 6ce84a12..4ee1f0e4 100644 --- a/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/scenenodegroups.h b/scene/scenenodegroups.h similarity index 98% rename from scenenodegroups.h rename to scene/scenenodegroups.h index d3fa36ad..350fa3d3 100644 --- a/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/sn_utils.cpp b/scene/sn_utils.cpp similarity index 99% rename from sn_utils.cpp rename to scene/sn_utils.cpp index 56b18ff9..292c18c3 100644 --- a/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/sn_utils.h b/scene/sn_utils.h similarity index 100% rename from sn_utils.h rename to scene/sn_utils.h diff --git a/PyInt.cpp b/scripting/PyInt.cpp similarity index 98% rename from PyInt.cpp rename to scripting/PyInt.cpp index d3efbca6..007f732a 100644 --- a/PyInt.cpp +++ b/scripting/PyInt.cpp @@ -7,18 +7,18 @@ obtain one at http://mozilla.org/MPL/2.0/. */ +#include "scripting/PyInt.h" #include "stdafx.h" -#include "PyInt.h" -#include "dictionary.h" -#include "application.h" -#include "Logs.h" -#include "Globals.h" +#include "application/application.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" +#include "utilities/dictionary.h" #ifdef __GNUC__ #pragma GCC diagnostic ignored "-Wwrite-strings" #endif -#include +#include void render_task::run() { diff --git a/PyInt.h b/scripting/PyInt.h similarity index 97% rename from PyInt.h rename to scripting/PyInt.h index 70341227..eb2f423a 100644 --- a/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/PyIntStub.cpp b/scripting/PyIntStub.cpp similarity index 95% rename from PyIntStub.cpp rename to scripting/PyIntStub.cpp index d19290b1..767228e4 100644 --- a/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/ladderlogic.cpp b/scripting/ladderlogic.cpp similarity index 99% rename from ladderlogic.cpp rename to scripting/ladderlogic.cpp index 62fff1b1..56699818 100644 --- a/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/ladderlogic.h b/scripting/ladderlogic.h similarity index 99% rename from ladderlogic.h rename to scripting/ladderlogic.h index 2ec9f144..f05afa76 100644 --- a/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/lua.cpp b/scripting/lua.cpp similarity index 96% rename from lua.cpp rename to scripting/lua.cpp index ede8e197..c6585e76 100644 --- a/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/lua.h b/scripting/lua.h similarity index 100% rename from lua.h rename to scripting/lua.h diff --git a/lua_ffi.h b/scripting/lua_ffi.h similarity index 100% rename from lua_ffi.h rename to scripting/lua_ffi.h diff --git a/pythonscreenviewer.cpp b/scripting/pythonscreenviewer.cpp similarity index 98% rename from pythonscreenviewer.cpp rename to scripting/pythonscreenviewer.cpp index 9d323397..fa15e9fa 100644 --- a/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/pythonscreenviewer.h b/scripting/pythonscreenviewer.h similarity index 94% rename from pythonscreenviewer.h rename to scripting/pythonscreenviewer.h index 1c16d5e5..bd0634c3 100644 --- a/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.cpp b/simulation/simulation.cpp similarity index 96% rename from simulation.cpp rename to simulation/simulation.cpp index b40782c1..390970df 100644 --- a/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.h b/simulation/simulation.h similarity index 93% rename from simulation.h rename to simulation/simulation.h index 6cc8ea53..09ea4d42 100644 --- a/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/simulationenvironment.cpp b/simulation/simulationenvironment.cpp similarity index 98% rename from simulationenvironment.cpp rename to simulation/simulationenvironment.cpp index 0006899f..e7bae9ca 100644 --- a/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/simulationenvironment.h b/simulation/simulationenvironment.h similarity index 91% rename from simulationenvironment.h rename to simulation/simulationenvironment.h index 3f0759e7..f4114d53 100644 --- a/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/simulationsounds.cpp b/simulation/simulationsounds.cpp similarity index 84% rename from simulationsounds.cpp rename to simulation/simulationsounds.cpp index 16703726..43005589 100644 --- a/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/simulationsounds.h b/simulation/simulationsounds.h similarity index 95% rename from simulationsounds.h rename to simulation/simulationsounds.h index f3c2717f..b1ef7bbd 100644 --- a/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/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp similarity index 98% rename from simulationstateserializer.cpp rename to simulation/simulationstateserializer.cpp index b7274691..cbd7dd53 100644 --- a/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/simulationstateserializer.h b/simulation/simulationstateserializer.h similarity index 98% rename from simulationstateserializer.h rename to simulation/simulationstateserializer.h index 67ba7ad8..fb0dd4ed 100644 --- a/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/simulationtime.cpp b/simulation/simulationtime.cpp similarity index 98% rename from simulationtime.cpp rename to simulation/simulationtime.cpp index 70230b95..0a0c5711 100644 --- a/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/simulationtime.h b/simulation/simulationtime.h similarity index 100% rename from simulationtime.h rename to simulation/simulationtime.h 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/Classes.h b/utilities/Classes.h similarity index 100% rename from Classes.h rename to utilities/Classes.h diff --git a/Float3d.cpp b/utilities/Float3d.cpp similarity index 95% rename from Float3d.cpp rename to utilities/Float3d.cpp index de7c66fc..29a63456 100644 --- a/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/Float3d.h b/utilities/Float3d.h similarity index 100% rename from Float3d.h rename to utilities/Float3d.h diff --git a/Globals.cpp b/utilities/Globals.cpp similarity index 99% rename from Globals.cpp rename to utilities/Globals.cpp index 00dc8e8f..6e456e4d 100644 --- a/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" #include diff --git a/Globals.h b/utilities/Globals.h similarity index 98% rename from Globals.h rename to utilities/Globals.h index 4cf85f5e..e2bb279b 100644 --- a/Globals.h +++ b/utilities/Globals.h @@ -9,22 +9,22 @@ 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 "entt/entity/registry.hpp" #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/Logs.cpp b/utilities/Logs.cpp similarity index 98% rename from Logs.cpp rename to utilities/Logs.cpp index d8610dcc..b6a09a8d 100644 --- a/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/Logs.h b/utilities/Logs.h similarity index 100% rename from Logs.h rename to utilities/Logs.h diff --git a/Names.h b/utilities/Names.h similarity index 100% rename from Names.h rename to utilities/Names.h diff --git a/Timer.cpp b/utilities/Timer.cpp similarity index 97% rename from Timer.cpp rename to utilities/Timer.cpp index 2e0e2b43..5cc9f93a 100644 --- a/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/Timer.h b/utilities/Timer.h similarity index 100% rename from Timer.h rename to utilities/Timer.h diff --git a/color.h b/utilities/color.h similarity index 100% rename from color.h rename to utilities/color.h diff --git a/comparison.h b/utilities/comparison.h similarity index 100% rename from comparison.h rename to utilities/comparison.h diff --git a/crashreporter.cpp b/utilities/crashreporter.cpp similarity index 100% rename from crashreporter.cpp rename to utilities/crashreporter.cpp diff --git a/crashreporter.h b/utilities/crashreporter.h similarity index 100% rename from crashreporter.h rename to utilities/crashreporter.h diff --git a/dictionary.cpp b/utilities/dictionary.cpp similarity index 89% rename from dictionary.cpp rename to utilities/dictionary.cpp index b33b89da..244b5a51 100644 --- a/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/dictionary.h b/utilities/dictionary.h similarity index 100% rename from dictionary.h rename to utilities/dictionary.h diff --git a/dumb3d.cpp b/utilities/dumb3d.cpp similarity index 99% rename from dumb3d.cpp rename to utilities/dumb3d.cpp index 187777ee..7eb28abc 100644 --- a/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/dumb3d.h b/utilities/dumb3d.h similarity index 100% rename from dumb3d.h rename to utilities/dumb3d.h diff --git a/headtrack.cpp b/utilities/headtrack.cpp similarity index 96% rename from headtrack.cpp rename to utilities/headtrack.cpp index c60910d1..caf62bee 100644 --- a/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/headtrack.h b/utilities/headtrack.h similarity index 100% rename from headtrack.h rename to utilities/headtrack.h diff --git a/motiontelemetry.cpp b/utilities/motiontelemetry.cpp similarity index 94% rename from motiontelemetry.cpp rename to utilities/motiontelemetry.cpp index ead7bf25..c7f690f8 100644 --- a/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/motiontelemetry.h b/utilities/motiontelemetry.h similarity index 100% rename from motiontelemetry.h rename to utilities/motiontelemetry.h diff --git a/parser.cpp b/utilities/parser.cpp similarity index 99% rename from parser.cpp rename to utilities/parser.cpp index 81bbccec..9631ebb9 100644 --- a/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/parser.h b/utilities/parser.h similarity index 100% rename from parser.h rename to utilities/parser.h diff --git a/translation.cpp b/utilities/translation.cpp similarity index 99% rename from translation.cpp rename to utilities/translation.cpp index 840d1a0b..ddf8c031 100644 --- a/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/translation.h b/utilities/translation.h similarity index 100% rename from translation.h rename to utilities/translation.h diff --git a/uart.cpp b/utilities/uart.cpp similarity index 98% rename from uart.cpp rename to utilities/uart.cpp index ad26b15a..525453bf 100644 --- a/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/uart.h b/utilities/uart.h similarity index 99% rename from uart.h rename to utilities/uart.h index 78c6d194..a418dc22 100644 --- a/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.cpp b/utilities/utilities.cpp similarity index 99% rename from utilities.cpp rename to utilities/utilities.cpp index 917fef05..7d4cfd6d 100644 --- a/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.h b/utilities/utilities.h similarity index 99% rename from utilities.h rename to utilities/utilities.h index 1a072e7d..0844b085 100644 --- a/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/AirCoupler.cpp b/vehicle/AirCoupler.cpp similarity index 95% rename from AirCoupler.cpp rename to vehicle/AirCoupler.cpp index 70e1c3e8..cf452edf 100644 --- a/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/AirCoupler.h b/vehicle/AirCoupler.h similarity index 98% rename from AirCoupler.h rename to vehicle/AirCoupler.h index 8d303568..77f91f4c 100644 --- a/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/Button.cpp b/vehicle/Button.cpp similarity index 96% rename from Button.cpp rename to vehicle/Button.cpp index 7eabef7b..6649a4de 100644 --- a/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/Button.h b/vehicle/Button.h similarity index 97% rename from Button.h rename to vehicle/Button.h index 80f365e0..5e43056f 100644 --- a/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/Camera.cpp b/vehicle/Camera.cpp similarity index 97% rename from Camera.cpp rename to vehicle/Camera.cpp index 6b46fa6c..cff526d3 100644 --- a/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/Camera.h b/vehicle/Camera.h similarity index 94% rename from Camera.h rename to vehicle/Camera.h index dce04079..ee5a259c 100644 --- a/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/Driver.cpp b/vehicle/Driver.cpp similarity index 99% rename from Driver.cpp rename to vehicle/Driver.cpp index e350979f..ae6b256d 100644 --- a/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/Driver.h b/vehicle/Driver.h similarity index 99% rename from Driver.h rename to vehicle/Driver.h index b0da06f3..554ffc87 100644 --- a/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/DynObj.cpp b/vehicle/DynObj.cpp similarity index 99% rename from DynObj.cpp rename to vehicle/DynObj.cpp index 3120277c..63e6940d 100644 --- a/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/DynObj.h b/vehicle/DynObj.h similarity index 99% rename from DynObj.h rename to vehicle/DynObj.h index 1f6c8c75..70748d69 100644 --- a/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/Gauge.cpp b/vehicle/Gauge.cpp similarity index 98% rename from Gauge.cpp rename to vehicle/Gauge.cpp index 71f78d32..cf5c2c98 100644 --- a/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/Gauge.h b/vehicle/Gauge.h similarity index 98% rename from Gauge.h rename to vehicle/Gauge.h index 1bc3fdf8..c8302666 100644 --- a/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/Train.cpp b/vehicle/Train.cpp similarity index 99% rename from Train.cpp rename to vehicle/Train.cpp index 1fdaec8f..50fdb489 100644 --- a/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/Train.h b/vehicle/Train.h similarity index 99% rename from Train.h rename to vehicle/Train.h index 7ea49776..2831e825 100644 --- a/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/Curve.h b/world/Curve.h similarity index 100% rename from Curve.h rename to world/Curve.h diff --git a/EvLaunch.cpp b/world/EvLaunch.cpp similarity index 97% rename from EvLaunch.cpp rename to world/EvLaunch.cpp index 5e88567e..a59af9d1 100644 --- a/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/EvLaunch.h b/world/EvLaunch.h similarity index 97% rename from EvLaunch.h rename to world/EvLaunch.h index 15b18515..a38e9e4a 100644 --- a/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/Event.cpp b/world/Event.cpp similarity index 99% rename from Event.cpp rename to world/Event.cpp index 03a8780e..015ad7b2 100644 --- a/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/Event.h b/world/Event.h similarity index 98% rename from Event.h rename to world/Event.h index 44a9c40d..2f67d8bb 100644 --- a/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/MemCell.cpp b/world/MemCell.cpp similarity index 98% rename from MemCell.cpp rename to world/MemCell.cpp index 751543fb..a5e79ce0 100644 --- a/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/MemCell.h b/world/MemCell.h similarity index 96% rename from MemCell.h rename to world/MemCell.h index e3671bbf..c2960f27 100644 --- a/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/Segment.cpp b/world/Segment.cpp similarity index 99% rename from Segment.cpp rename to world/Segment.cpp index a277b7a6..8e31ac8a 100644 --- a/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/Segment.h b/world/Segment.h similarity index 97% rename from Segment.h rename to world/Segment.h index d9b06575..3e1b64c1 100644 --- a/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/Spring.cpp b/world/Spring.cpp similarity index 98% rename from Spring.cpp rename to world/Spring.cpp index 59e5c55d..05ec3a9b 100644 --- a/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/Spring.h b/world/Spring.h similarity index 97% rename from Spring.h rename to world/Spring.h index 761bff53..d527041d 100644 --- a/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/Track.cpp b/world/Track.cpp similarity index 99% rename from Track.cpp rename to world/Track.cpp index 9bd3a49a..f1fb356b 100644 --- a/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/Track.h b/world/Track.h similarity index 99% rename from Track.h rename to world/Track.h index c156fa7b..ffc622db 100644 --- a/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/Traction.cpp b/world/Traction.cpp similarity index 99% rename from Traction.cpp rename to world/Traction.cpp index 1a2811c9..db7d033b 100644 --- a/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/Traction.h b/world/Traction.h similarity index 97% rename from Traction.h rename to world/Traction.h index 7714b874..638f46b0 100644 --- a/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/TractionPower.cpp b/world/TractionPower.cpp similarity index 98% rename from TractionPower.cpp rename to world/TractionPower.cpp index 36edeacf..bb7862c0 100644 --- a/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/TractionPower.h b/world/TractionPower.h similarity index 96% rename from TractionPower.h rename to world/TractionPower.h index 3bdeacf1..d84b6b81 100644 --- a/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/TrkFoll.cpp b/world/TrkFoll.cpp similarity index 98% rename from TrkFoll.cpp rename to world/TrkFoll.cpp index a079a7e7..40871030 100644 --- a/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/TrkFoll.h b/world/TrkFoll.h similarity index 97% rename from TrkFoll.h rename to world/TrkFoll.h index c2a118f5..3bcea7ae 100644 --- a/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/mtable.cpp b/world/mtable.cpp similarity index 99% rename from mtable.cpp rename to world/mtable.cpp index ac2546ef..c6460248 100644 --- a/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/mtable.h b/world/mtable.h similarity index 98% rename from mtable.h rename to world/mtable.h index 15b66940..c58d120f 100644 --- a/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/station.cpp b/world/station.cpp similarity index 97% rename from station.cpp rename to world/station.cpp index 8c6f2e57..7bd18587 100644 --- a/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/station.h b/world/station.h similarity index 95% rename from station.h rename to world/station.h index 7d6e184d..ecc60992 100644 --- a/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 {