From 1dc1bd5fcb807249f908655e60bf9eaa4ed4d306 Mon Sep 17 00:00:00 2001 From: milek7 Date: Wed, 30 Sep 2020 18:27:43 +0200 Subject: [PATCH] pre-merge renames --- AnimModel.cpp | 4 ++-- Button.cpp | 2 +- CMakeLists.txt | 10 +++++----- DynObj.cpp | 2 +- Gauge.cpp | 2 +- Model3d.cpp | 2 +- Model3d.h | 2 +- Segment.cpp | 2 +- Segment.h | 2 +- Track.cpp | 2 +- Traction.cpp | 2 +- Train.cpp | 2 +- application.cpp | 2 +- drivermode.cpp | 4 ++-- drivermouseinput.cpp | 2 +- driveruilayer.cpp | 2 +- driveruipanels.cpp | 2 +- editormode.cpp | 2 +- editoruilayer.cpp | 2 +- editoruipanels.cpp | 2 +- launcher/deferred_image.h | 2 +- launcher/scenery_list.cpp | 2 +- launcher/vehicle_picker.cpp | 2 +- material.cpp | 2 +- openglgeometrybank.cpp => opengl33geometrybank.cpp | 2 +- openglgeometrybank.h => opengl33geometrybank.h | 0 particles.cpp => opengl33particles.cpp | 2 +- particles.h => opengl33particles.h | 0 precipitation.cpp => opengl33precipitation.cpp | 4 ++-- precipitation.h => opengl33precipitation.h | 0 renderer.cpp => opengl33renderer.cpp | 2 +- renderer.h => opengl33renderer.h | 4 ++-- skydome.cpp => opengl33skydome.cpp | 2 +- skydome.h => opengl33skydome.h | 0 pythonscreenviewer.h | 2 +- scenarioloadermode.cpp | 2 +- scene.cpp | 2 +- scene.h | 2 +- sceneeditor.cpp | 2 +- scenenode.cpp | 2 +- scenenode.h | 2 +- simulation.cpp | 2 +- simulationenvironment.h | 4 ++-- simulationstateserializer.cpp | 4 ++-- uilayer.cpp | 2 +- vr/openvr_imp.cpp | 2 +- widgets/map.h | 2 +- widgets/vehicleparams.h | 2 +- 48 files changed, 54 insertions(+), 54 deletions(-) rename openglgeometrybank.cpp => opengl33geometrybank.cpp (99%) rename openglgeometrybank.h => opengl33geometrybank.h (100%) rename particles.cpp => opengl33particles.cpp (99%) rename particles.h => opengl33particles.h (100%) rename precipitation.cpp => opengl33precipitation.cpp (99%) rename precipitation.h => opengl33precipitation.h (100%) rename renderer.cpp => opengl33renderer.cpp (99%) rename renderer.h => opengl33renderer.h (99%) rename skydome.cpp => opengl33skydome.cpp (99%) rename skydome.h => opengl33skydome.h (100%) diff --git a/AnimModel.cpp b/AnimModel.cpp index 41d2f4a91..92e55bf68 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -15,7 +15,7 @@ obtain one at #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 @@ obtain one at #include "Globals.h" #include "Timer.h" #include "Logs.h" -#include "renderer.h" +#include "opengl33renderer.h" std::list> TAnimModel::acAnimList; diff --git a/Button.cpp b/Button.cpp index c1cb3d488..aeb15fb54 100644 --- 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 index e10c2aebb..8293aac02 100644 --- 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 index 49075ccb6..268da1c02 100644 --- 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 index c135e18f8..8a1adcd6d 100644 --- 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 index c229f6fa0..4127bb97a 100644 --- 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 index 3bff57c60..d075d36fd 100644 --- 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 index 5db4fd167..be2ada52f 100644 --- 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 index 8c1b02cdf..ae18f6321 100644 --- 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 index 2b0737c95..3ab29a74a 100644 --- 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 index 1dfa5ed93..269523140 100644 --- 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 index 4a63d5ca5..2329d20d6 100644 --- 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 index f11edc08e..9d8e8a910 100644 --- 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 index 90d4bdafd..5396953ce 100644 --- a/drivermode.cpp +++ b/drivermode.cpp @@ -17,7 +17,7 @@ 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" @@ -25,7 +25,7 @@ obtain one at #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 index b17766bff..873156f23 100644 --- 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 index 5cce786ef..b68cf74b2 100644 --- 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 index 7f2296468..c6dd2ba3e 100644 --- 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 index bab21c515..df4cfe30c 100644 --- 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 index 7d3a9171c..1b1f7c69d 100644 --- 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 index 2dd2f6c87..69391cef1 100644 --- 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 index 10f557fc0..4f100de09 100644 --- 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 index 99d1e80af..6bb7944d5 100644 --- 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 index 4ab5503a7..645f432d5 100644 --- 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 index 33d891056..dae9f6f1a 100644 --- 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 b/opengl33geometrybank.cpp similarity index 99% rename from openglgeometrybank.cpp rename to opengl33geometrybank.cpp index c4016f453..9ffba169b 100644 --- a/openglgeometrybank.cpp +++ b/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 b/opengl33geometrybank.h similarity index 100% rename from openglgeometrybank.h rename to opengl33geometrybank.h diff --git a/particles.cpp b/opengl33particles.cpp similarity index 99% rename from particles.cpp rename to opengl33particles.cpp index 18c85f307..8270c010a 100644 --- a/particles.cpp +++ b/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 b/opengl33particles.h similarity index 100% rename from particles.h rename to opengl33particles.h diff --git a/precipitation.cpp b/opengl33precipitation.cpp similarity index 99% rename from precipitation.cpp rename to opengl33precipitation.cpp index 0ac9452a0..6b98ef7c4 100644 --- a/precipitation.cpp +++ b/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 b/opengl33precipitation.h similarity index 100% rename from precipitation.h rename to opengl33precipitation.h diff --git a/renderer.cpp b/opengl33renderer.cpp similarity index 99% rename from renderer.cpp rename to opengl33renderer.cpp index 5588b9afe..dcca001e4 100644 --- a/renderer.cpp +++ b/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 b/opengl33renderer.h similarity index 99% rename from renderer.h rename to opengl33renderer.h index 43b12f376..19cc113e9 100644 --- a/renderer.h +++ b/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 b/opengl33skydome.cpp similarity index 99% rename from skydome.cpp rename to opengl33skydome.cpp index 514d57f9e..d16763ce1 100644 --- a/skydome.cpp +++ b/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 b/opengl33skydome.h similarity index 100% rename from skydome.h rename to opengl33skydome.h diff --git a/pythonscreenviewer.h b/pythonscreenviewer.h index afd22d36d..17838d9ce 100644 --- a/pythonscreenviewer.h +++ b/pythonscreenviewer.h @@ -1,4 +1,4 @@ -#include "renderer.h" +#include "opengl33renderer.h" #include "PyInt.h" #include diff --git a/scenarioloadermode.cpp b/scenarioloadermode.cpp index 92e024934..b28bf5307 100644 --- 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 index c61865493..5e3c6c178 100644 --- 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 index 17e525dcc..7a24aa31d 100644 --- a/scene.h +++ b/scene.h @@ -16,7 +16,7 @@ obtain one at #include #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 index 6b730a830..8679eee90 100644 --- 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 index bc8ccb74f..0cec9dfd1 100644 --- 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 index 66c1487d4..6ab5aeaff 100644 --- 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 index 60c839e7a..b0812731a 100644 --- 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" diff --git a/simulationenvironment.h b/simulationenvironment.h index e4370f331..9f16d91e8 100644 --- a/simulationenvironment.h +++ b/simulationenvironment.h @@ -13,8 +13,8 @@ obtain one at #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; diff --git a/simulationstateserializer.cpp b/simulationstateserializer.cpp index 258746fe1..f5f462a16 100644 --- a/simulationstateserializer.cpp +++ b/simulationstateserializer.cpp @@ -14,14 +14,14 @@ obtain one at #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 { diff --git a/uilayer.cpp b/uilayer.cpp index 09aa152f2..232b2c290 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -11,7 +11,7 @@ obtain one at #include "uilayer.h" #include "Globals.h" -#include "renderer.h" +#include "opengl33renderer.h" #include "Logs.h" #include "Timer.h" #include "simulation.h" diff --git a/vr/openvr_imp.cpp b/vr/openvr_imp.cpp index 3fca4381b..00889bfcb 100644 --- a/vr/openvr_imp.cpp +++ b/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() { diff --git a/widgets/map.h b/widgets/map.h index 7178a5915..d8f99656f 100644 --- a/widgets/map.h +++ b/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" diff --git a/widgets/vehicleparams.h b/widgets/vehicleparams.h index 732ebe322..066b16871 100644 --- a/widgets/vehicleparams.h +++ b/widgets/vehicleparams.h @@ -3,7 +3,7 @@ #include "uilayer.h" #include "translation.h" #include "command.h" -#include "renderer.h" +#include "opengl33renderer.h" namespace ui {