eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 09:19:18 +02:00
Code Issues 123 Wiki Activity

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

Browse Source
This commit is contained in:
Hirek
2026-03-14 22:11:49 +01:00
parent 5453182d28 0715437108
commit b8f5282a39
297 changed files with 1149 additions and 1138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

225
CMakeLists.txt
View File

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

8
Console.cpp
View File

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

4
Console.h
View File

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

2
Console/LPT.cpp
View File

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

2
Console/PoKeys55.cpp
View File

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

6
EU07.cpp
View File

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

6
McZapkie/MOVER.h
View File

@@ -12,7 +12,7 @@ http://mozilla.org/MPL/2.0/.
//Q: 20160805 - odlaczenie pliku fizyki .pas od kompilacji //Q: 20160805 - odlaczenie pliku fizyki .pas od kompilacji
#include <map> #include <map>
#include "hamulce.h" #include "hamulce.h"
#include "ladderlogic.h" #include "scripting/ladderlogic.h"
/* /*
MaSzyna EU07 locomotive simulator MaSzyna EU07 locomotive simulator
Copyright (C) 2001-2004 Maciej Czapkiewicz and others 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/dumb3d.h"
#include "utilities.h" #include "utilities/utilities.h"
extern int ConversionError; extern int ConversionError;

12
McZapkie/Mover.cpp
View File

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

2
McZapkie/Oerlikon_ESt.cpp
View File

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

2
McZapkie/hamulce.cpp
View File

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

40
application.cpp → application/application.cpp
View File

@@ -8,37 +8,37 @@ http://mozilla.org/MPL/2.0/.
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "application.h" #include "application/application.h"
#include "drivermode.h" #include "application/drivermode.h"
#include "editormode.h" #include "application/editormode.h"
#include "scenarioloadermode.h" #include "application/scenarioloadermode.h"
#include "launcher/launchermode.h" #include "launcher/launchermode.h"
#include "Globals.h" #include "utilities/Globals.h"
#include "simulation.h" #include "simulation/simulation.h"
#include "simulationsounds.h" #include "simulation/simulationsounds.h"
#include "Train.h" #include "vehicle/Train.h"
#include "dictionary.h" #include "utilities/dictionary.h"
#include "sceneeditor.h" #include "scene/sceneeditor.h"
#include "renderer.h" #include "rendering/renderer.h"
#include "uilayer.h" #include "application/uilayer.h"
#include "Logs.h" #include "utilities/Logs.h"
#include "screenshot.h" #include "rendering/screenshot.h"
#include "translation.h" #include "utilities/translation.h"
#include "Train.h" #include "vehicle/Train.h"
#include "Timer.h" #include "utilities/Timer.h"
#include "dictionary.h" #include "utilities/dictionary.h"
#include "version_info.h" #include "version_info.h"
#include "ref/discord-rpc/include/discord_rpc.h" #include "ref/discord-rpc/include/discord_rpc.h"
#include <chrono> #include <chrono>
#include "translation.h" #include "utilities/translation.h"
#if WITH_DISCORD_RPC #if WITH_DISCORD_RPC
#include <discord_rpc.h> #include <discord_rpc.h>
#endif #endif
#include <chrono> #include <chrono>
#include "translation.h" #include "utilities/translation.h"
#ifdef _WIN32 #ifdef _WIN32
#pragma comment(lib, "dsound.lib") #pragma comment(lib, "dsound.lib")

8
application.h → application/application.h
View File

@@ -9,12 +9,12 @@ http://mozilla.org/MPL/2.0/.
#pragma once #pragma once
#include "applicationmode.h" #include "application/applicationmode.h"
#include "PyInt.h" #include "scripting/PyInt.h"
#include "network/manager.h" #include "network/manager.h"
#include "headtrack.h" #include "utilities/headtrack.h"
#ifdef WITH_UART #ifdef WITH_UART
#include "uart.h" #include "utilities/uart.h"
#endif #endif
class eu07_application { class eu07_application {

2
applicationmode.h → application/applicationmode.h
View File

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
#pragma once #pragma once
#include "uilayer.h" #include "application/uilayer.h"
// component implementing specific mode of application behaviour // component implementing specific mode of application behaviour
// base interface // base interface

4
driverhints.cpp → application/driverhints.cpp
View File

@@ -8,8 +8,8 @@ http://mozilla.org/MPL/2.0/.
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "Driver.h" #include "vehicle/Driver.h"
#include "Globals.h" #include "utilities/Globals.h"
void void
TController::hint( driver_hint const Value, hintpredicate const Predicate, float const Predicateparameter ) { TController::hint( driver_hint const Value, hintpredicate const Predicate, float const Predicateparameter ) {

4
driverhints.h → application/driverhints.h
View File

@@ -3,7 +3,7 @@
#define DRIVER_HINT_DEF(a, b) a, #define DRIVER_HINT_DEF(a, b) a,
enum class driver_hint { enum class driver_hint {
#include "driverhints_def.h" #include "application/driverhints_def.h"
}; };
#undef DRIVER_HINT_DEF #undef DRIVER_HINT_DEF
@@ -14,7 +14,7 @@ enum class driver_hint {
const char *driver_hints_texts[] = const char *driver_hints_texts[] =
{ {
#include "driverhints_def.h" #include "application/driverhints_def.h"
}; };
#undef DRIVER_HINT_DEF #undef DRIVER_HINT_DEF

0
driverhints_def.h → application/driverhints_def.h
View File

42
drivermode.cpp → application/drivermode.cpp
View File

@@ -8,28 +8,28 @@ http://mozilla.org/MPL/2.0/.
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "drivermode.h" #include "application/drivermode.h"
#include "driveruilayer.h" #include "application/driveruilayer.h"
#include "Globals.h" #include "utilities/Globals.h"
#include "application.h" #include "application/application.h"
#include "translation.h" #include "utilities/translation.h"
#include "simulation.h" #include "simulation/simulation.h"
#include "simulationtime.h" #include "simulation/simulationtime.h"
#include "simulationenvironment.h" #include "simulation/simulationenvironment.h"
#include "scene.h" #include "scene/scene.h"
#include "lightarray.h" #include "rendering/lightarray.h"
#include "particles.h" #include "rendering/particles.h"
#include "Train.h" #include "vehicle/Train.h"
#include "Driver.h" #include "vehicle/Driver.h"
#include "DynObj.h" #include "vehicle/DynObj.h"
#include "Model3d.h" #include "model/Model3d.h"
#include "Event.h" #include "world/Event.h"
#include "messaging.h" #include "input/messaging.h"
#include "Timer.h" #include "utilities/Timer.h"
#include "renderer.h" #include "rendering/renderer.h"
#include "utilities.h" #include "utilities/utilities.h"
#include "Logs.h" #include "utilities/Logs.h"
/* /*
namespace input { namespace input {

16
drivermode.h → application/drivermode.h
View File

@@ -9,19 +9,19 @@ http://mozilla.org/MPL/2.0/.
#pragma once #pragma once
#include "applicationmode.h" #include "application/applicationmode.h"
#include "driverkeyboardinput.h" #include "input/driverkeyboardinput.h"
#include "drivermouseinput.h" #include "input/drivermouseinput.h"
#include "gamepadinput.h" #include "input/gamepadinput.h"
#include "Console.h" #include "Console.h"
#include "Camera.h" #include "vehicle/Camera.h"
#include "Classes.h" #include "utilities/Classes.h"
#ifdef WITH_UART #ifdef WITH_UART
#include "uart.h" #include "utilities/uart.h"
#endif #endif
#ifdef WITH_ZMQ #ifdef WITH_ZMQ
#include "zmq_input.h" #include "input/zmq_input.h"
#endif #endif
class driver_mode : public application_mode { class driver_mode : public application_mode {

16
driveruilayer.cpp → application/driveruilayer.cpp
View File

@@ -8,15 +8,15 @@ http://mozilla.org/MPL/2.0/.
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "driveruilayer.h" #include "application/driveruilayer.h"
#include "Globals.h" #include "utilities/Globals.h"
#include "application.h" #include "application/application.h"
#include "translation.h" #include "utilities/translation.h"
#include "simulation.h" #include "simulation/simulation.h"
#include "Train.h" #include "vehicle/Train.h"
#include "AnimModel.h" #include "model/AnimModel.h"
#include "renderer.h" #include "rendering/renderer.h"
driver_ui::driver_ui() driver_ui::driver_ui()
{ {

6
driveruilayer.h → application/driveruilayer.h
View File

@@ -9,9 +9,9 @@ http://mozilla.org/MPL/2.0/.
#pragma once #pragma once
#include "uilayer.h" #include "application/uilayer.h"
#include "driveruipanels.h" #include "application/driveruipanels.h"
#include "command.h" #include "input/command.h"
#include "widgets/vehiclelist.h" #include "widgets/vehiclelist.h"
#include "widgets/vehicleparams.h" #include "widgets/vehicleparams.h"

44
driveruipanels.cpp → application/driveruipanels.cpp
View File

@@ -8,34 +8,34 @@ http://mozilla.org/MPL/2.0/.
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "driveruipanels.h" #include "application/driveruipanels.h"
#include "Globals.h" #include "utilities/Globals.h"
#include "application.h" #include "application/application.h"
#include "translation.h" #include "utilities/translation.h"
#include "simulation.h" #include "simulation/simulation.h"
#include "simulationtime.h" #include "simulation/simulationtime.h"
#include "simulationenvironment.h" #include "simulation/simulationenvironment.h"
#include "Timer.h" #include "utilities/Timer.h"
#include "Event.h" #include "world/Event.h"
#include "TractionPower.h" #include "world/TractionPower.h"
#include "Camera.h" #include "vehicle/Camera.h"
#include "mtable.h" #include "world/mtable.h"
#include "Train.h" #include "vehicle/Train.h"
#include "Driver.h" #include "vehicle/Driver.h"
#include "AnimModel.h" #include "model/AnimModel.h"
#include "DynObj.h" #include "vehicle/DynObj.h"
#include "Model3d.h" #include "model/Model3d.h"
#include "renderer.h" #include "rendering/renderer.h"
#include "utilities.h" #include "utilities/utilities.h"
#include "Logs.h" #include "utilities/Logs.h"
#include "widgets/vehicleparams.h" #include "widgets/vehicleparams.h"
#define DRIVER_HINT_CONTENT #define DRIVER_HINT_CONTENT
#include "driverhints.h" #include "application/driverhints.h"
#ifdef WITH_UART #ifdef WITH_UART
#include "uart.h" #include "utilities/uart.h"
#endif #endif
void void

4
driveruipanels.h → application/driveruipanels.h
View File

@@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/.
#pragma once #pragma once
#include "uilayer.h" #include "application/uilayer.h"
#include "Classes.h" #include "utilities/Classes.h"
class drivingaid_panel : public ui_expandable_panel { class drivingaid_panel : public ui_expandable_panel {

24
editormode.cpp → application/editormode.cpp
View File

@@ -8,23 +8,23 @@ http://mozilla.org/MPL/2.0/.
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "editormode.h" #include "application/editormode.h"
#include "editoruilayer.h" #include "application/editoruilayer.h"
#include "application.h" #include "application/application.h"
#include "Globals.h" #include "utilities/Globals.h"
#include "simulation.h" #include "simulation/simulation.h"
#include "simulationtime.h" #include "simulation/simulationtime.h"
#include "simulationenvironment.h" #include "simulation/simulationenvironment.h"
#include "Timer.h" #include "utilities/Timer.h"
#include "Console.h" #include "Console.h"
#include "renderer.h" #include "rendering/renderer.h"
#include "AnimModel.h" #include "model/AnimModel.h"
#include "scene.h" #include "scene/scene.h"
#include "imgui/imgui.h" #include "imgui/imgui.h"
#include "Logs.h" #include "utilities/Logs.h"
#include <cmath> #include <cmath>
#include <functional> #include <functional>
#include <vector> #include <vector>

12
editormode.h → application/editormode.h
View File

@@ -9,12 +9,12 @@ http://mozilla.org/MPL/2.0/.
#pragma once #pragma once
#include "applicationmode.h" #include "application/applicationmode.h"
#include "editormouseinput.h" #include "input/editormouseinput.h"
#include "editorkeyboardinput.h" #include "input/editorkeyboardinput.h"
#include "Camera.h" #include "vehicle/Camera.h"
#include "sceneeditor.h" #include "scene/sceneeditor.h"
#include "scenenode.h" #include "scene/scenenode.h"
class editor_mode : public application_mode class editor_mode : public application_mode
{ {

8
editoruilayer.cpp → application/editoruilayer.cpp
View File

@@ -8,11 +8,11 @@ http://mozilla.org/MPL/2.0/.
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "editoruilayer.h" #include "application/editoruilayer.h"
#include "Globals.h" #include "utilities/Globals.h"
#include "scenenode.h" #include "scene/scenenode.h"
#include "renderer.h" #include "rendering/renderer.h"
editor_ui::editor_ui() editor_ui::editor_ui()
{ {

4
editoruilayer.h → application/editoruilayer.h
View File

@@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/.
#pragma once #pragma once
#include "uilayer.h" #include "application/uilayer.h"
#include "editoruipanels.h" #include "application/editoruipanels.h"
namespace scene namespace scene
{ {

22
editoruipanels.cpp → application/editoruipanels.cpp
View File

@@ -8,18 +8,18 @@ http://mozilla.org/MPL/2.0/.
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "editoruipanels.h" #include "application/editoruipanels.h"
#include "scenenodegroups.h" #include "scene/scenenodegroups.h"
#include "Globals.h" #include "utilities/Globals.h"
#include "Camera.h" #include "vehicle/Camera.h"
#include "AnimModel.h" #include "model/AnimModel.h"
#include "Track.h" #include "world/Track.h"
#include "Event.h" #include "world/Event.h"
#include "MemCell.h" #include "world/MemCell.h"
#include "editoruilayer.h" #include "application/editoruilayer.h"
#include "renderer.h" #include "rendering/renderer.h"
#include "utilities.h" #include "utilities/utilities.h"
void itemproperties_panel::update(scene::basic_node const *Node) void itemproperties_panel::update(scene::basic_node const *Node)
{ {

4
editoruipanels.h → application/editoruipanels.h
View File

@@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/.
#pragma once #pragma once
#include "uilayer.h" #include "application/uilayer.h"
#include "Classes.h" #include "utilities/Classes.h"
/* /*
// helper, associated bool is set when the primary value was changed and expects processing at the observer's leisure // helper, associated bool is set when the primary value was changed and expects processing at the observer's leisure
template<typename Type_> template<typename Type_>

20
scenarioloadermode.cpp → application/scenarioloadermode.cpp
View File

@@ -8,17 +8,17 @@ http://mozilla.org/MPL/2.0/.
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "scenarioloadermode.h" #include "application/scenarioloadermode.h"
#include "Globals.h" #include "utilities/Globals.h"
#include "simulation.h" #include "simulation/simulation.h"
#include "simulationtime.h" #include "simulation/simulationtime.h"
#include "simulationenvironment.h" #include "simulation/simulationenvironment.h"
#include "application.h" #include "application/application.h"
#include "scenarioloaderuilayer.h" #include "application/scenarioloaderuilayer.h"
#include "renderer.h" #include "rendering/renderer.h"
#include "Logs.h" #include "utilities/Logs.h"
#include "translation.h" #include "utilities/translation.h"
scenarioloader_mode::scenarioloader_mode() { scenarioloader_mode::scenarioloader_mode() {
m_userinterface = std::make_shared<scenarioloader_ui>(); m_userinterface = std::make_shared<scenarioloader_ui>();

4
scenarioloadermode.h → application/scenarioloadermode.h
View File

@@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/.
#pragma once #pragma once
#include "applicationmode.h" #include "application/applicationmode.h"
#include "simulation.h" #include "simulation/simulation.h"
class scenarioloader_mode : public application_mode { class scenarioloader_mode : public application_mode {
std::shared_ptr<simulation::deserializer_state> state; std::shared_ptr<simulation::deserializer_state> state;

8
scenarioloaderuilayer.cpp → application/scenarioloaderuilayer.cpp
View File

@@ -7,12 +7,12 @@ obtain one at
http://mozilla.org/MPL/2.0/. http://mozilla.org/MPL/2.0/.
*/ */
#include "scenarioloaderuilayer.h" #include "application/scenarioloaderuilayer.h"
#include "Globals.h" #include "utilities/Globals.h"
#include "translation.h" #include "utilities/translation.h"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include "Logs.h" #include "utilities/Logs.h"
#include <sstream> #include <sstream>
using json = nlohmann::json; using json = nlohmann::json;

2
scenarioloaderuilayer.h → application/scenarioloaderuilayer.h
View File

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
#pragma once #pragma once
#include "uilayer.h" #include "application/uilayer.h"
#include "launcher/deferred_image.h" #include "launcher/deferred_image.h"
class scenarioloader_ui : public ui_layer { class scenarioloader_ui : public ui_layer {

16
uilayer.cpp → application/uilayer.cpp
View File

@@ -8,17 +8,17 @@ http://mozilla.org/MPL/2.0/.
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "uilayer.h" #include "application/uilayer.h"
#include <utility> #include <utility>
#include "Globals.h" #include "utilities/Globals.h"
#include "renderer.h" #include "rendering/renderer.h"
#include "Logs.h" #include "utilities/Logs.h"
#include "simulation.h" #include "simulation/simulation.h"
#include "translation.h" #include "utilities/translation.h"
#include "application.h" #include "application/application.h"
#include "editormode.h" #include "application/editormode.h"
#include "imgui/imgui_impl_glfw.h" #include "imgui/imgui_impl_glfw.h"

2
uilayer.h → application/uilayer.h
View File

@@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/.
#pragma once #pragma once
#include <string> #include <string>
#include "Texture.h" #include "model/Texture.h"
#include "widgets/popup.h" #include "widgets/popup.h"
// GuiLayer -- basic user interface class. draws requested information on top of openGL screen // GuiLayer -- basic user interface class. draws requested information on top of openGL screen

8
uitranscripts.cpp → application/uitranscripts.cpp
View File

@@ -1,9 +1,9 @@
#include "stdafx.h" #include "stdafx.h"
#include "uitranscripts.h" #include "application/uitranscripts.h"
#include "Globals.h" #include "utilities/Globals.h"
#include "parser.h" #include "utilities/parser.h"
#include "utilities.h" #include "utilities/utilities.h"
namespace ui { namespace ui {

0
uitranscripts.h → application/uitranscripts.h
View File

10
audio.cpp → audio/audio.cpp
View File

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

0
audio.h → audio/audio.h
View File

16
audiorenderer.cpp → audio/audiorenderer.cpp
View File

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

6
audiorenderer.h → audio/audiorenderer.h
View File

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

0
audiorenderer_extra.h → audio/audiorenderer_extra.h
View File

16
sound.cpp → audio/sound.cpp
View File

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

6
sound.h → audio/sound.h
View File

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

2
betterRenderer/eu07_source/register.cpp
View File

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

8
betterRenderer/renderer/include/nvrenderer/nvrenderer.h
View File

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

2
betterRenderer/renderer/source/environment.cpp
View File

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

2
betterRenderer/renderer/source/fsr.cpp
View File

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

2
betterRenderer/renderer/source/gbufferblitpass.cpp
View File

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

8
betterRenderer/renderer/source/materialparser.cpp
View File

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

2
betterRenderer/renderer/source/nvmaterial.cpp
View File

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

12
betterRenderer/renderer/source/nvrenderer.cpp
View File

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

4
betterRenderer/renderer/source/nvrenderer_d3d12.cpp
View File

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

4
betterRenderer/renderer/source/nvrenderer_vulkan.cpp
View File

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

2
betterRenderer/renderer/source/nvrendererbackend.cpp
View File

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

12
betterRenderer/renderer/source/nvtexture.cpp
View File

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

2
betterRenderer/renderer/source/resource_registry.cpp
View File

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

2
betterRenderer/renderer/source/rt_model.cpp
View File

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

4
betterRenderer/renderer/source/sky.cpp
View File

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

6
betterRenderer/renderer/source/track_batching.cpp
View File

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

10
moon.cpp → environment/moon.cpp
View File

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

0
moon.h → environment/moon.h
View File

6
sky.cpp → environment/sky.cpp
View File

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

2
sky.h → environment/sky.h
View File

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

10
skydome.cpp → environment/skydome.cpp
View File

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

0
skydome.h → environment/skydome.h
View File

6
stars.cpp → environment/stars.cpp
View File

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

2
stars.h → environment/stars.h
View File

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

10
sun.cpp → environment/sun.cpp
View File

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

0
sun.h → environment/sun.h
View File

6
export_e3d_standalone.cpp
View File

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

2
extras/piped_proc.cpp
View File

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

4
gl/framebuffer.cpp
View File

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

2
gl/framebuffer.h
View File

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

2
gl/glsl_common.h
View File

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

2
gl/postfx.h
View File

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

2
gl/query.cpp
View File

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

2
gl/shader.cpp
View File

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

2
imgui/imgui_impl_opengl3.cpp
View File

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

14
command.cpp → input/command.cpp
View File

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

0
command.h → input/command.h
View File

2
driverkeyboardinput.cpp → input/driverkeyboardinput.cpp
View File

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

2
driverkeyboardinput.h → input/driverkeyboardinput.h
View File

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

24
drivermouseinput.cpp → input/drivermouseinput.cpp
View File

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

2
drivermouseinput.h → input/drivermouseinput.h
View File

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

2
editorkeyboardinput.cpp → input/editorkeyboardinput.cpp
View File

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

2
editorkeyboardinput.h → input/editorkeyboardinput.h
View File

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

2
editormouseinput.cpp → input/editormouseinput.cpp
View File

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

2
editormouseinput.h → input/editormouseinput.h
View File

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

12
gamepadinput.cpp → input/gamepadinput.cpp
View File

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

4
gamepadinput.h → input/gamepadinput.h
View File

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

10
keyboardinput.cpp → input/keyboardinput.cpp
View File

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

2
keyboardinput.h → input/keyboardinput.h
View File

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

20
messaging.cpp → input/messaging.cpp
View File

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

0
messaging.h → input/messaging.h
View File

12
zmq_input.cpp → input/zmq_input.cpp
View File

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

2
zmq_input.h → input/zmq_input.h
View File

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

4
launcher/deferred_image.h
View File

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

2
launcher/keymapper.cpp
View File

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

4
launcher/keymapper.h
View File

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

6
launcher/launchermode.cpp
View File

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

Some files were not shown because too many files have changed in this diff Show More