pre-merge renames

AnimModel.cpp

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

Button.cpp

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

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"
 

DynObj.cpp

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

Gauge.cpp

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

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"

Model3d.h

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

Segment.cpp

@@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/.
 #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 ) {

Segment.h

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

Track.cpp

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

Traction.cpp

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

Train.cpp

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

application.cpp

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

drivermode.cpp

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

drivermouseinput.cpp

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

driveruilayer.cpp

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

driveruipanels.cpp

@@ -24,7 +24,7 @@ http://mozilla.org/MPL/2.0/.
 #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"

editormode.cpp

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

editoruilayer.cpp

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

editoruipanels.cpp

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

launcher/deferred_image.h

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

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"

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")

material.cpp

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

opengl33geometrybank.cpp

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

opengl33particles.cpp

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

opengl33precipitation.cpp

@@ -8,11 +8,11 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #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"

opengl33renderer.cpp

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

opengl33renderer.h

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "openglgeometrybank.h"
+#include "opengl33geometrybank.h"
 #include "material.h"
 #include "light.h"
 #include "lightarray.h"
@@ -19,7 +19,7 @@ http://mozilla.org/MPL/2.0/.
 #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"

opengl33skydome.cpp

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

pythonscreenviewer.h

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

scenarioloadermode.cpp

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

scene.cpp

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

scene.h

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

sceneeditor.cpp

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

scenenode.cpp

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

scenenode.h

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

simulation.cpp

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

simulationenvironment.h

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

simulationstateserializer.cpp

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

uilayer.cpp

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

vr/openvr_imp.cpp

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

widgets/map.h

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

widgets/vehicleparams.h

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