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

pre-merge renames

Browse Source
This commit is contained in:
milek7
2020-09-30 18:27:43 +02:00
parent 936effa9db
commit 1dc1bd5fcb
48 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AnimModel.cpp
View File

@@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/.
#include "stdafx.h" #include "stdafx.h"
#include "AnimModel.h" #include "AnimModel.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "MdlMngr.h" #include "MdlMngr.h"
#include "simulation.h" #include "simulation.h"
#include "simulationtime.h" #include "simulationtime.h"
@@ -23,7 +23,7 @@ http://mozilla.org/MPL/2.0/.
#include "Globals.h" #include "Globals.h"
#include "Timer.h" #include "Timer.h"
#include "Logs.h" #include "Logs.h"
#include "renderer.h" #include "opengl33renderer.h"
std::list<std::weak_ptr<TAnimContainer>> TAnimModel::acAnimList; std::list<std::weak_ptr<TAnimContainer>> TAnimModel::acAnimList;

2
Button.cpp
View File

@@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/.
#include "DynObj.h" #include "DynObj.h"
#include "Console.h" #include "Console.h"
#include "Logs.h" #include "Logs.h"
#include "renderer.h" #include "opengl33renderer.h"
void TButton::Clear(int i) void TButton::Clear(int i)
{ {

10
CMakeLists.txt
View File

@@ -74,7 +74,7 @@ set(SOURCES
"Model3d.cpp" "Model3d.cpp"
"mtable.cpp" "mtable.cpp"
"parser.cpp" "parser.cpp"
"renderer.cpp" "opengl33renderer.cpp"
"PyInt.cpp" "PyInt.cpp"
"ResourceManager.cpp" "ResourceManager.cpp"
"sn_utils.cpp" "sn_utils.cpp"
@@ -83,7 +83,7 @@ set(SOURCES
"sun.cpp" "sun.cpp"
"stars.cpp" "stars.cpp"
"lightarray.cpp" "lightarray.cpp"
"skydome.cpp" "opengl33skydome.cpp"
"sound.cpp" "sound.cpp"
"Spring.cpp" "Spring.cpp"
"frustum.cpp" "frustum.cpp"
@@ -93,7 +93,7 @@ set(SOURCES
"command.cpp" "command.cpp"
"keyboardinput.cpp" "keyboardinput.cpp"
"gamepadinput.cpp" "gamepadinput.cpp"
"openglgeometrybank.cpp" "opengl33geometrybank.cpp"
"drivermouseinput.cpp" "drivermouseinput.cpp"
"translation.cpp" "translation.cpp"
"material.cpp" "material.cpp"
@@ -127,10 +127,10 @@ set(SOURCES
"scenenodegroups.cpp" "scenenodegroups.cpp"
"simulationenvironment.cpp" "simulationenvironment.cpp"
"simulationstateserializer.cpp" "simulationstateserializer.cpp"
"precipitation.cpp" "opengl33precipitation.cpp"
"pythonscreenviewer.cpp" "pythonscreenviewer.cpp"
"dictionary.cpp" "dictionary.cpp"
"particles.cpp" "opengl33particles.cpp"
"headtrack.cpp" "headtrack.cpp"
"headtrack.h" "headtrack.h"

2
DynObj.cpp
View File

@@ -27,7 +27,7 @@ http://mozilla.org/MPL/2.0/.
#include "sound.h" #include "sound.h"
#include "MdlMngr.h" #include "MdlMngr.h"
#include "Model3d.h" #include "Model3d.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "uitranscripts.h" #include "uitranscripts.h"
#include "messaging.h" #include "messaging.h"

2
Gauge.cpp
View File

@@ -20,7 +20,7 @@ http://mozilla.org/MPL/2.0/.
#include "DynObj.h" #include "DynObj.h"
#include "Timer.h" #include "Timer.h"
#include "Logs.h" #include "Logs.h"
#include "renderer.h" #include "opengl33renderer.h"
TGauge::TGauge( sound_source const &Soundtemplate ) : TGauge::TGauge( sound_source const &Soundtemplate ) :
m_soundtemplate( Soundtemplate ) m_soundtemplate( Soundtemplate )

2
Model3d.cpp
View File

@@ -18,7 +18,7 @@ Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others
#include "Globals.h" #include "Globals.h"
#include "Logs.h" #include "Logs.h"
#include "utilities.h" #include "utilities.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "Timer.h" #include "Timer.h"
#include "simulation.h" #include "simulation.h"
#include "simulationtime.h" #include "simulationtime.h"

2
Model3d.h
View File

@@ -12,7 +12,7 @@ http://mozilla.org/MPL/2.0/.
#include "Classes.h" #include "Classes.h"
#include "dumb3d.h" #include "dumb3d.h"
#include "Float3d.h" #include "Float3d.h"
#include "openglgeometrybank.h" #include "opengl33geometrybank.h"
#include "material.h" #include "material.h"
#include "gl/query.h" #include "gl/query.h"

2
Segment.cpp
View File

@@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/.
#include "Logs.h" #include "Logs.h"
#include "utilities.h" #include "utilities.h"
#include "Track.h" #include "Track.h"
#include "renderer.h" #include "opengl33renderer.h"
void void
segment_data::deserialize( cParser &Input, glm::dvec3 const &Offset ) { segment_data::deserialize( cParser &Input, glm::dvec3 const &Offset ) {

2
Segment.h
View File

@@ -11,7 +11,7 @@ http://mozilla.org/MPL/2.0/.
#include "Classes.h" #include "Classes.h"
#include "dumb3d.h" #include "dumb3d.h"
#include "openglgeometrybank.h" #include "opengl33geometrybank.h"
#include "utilities.h" #include "utilities.h"
struct map_colored_paths { struct map_colored_paths {

2
Track.cpp
View File

@@ -24,7 +24,7 @@ http://mozilla.org/MPL/2.0/.
#include "Track.h" #include "Track.h"
#include "Timer.h" #include "Timer.h"
#include "Logs.h" #include "Logs.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "utilities.h" #include "utilities.h"
// 101206 Ra: trapezoidalne drogi i tory // 101206 Ra: trapezoidalne drogi i tory

2
Traction.cpp
View File

@@ -19,7 +19,7 @@ http://mozilla.org/MPL/2.0/.
#include "Globals.h" #include "Globals.h"
#include "TractionPower.h" #include "TractionPower.h"
#include "Logs.h" #include "Logs.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "utilities.h" #include "utilities.h"
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

2
Train.cpp
View File

@@ -30,7 +30,7 @@ http://mozilla.org/MPL/2.0/.
#include "mtable.h" #include "mtable.h"
#include "Console.h" #include "Console.h"
#include "application.h" #include "application.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "dictionary.h" #include "dictionary.h"
/* /*
namespace input { namespace input {

2
application.cpp
View File

@@ -19,7 +19,7 @@ http://mozilla.org/MPL/2.0/.
#include "Train.h" #include "Train.h"
#include "dictionary.h" #include "dictionary.h"
#include "sceneeditor.h" #include "sceneeditor.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "uilayer.h" #include "uilayer.h"
#include "Logs.h" #include "Logs.h"
#include "screenshot.h" #include "screenshot.h"

4
drivermode.cpp
View File

@@ -17,7 +17,7 @@ http://mozilla.org/MPL/2.0/.
#include "simulationtime.h" #include "simulationtime.h"
#include "simulationenvironment.h" #include "simulationenvironment.h"
#include "lightarray.h" #include "lightarray.h"
#include "particles.h" #include "opengl33particles.h"
#include "Train.h" #include "Train.h"
#include "Driver.h" #include "Driver.h"
#include "DynObj.h" #include "DynObj.h"
@@ -25,7 +25,7 @@ http://mozilla.org/MPL/2.0/.
#include "Event.h" #include "Event.h"
#include "messaging.h" #include "messaging.h"
#include "Timer.h" #include "Timer.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "utilities.h" #include "utilities.h"
#include "Logs.h" #include "Logs.h"
/* /*

2
drivermouseinput.cpp
View File

@@ -18,7 +18,7 @@ http://mozilla.org/MPL/2.0/.
#include "simulation.h" #include "simulation.h"
#include "Train.h" #include "Train.h"
#include "AnimModel.h" #include "AnimModel.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "uilayer.h" #include "uilayer.h"
#include "Logs.h" #include "Logs.h"

2
driveruilayer.cpp
View File

@@ -16,7 +16,7 @@ http://mozilla.org/MPL/2.0/.
#include "simulation.h" #include "simulation.h"
#include "Train.h" #include "Train.h"
#include "AnimModel.h" #include "AnimModel.h"
#include "renderer.h" #include "opengl33renderer.h"
driver_ui::driver_ui() { driver_ui::driver_ui() {

2
driveruipanels.cpp
View File

@@ -24,7 +24,7 @@ http://mozilla.org/MPL/2.0/.
#include "AnimModel.h" #include "AnimModel.h"
#include "DynObj.h" #include "DynObj.h"
#include "Model3d.h" #include "Model3d.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "utilities.h" #include "utilities.h"
#include "Logs.h" #include "Logs.h"
#include "widgets/vehicleparams.h" #include "widgets/vehicleparams.h"

2
editormode.cpp
View File

@@ -18,7 +18,7 @@ http://mozilla.org/MPL/2.0/.
#include "simulationenvironment.h" #include "simulationenvironment.h"
#include "Timer.h" #include "Timer.h"
#include "Console.h" #include "Console.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "AnimModel.h" #include "AnimModel.h"
bool bool

2
editoruilayer.cpp
View File

@@ -11,7 +11,7 @@ http://mozilla.org/MPL/2.0/.
#include "editoruilayer.h" #include "editoruilayer.h"
#include "Globals.h" #include "Globals.h"
#include "renderer.h" #include "opengl33renderer.h"
editor_ui::editor_ui() { editor_ui::editor_ui() {

2
editoruipanels.cpp
View File

@@ -16,7 +16,7 @@ http://mozilla.org/MPL/2.0/.
#include "AnimModel.h" #include "AnimModel.h"
#include "Track.h" #include "Track.h"
#include "Event.h" #include "Event.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "utilities.h" #include "utilities.h"
void void

2
launcher/deferred_image.h
View File

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

2
launcher/scenery_list.cpp
View File

@@ -2,7 +2,7 @@
#include "scenery_list.h" #include "scenery_list.h"
#include "imgui/imgui.h" #include "imgui/imgui.h"
#include "utilities.h" #include "utilities.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "McZapkie/MOVER.h" #include "McZapkie/MOVER.h"
#include "application.h" #include "application.h"
#include "Logs.h" #include "Logs.h"

2
launcher/vehicle_picker.cpp
View File

@@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "launcher/vehicle_picker.h" #include "launcher/vehicle_picker.h"
#include "renderer.h" #include "opengl33renderer.h"
ui::vehiclepicker_panel::vehiclepicker_panel() ui::vehiclepicker_panel::vehiclepicker_panel()
: ui_panel(STR("Select vehicle"), false), placeholder_mini("textures/mini/other") : ui_panel(STR("Select vehicle"), false), placeholder_mini("textures/mini/other")

2
material.cpp
View File

@@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/.
#include "stdafx.h" #include "stdafx.h"
#include "material.h" #include "material.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "Globals.h" #include "Globals.h"
#include "utilities.h" #include "utilities.h"
#include "Logs.h" #include "Logs.h"

2
openglgeometrybank.cpp → opengl33geometrybank.cpp
View File

@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "openglgeometrybank.h" #include "opengl33geometrybank.h"
#include "sn_utils.h" #include "sn_utils.h"
#include "Logs.h" #include "Logs.h"

0
openglgeometrybank.h → opengl33geometrybank.h
View File

2
particles.cpp → opengl33particles.cpp
View File

@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "particles.h" #include "opengl33particles.h"
#include "Timer.h" #include "Timer.h"
#include "Globals.h" #include "Globals.h"

0
particles.h → opengl33particles.h
View File

4
precipitation.cpp → opengl33precipitation.cpp
View File

@@ -8,11 +8,11 @@ http://mozilla.org/MPL/2.0/.
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "precipitation.h" #include "opengl33precipitation.h"
#include "Globals.h" #include "Globals.h"
#include "openglmatrixstack.h" #include "openglmatrixstack.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "Timer.h" #include "Timer.h"
#include "simulation.h" #include "simulation.h"
#include "Train.h" #include "Train.h"

0
precipitation.h → opengl33precipitation.h
View File

2
renderer.cpp → opengl33renderer.cpp
View File

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
#include "stdafx.h" #include "stdafx.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "color.h" #include "color.h"
#include "Globals.h" #include "Globals.h"
#include "Timer.h" #include "Timer.h"

4
renderer.h → opengl33renderer.h
View File

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
#pragma once #pragma once
#include "openglgeometrybank.h" #include "opengl33geometrybank.h"
#include "material.h" #include "material.h"
#include "light.h" #include "light.h"
#include "lightarray.h" #include "lightarray.h"
@@ -19,7 +19,7 @@ http://mozilla.org/MPL/2.0/.
#include "MemCell.h" #include "MemCell.h"
#include "scene.h" #include "scene.h"
#include "light.h" #include "light.h"
#include "particles.h" #include "opengl33particles.h"
#include "vr/vr_interface.h" #include "vr/vr_interface.h"
#include "gl/ubo.h" #include "gl/ubo.h"
#include "gl/framebuffer.h" #include "gl/framebuffer.h"

2
skydome.cpp → opengl33skydome.cpp
View File

@@ -1,5 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "skydome.h" #include "opengl33skydome.h"
#include "color.h" #include "color.h"
#include "utilities.h" #include "utilities.h"

0
skydome.h → opengl33skydome.h
View File

2
pythonscreenviewer.h
View File

@@ -1,4 +1,4 @@
#include "renderer.h" #include "opengl33renderer.h"
#include "PyInt.h" #include "PyInt.h"
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>

2
scenarioloadermode.cpp
View File

@@ -16,7 +16,7 @@ http://mozilla.org/MPL/2.0/.
#include "Timer.h" #include "Timer.h"
#include "application.h" #include "application.h"
#include "scenarioloaderuilayer.h" #include "scenarioloaderuilayer.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "Logs.h" #include "Logs.h"
#include "translation.h" #include "translation.h"

2
scene.cpp
View File

@@ -19,7 +19,7 @@ http://mozilla.org/MPL/2.0/.
#include "Timer.h" #include "Timer.h"
#include "Logs.h" #include "Logs.h"
#include "sn_utils.h" #include "sn_utils.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "widgets/map_objects.h" #include "widgets/map_objects.h"
namespace scene { namespace scene {

2
scene.h
View File

@@ -16,7 +16,7 @@ http://mozilla.org/MPL/2.0/.
#include <unordered_set> #include <unordered_set>
#include "parser.h" #include "parser.h"
#include "openglgeometrybank.h" #include "opengl33geometrybank.h"
#include "scenenode.h" #include "scenenode.h"
#include "Track.h" #include "Track.h"
#include "Traction.h" #include "Traction.h"

2
sceneeditor.cpp
View File

@@ -16,7 +16,7 @@ http://mozilla.org/MPL/2.0/.
#include "simulation.h" #include "simulation.h"
#include "Camera.h" #include "Camera.h"
#include "AnimModel.h" #include "AnimModel.h"
#include "renderer.h" #include "opengl33renderer.h"
namespace scene { namespace scene {

2
scenenode.cpp
View File

@@ -11,7 +11,7 @@ http://mozilla.org/MPL/2.0/.
#include "scenenode.h" #include "scenenode.h"
#include "Model3d.h" #include "Model3d.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "Logs.h" #include "Logs.h"
#include "sn_utils.h" #include "sn_utils.h"

2
scenenode.h
View File

@@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/.
#include "Classes.h" #include "Classes.h"
#include "material.h" #include "material.h"
#include "vertex.h" #include "vertex.h"
#include "openglgeometrybank.h" #include "opengl33geometrybank.h"
struct lighting_data { struct lighting_data {

2
simulation.cpp
View File

@@ -21,7 +21,7 @@ http://mozilla.org/MPL/2.0/.
#include "AnimModel.h" #include "AnimModel.h"
#include "DynObj.h" #include "DynObj.h"
#include "lightarray.h" #include "lightarray.h"
#include "particles.h" #include "opengl33particles.h"
#include "scene.h" #include "scene.h"
#include "Train.h" #include "Train.h"
#include "application.h" #include "application.h"

4
simulationenvironment.h
View File

@@ -13,8 +13,8 @@ http://mozilla.org/MPL/2.0/.
#include "sun.h" #include "sun.h"
#include "moon.h" #include "moon.h"
#include "stars.h" #include "stars.h"
#include "skydome.h" #include "opengl33skydome.h"
#include "precipitation.h" #include "opengl33precipitation.h"
#include "sound.h" #include "sound.h"
class opengl_renderer; class opengl_renderer;

4
simulationstateserializer.cpp
View File

@@ -14,14 +14,14 @@ http://mozilla.org/MPL/2.0/.
#include "simulation.h" #include "simulation.h"
#include "simulationtime.h" #include "simulationtime.h"
#include "scenenodegroups.h" #include "scenenodegroups.h"
#include "particles.h" #include "opengl33particles.h"
#include "Event.h" #include "Event.h"
#include "Driver.h" #include "Driver.h"
#include "DynObj.h" #include "DynObj.h"
#include "AnimModel.h" #include "AnimModel.h"
#include "TractionPower.h" #include "TractionPower.h"
#include "application.h" #include "application.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "Logs.h" #include "Logs.h"
namespace simulation { namespace simulation {

2
uilayer.cpp
View File

@@ -11,7 +11,7 @@ http://mozilla.org/MPL/2.0/.
#include "uilayer.h" #include "uilayer.h"
#include "Globals.h" #include "Globals.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "Logs.h" #include "Logs.h"
#include "Timer.h" #include "Timer.h"
#include "simulation.h" #include "simulation.h"

2
vr/openvr_imp.cpp
View File

@@ -2,7 +2,7 @@
#include "openvr_imp.h" #include "openvr_imp.h"
#include "Logs.h" #include "Logs.h"
#include "Globals.h" #include "Globals.h"
#include "renderer.h" #include "opengl33renderer.h"
vr_openvr::vr_openvr() vr_openvr::vr_openvr()
{ {

2
widgets/map.h
View File

@@ -1,7 +1,7 @@
#pragma once #pragma once
#include "gl/shader.h" #include "gl/shader.h"
#include "renderer.h" #include "opengl33renderer.h"
#include "Texture.h" #include "Texture.h"
#include "uilayer.h" #include "uilayer.h"
#include "widgets/map_objects.h" #include "widgets/map_objects.h"

2
widgets/vehicleparams.h
View File

@@ -3,7 +3,7 @@
#include "uilayer.h" #include "uilayer.h"
#include "translation.h" #include "translation.h"
#include "command.h" #include "command.h"
#include "renderer.h" #include "opengl33renderer.h"
namespace ui namespace ui
{ {