pre-merge renames

eu07 · Sep 30, 2020 · 1dc1bd5 · 1dc1bd5
1 parent 936effa
commit 1dc1bd5
Show file tree

Hide file tree

Showing 48 changed files with 54 additions and 54 deletions.
diff --git a/AnimModel.cpp b/AnimModel.cpp
@@ -15,15 +15,15 @@ obtain one at
 #include "stdafx.h"
 #include "AnimModel.h"
 
-#include "renderer.h"
+#include "opengl33renderer.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 "opengl33renderer.h"
 
 std::list<std::weak_ptr<TAnimContainer>> TAnimModel::acAnimList;
 

diff --git a/Button.cpp b/Button.cpp
@@ -14,7 +14,7 @@ obtain one at
 #include "DynObj.h"
 #include "Console.h"
 #include "Logs.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 
 void TButton::Clear(int i)
 {

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

diff --git a/DynObj.cpp b/DynObj.cpp
@@ -27,7 +27,7 @@ obtain one at
 #include "sound.h"
 #include "MdlMngr.h"
 #include "Model3d.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "uitranscripts.h"
 #include "messaging.h"
 

diff --git a/Gauge.cpp b/Gauge.cpp
@@ -20,7 +20,7 @@ obtain one at
 #include "DynObj.h"
 #include "Timer.h"
 #include "Logs.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 
 TGauge::TGauge( sound_source const &Soundtemplate ) :
     m_soundtemplate( Soundtemplate )

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

diff --git a/Model3d.h b/Model3d.h
@@ -12,7 +12,7 @@ obtain one at
 #include "Classes.h"
 #include "dumb3d.h"
 #include "Float3d.h"
-#include "openglgeometrybank.h"
+#include "opengl33geometrybank.h"
 #include "material.h"
 #include "gl/query.h"
 

diff --git a/Segment.cpp b/Segment.cpp
@@ -14,7 +14,7 @@ obtain one at
 #include "Logs.h"
 #include "utilities.h"
 #include "Track.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 
 void
 segment_data::deserialize( cParser &Input, glm::dvec3 const &Offset ) {

diff --git a/Segment.h b/Segment.h
@@ -11,7 +11,7 @@ obtain one at
 
 #include "Classes.h"
 #include "dumb3d.h"
-#include "openglgeometrybank.h"
+#include "opengl33geometrybank.h"
 #include "utilities.h"
 
 struct map_colored_paths {

diff --git a/Track.cpp b/Track.cpp
@@ -24,7 +24,7 @@ obtain one at
 #include "Track.h"
 #include "Timer.h"
 #include "Logs.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "utilities.h"
 
 // 101206 Ra: trapezoidalne drogi i tory

diff --git a/Traction.cpp b/Traction.cpp
@@ -19,7 +19,7 @@ obtain one at
 #include "Globals.h"
 #include "TractionPower.h"
 #include "Logs.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "utilities.h"
 
 //---------------------------------------------------------------------------

diff --git a/Train.cpp b/Train.cpp
@@ -30,7 +30,7 @@ obtain one at
 #include "mtable.h"
 #include "Console.h"
 #include "application.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "dictionary.h"
 /*
 namespace input {

diff --git a/application.cpp b/application.cpp
@@ -19,7 +19,7 @@ obtain one at
 #include "Train.h"
 #include "dictionary.h"
 #include "sceneeditor.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "uilayer.h"
 #include "Logs.h"
 #include "screenshot.h"

diff --git a/drivermode.cpp b/drivermode.cpp
@@ -17,15 +17,15 @@ obtain one at
 #include "simulationtime.h"
 #include "simulationenvironment.h"
 #include "lightarray.h"
-#include "particles.h"
+#include "opengl33particles.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 "opengl33renderer.h"
 #include "utilities.h"
 #include "Logs.h"
 /*

diff --git a/drivermouseinput.cpp b/drivermouseinput.cpp
@@ -18,7 +18,7 @@ obtain one at
 #include "simulation.h"
 #include "Train.h"
 #include "AnimModel.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "uilayer.h"
 #include "Logs.h"
 

diff --git a/driveruilayer.cpp b/driveruilayer.cpp
@@ -16,7 +16,7 @@ obtain one at
 #include "simulation.h"
 #include "Train.h"
 #include "AnimModel.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 
 driver_ui::driver_ui() {
 

diff --git a/driveruipanels.cpp b/driveruipanels.cpp
@@ -24,7 +24,7 @@ obtain one at
 #include "AnimModel.h"
 #include "DynObj.h"
 #include "Model3d.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "utilities.h"
 #include "Logs.h"
 #include "widgets/vehicleparams.h"

diff --git a/editormode.cpp b/editormode.cpp
@@ -18,7 +18,7 @@ obtain one at
 #include "simulationenvironment.h"
 #include "Timer.h"
 #include "Console.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "AnimModel.h"
 
 bool

diff --git a/editoruilayer.cpp b/editoruilayer.cpp
@@ -11,7 +11,7 @@ obtain one at
 #include "editoruilayer.h"
 
 #include "Globals.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 
 editor_ui::editor_ui() {
 

diff --git a/editoruipanels.cpp b/editoruipanels.cpp
@@ -16,7 +16,7 @@ obtain one at
 #include "AnimModel.h"
 #include "Track.h"
 #include "Event.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "utilities.h"
 
 void

diff --git a/launcher/deferred_image.h b/launcher/deferred_image.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Texture.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 
 class deferred_image {
 public:

diff --git a/launcher/scenery_list.cpp b/launcher/scenery_list.cpp
@@ -2,7 +2,7 @@
 #include "scenery_list.h"
 #include "imgui/imgui.h"
 #include "utilities.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "McZapkie/MOVER.h"
 #include "application.h"
 #include "Logs.h"

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

diff --git a/material.cpp b/material.cpp
@@ -10,7 +10,7 @@ obtain one at
 #include "stdafx.h"
 
 #include "material.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "Globals.h"
 #include "utilities.h"
 #include "Logs.h"

diff --git a/openglgeometrybank.cpp → opengl33geometrybank.cpp b/openglgeometrybank.cpp → opengl33geometrybank.cpp
@@ -8,7 +8,7 @@ obtain one at
 */
 
 #include "stdafx.h"
-#include "openglgeometrybank.h"
+#include "opengl33geometrybank.h"
 
 #include "sn_utils.h"
 #include "Logs.h"

diff --git a/openglgeometrybank.h → opengl33geometrybank.h b/openglgeometrybank.h → opengl33geometrybank.h
diff --git a/particles.cpp → opengl33particles.cpp b/particles.cpp → opengl33particles.cpp
@@ -8,7 +8,7 @@ obtain one at
 */
 
 #include "stdafx.h"
-#include "particles.h"
+#include "opengl33particles.h"
 
 #include "Timer.h"
 #include "Globals.h"

diff --git a/particles.h → opengl33particles.h b/particles.h → opengl33particles.h
diff --git a/precipitation.cpp → opengl33precipitation.cpp b/precipitation.cpp → opengl33precipitation.cpp
@@ -8,11 +8,11 @@ obtain one at
 */
 
 #include "stdafx.h"
-#include "precipitation.h"
+#include "opengl33precipitation.h"
 
 #include "Globals.h"
 #include "openglmatrixstack.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "Timer.h"
 #include "simulation.h"
 #include "Train.h"

diff --git a/precipitation.h → opengl33precipitation.h b/precipitation.h → opengl33precipitation.h
diff --git a/renderer.cpp → opengl33renderer.cpp b/renderer.cpp → opengl33renderer.cpp
@@ -9,7 +9,7 @@ obtain one at
 
 #include "stdafx.h"
 
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "color.h"
 #include "Globals.h"
 #include "Timer.h"

diff --git a/renderer.h → opengl33renderer.h b/renderer.h → opengl33renderer.h
@@ -9,7 +9,7 @@ obtain one at
 
 #pragma once
 
-#include "openglgeometrybank.h"
+#include "opengl33geometrybank.h"
 #include "material.h"
 #include "light.h"
 #include "lightarray.h"
@@ -19,7 +19,7 @@ obtain one at
 #include "MemCell.h"
 #include "scene.h"
 #include "light.h"
-#include "particles.h"
+#include "opengl33particles.h"
 #include "vr/vr_interface.h"
 #include "gl/ubo.h"
 #include "gl/framebuffer.h"

diff --git a/skydome.cpp → opengl33skydome.cpp b/skydome.cpp → opengl33skydome.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "skydome.h"
+#include "opengl33skydome.h"
 #include "color.h"
 #include "utilities.h"
 

diff --git a/skydome.h → opengl33skydome.h b/skydome.h → opengl33skydome.h
diff --git a/pythonscreenviewer.h b/pythonscreenviewer.h
@@ -1,4 +1,4 @@
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "PyInt.h"
 #include <GLFW/glfw3.h>
 

diff --git a/scenarioloadermode.cpp b/scenarioloadermode.cpp
@@ -16,7 +16,7 @@ obtain one at
 #include "Timer.h"
 #include "application.h"
 #include "scenarioloaderuilayer.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "Logs.h"
 #include "translation.h"
 

diff --git a/scene.cpp b/scene.cpp
@@ -19,7 +19,7 @@ obtain one at
 #include "Timer.h"
 #include "Logs.h"
 #include "sn_utils.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "widgets/map_objects.h"
 
 namespace scene {

diff --git a/scene.h b/scene.h
@@ -16,7 +16,7 @@ obtain one at
 #include <unordered_set>
 
 #include "parser.h"
-#include "openglgeometrybank.h"
+#include "opengl33geometrybank.h"
 #include "scenenode.h"
 #include "Track.h"
 #include "Traction.h"

diff --git a/sceneeditor.cpp b/sceneeditor.cpp
@@ -16,7 +16,7 @@ obtain one at
 #include "simulation.h"
 #include "Camera.h"
 #include "AnimModel.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 
 namespace scene {
 

diff --git a/scenenode.cpp b/scenenode.cpp
@@ -11,7 +11,7 @@ obtain one at
 #include "scenenode.h"
 
 #include "Model3d.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "Logs.h"
 #include "sn_utils.h"
 

diff --git a/scenenode.h b/scenenode.h
@@ -14,7 +14,7 @@ obtain one at
 #include "Classes.h"
 #include "material.h"
 #include "vertex.h"
-#include "openglgeometrybank.h"
+#include "opengl33geometrybank.h"
 
 struct lighting_data {
 

diff --git a/simulation.cpp b/simulation.cpp
@@ -21,7 +21,7 @@ obtain one at
 #include "AnimModel.h"
 #include "DynObj.h"
 #include "lightarray.h"
-#include "particles.h"
+#include "opengl33particles.h"
 #include "scene.h"
 #include "Train.h"
 #include "application.h"