16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-09-01 09:19:19 +02:00

refactor: moving Train to separate directory

This commit is contained in:
jerrrrycho
2026-08-01 17:24:34 +02:00
parent 75ea91a648
commit afa3cb3f7c
30 changed files with 29 additions and 29 deletions

View File

@@ -97,15 +97,15 @@ set(SOURCES
"world/Track.cpp" "world/Track.cpp"
"world/Traction.cpp" "world/Traction.cpp"
"world/TractionPower.cpp" "world/TractionPower.cpp"
"vehicle/Train.cpp" "vehicle/train/Train.cpp"
"vehicle/Train_Commands_Auxiliary.cpp" "vehicle/train/TrainCommandsAuxiliary.cpp"
"vehicle/Train_Commands_Brakes.cpp" "vehicle/train/TrainCommandsBrakes.cpp"
"vehicle/Train_Commands_Controls.cpp" "vehicle/train/TrainCommandsControls.cpp"
"vehicle/Train_Commands_Doors.cpp" "vehicle/train/TrainCommandsDoors.cpp"
"vehicle/Train_Commands_Electrical.cpp" "vehicle/train/TrainCommandsElectrical.cpp"
"vehicle/Train_Commands_Lights.cpp" "vehicle/train/TrainCommandsLights.cpp"
"vehicle/Train_Commands_Misc.cpp" "vehicle/train/TrainCommandsMisc.cpp"
"vehicle/Train_Commands_Radio.cpp" "vehicle/train/TrainCommandsRadio.cpp"
"world/TrkFoll.cpp" "world/TrkFoll.cpp"
"vehicle/AirCoupler.cpp" "vehicle/AirCoupler.cpp"
"model/AnimModel.cpp" "model/AnimModel.cpp"

View File

@@ -18,7 +18,7 @@ http://mozilla.org/MPL/2.0/.
#include "utilities/utilities.h" #include "utilities/utilities.h"
#include "simulation/simulation.h" #include "simulation/simulation.h"
#include "simulation/simulationsounds.h" #include "simulation/simulationsounds.h"
#include "vehicle/Train.h" #include "../vehicle/train/Train.h"
#include "utilities/dictionary.h" #include "utilities/dictionary.h"
#include "scene/sceneeditor.h" #include "scene/sceneeditor.h"
#include "rendering/renderer.h" #include "rendering/renderer.h"
@@ -26,7 +26,7 @@ http://mozilla.org/MPL/2.0/.
#include "utilities/Logs.h" #include "utilities/Logs.h"
#include "rendering/screenshot.h" #include "rendering/screenshot.h"
#include "utilities/translation.h" #include "utilities/translation.h"
#include "vehicle/Train.h" #include "../vehicle/train/Train.h"
#include "utilities/Timer.h" #include "utilities/Timer.h"
#include "utilities/dictionary.h" #include "utilities/dictionary.h"
#include "version_info.h" #include "version_info.h"

View File

@@ -20,7 +20,7 @@ http://mozilla.org/MPL/2.0/.
#include "scene/scene.h" #include "scene/scene.h"
#include "rendering/lightarray.h" #include "rendering/lightarray.h"
#include "rendering/particles.h" #include "rendering/particles.h"
#include "vehicle/Train.h" #include "../vehicle/train/Train.h"
#include "vehicle/Driver.h" #include "vehicle/Driver.h"
#include "vehicle/DynObj.h" #include "vehicle/DynObj.h"
#include "model/Model3d.h" #include "model/Model3d.h"

View File

@@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/.
#include "application/application.h" #include "application/application.h"
#include "utilities/translation.h" #include "utilities/translation.h"
#include "simulation/simulation.h" #include "simulation/simulation.h"
#include "vehicle/Train.h" #include "../vehicle/train/Train.h"
#include "model/AnimModel.h" #include "model/AnimModel.h"
#include "rendering/renderer.h" #include "rendering/renderer.h"

View File

@@ -21,7 +21,7 @@ http://mozilla.org/MPL/2.0/.
#include "world/TractionPower.h" #include "world/TractionPower.h"
#include "vehicle/Camera.h" #include "vehicle/Camera.h"
#include "world/mtable.h" #include "world/mtable.h"
#include "vehicle/Train.h" #include "../vehicle/train/Train.h"
#include "vehicle/Driver.h" #include "vehicle/Driver.h"
#include "model/AnimModel.h" #include "model/AnimModel.h"
#include "vehicle/DynObj.h" #include "vehicle/DynObj.h"

View File

@@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/.
#include "vehicle/Camera.h" #include "vehicle/Camera.h"
#include "utilities/Logs.h" #include "utilities/Logs.h"
#include "simulation/simulation.h" #include "simulation/simulation.h"
#include "vehicle/Train.h" #include "../vehicle/train/Train.h"
namespace audio { namespace audio {

View File

@@ -13,7 +13,7 @@ http://mozilla.org/MPL/2.0/.
#include "utilities/parser.h" #include "utilities/parser.h"
#include "utilities/Globals.h" #include "utilities/Globals.h"
#include "vehicle/Camera.h" #include "vehicle/Camera.h"
#include "vehicle/Train.h" #include "../vehicle/train/Train.h"
#include "vehicle/DynObj.h" #include "vehicle/DynObj.h"
#include "simulation/simulation.h" #include "simulation/simulation.h"
#include "audio/audiorenderer_extra.h" #include "audio/audiorenderer_extra.h"

View File

@@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/.
#include "utilities/Logs.h" #include "utilities/Logs.h"
#include "utilities/Timer.h" #include "utilities/Timer.h"
#include "simulation/simulation.h" #include "simulation/simulation.h"
#include "vehicle/Train.h" #include "../vehicle/train/Train.h"
namespace simulation { namespace simulation {

View File

@@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/.
#include "utilities/Globals.h" #include "utilities/Globals.h"
#include "utilities/Timer.h" #include "utilities/Timer.h"
#include "simulation/simulation.h" #include "simulation/simulation.h"
#include "vehicle/Train.h" #include "../vehicle/train/Train.h"
#include "model/AnimModel.h" #include "model/AnimModel.h"
#include "rendering/renderer.h" #include "rendering/renderer.h"
#include "application/uilayer.h" #include "application/uilayer.h"

View File

@@ -12,7 +12,7 @@ http://mozilla.org/MPL/2.0/.
#include "utilities/color.h" #include "utilities/color.h"
#include "utilities/Globals.h" #include "utilities/Globals.h"
#include "utilities/Timer.h" #include "utilities/Timer.h"
#include "vehicle/Train.h" #include "../vehicle/train/Train.h"
#include "vehicle/Camera.h" #include "vehicle/Camera.h"
#include "simulation/simulation.h" #include "simulation/simulation.h"
#include "utilities/Logs.h" #include "utilities/Logs.h"

View File

@@ -16,7 +16,7 @@ http://mozilla.org/MPL/2.0/.
#include "utilities/Timer.h" #include "utilities/Timer.h"
#include "simulation/simulation.h" #include "simulation/simulation.h"
#include "simulation/simulationtime.h" #include "simulation/simulationtime.h"
#include "vehicle/Train.h" #include "../vehicle/train/Train.h"
#include "vehicle/DynObj.h" #include "vehicle/DynObj.h"
#include "model/AnimModel.h" #include "model/AnimModel.h"
#include "world/Traction.h" #include "world/Traction.h"

View File

@@ -13,7 +13,7 @@ http://mozilla.org/MPL/2.0/.
#include "utilities/Globals.h" #include "utilities/Globals.h"
#include "utilities/Timer.h" #include "utilities/Timer.h"
#include "simulation/simulation.h" #include "simulation/simulation.h"
#include "vehicle/Train.h" #include "../vehicle/train/Train.h"
basic_precipitation::~basic_precipitation() { basic_precipitation::~basic_precipitation() {
// TODO: release allocated resources // TODO: release allocated resources

View File

@@ -24,7 +24,7 @@ http://mozilla.org/MPL/2.0/.
#include "rendering/lightarray.h" #include "rendering/lightarray.h"
#include "rendering/particles.h" #include "rendering/particles.h"
#include "scene/scene.h" #include "scene/scene.h"
#include "vehicle/Train.h" #include "../vehicle/train/Train.h"
#include "application/application.h" #include "application/application.h"
#include "utilities/Logs.h" #include "utilities/Logs.h"
#include "vehicle/Driver.h" #include "vehicle/Driver.h"

View File

@@ -12,7 +12,7 @@ http://mozilla.org/MPL/2.0/.
#include "simulation/simulationstateserializer.h" #include "simulation/simulationstateserializer.h"
#include "utilities/Classes.h" #include "utilities/Classes.h"
#include "world/Event.h" #include "world/Event.h"
#include "vehicle/Train.h" #include "../vehicle/train/Train.h"
#include "rendering/particles.h" #include "rendering/particles.h"
#ifdef WITH_LUA #ifdef WITH_LUA

View File

@@ -2,7 +2,7 @@
#include "utilities/motiontelemetry.h" #include "utilities/motiontelemetry.h"
#include "utilities/Globals.h" #include "utilities/Globals.h"
#include "utilities/Logs.h" #include "utilities/Logs.h"
#include "vehicle/Train.h" #include "../vehicle/train/Train.h"
#include "utilities/Timer.h" #include "utilities/Timer.h"
#include "vehicle/Driver.h" #include "vehicle/Driver.h"
#include "simulation/simulation.h" #include "simulation/simulation.h"

View File

@@ -3,7 +3,7 @@
#include "utilities/Globals.h" #include "utilities/Globals.h"
#include "simulation/simulation.h" #include "simulation/simulation.h"
#include "vehicle/Train.h" #include "../vehicle/train/Train.h"
#include "utilities/parser.h" #include "utilities/parser.h"
#include "utilities/Logs.h" #include "utilities/Logs.h"
#include "utilities/utilities.h" #include "utilities/utilities.h"

View File

@@ -18,7 +18,7 @@ http://mozilla.org/MPL/2.0/.
#include "utilities/Globals.h" #include "utilities/Globals.h"
#include "utilities/translation.h" #include "utilities/translation.h"
#include "utilities/Logs.h" #include "utilities/Logs.h"
#include "vehicle/Train.h" #include "train/Train.h"
#include "world/mtable.h" #include "world/mtable.h"
#include "vehicle/DynObj.h" #include "vehicle/DynObj.h"
#include "world/Event.h" #include "world/Event.h"

View File

@@ -17,7 +17,7 @@ http://mozilla.org/MPL/2.0/.
#include "simulation/simulation.h" #include "simulation/simulation.h"
#include "rendering/lightarray.h" #include "rendering/lightarray.h"
#include "vehicle/Train.h" #include "train/Train.h"
#include "vehicle/Driver.h" #include "vehicle/Driver.h"
#include "utilities/Globals.h" #include "utilities/Globals.h"
#include "utilities/Timer.h" #include "utilities/Timer.h"

View File

@@ -2,7 +2,7 @@
#include "widgets/map.h" #include "widgets/map.h"
#include "widgets/map_objects.h" #include "widgets/map_objects.h"
#include "utilities/Logs.h" #include "utilities/Logs.h"
#include "vehicle/Train.h" #include "../vehicle/train/Train.h"
#include "vehicle/Camera.h" #include "vehicle/Camera.h"
#include "simulation/simulation.h" #include "simulation/simulation.h"
#include "vehicle/Driver.h" #include "vehicle/Driver.h"

View File

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