diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2GzOgreRenderingMode.hh b/ogre2/include/gz/rendering/ogre2/Ogre2GzOgreRenderingMode.hh index f6a1b0cf3..6ad915ef8 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2GzOgreRenderingMode.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2GzOgreRenderingMode.hh @@ -33,12 +33,10 @@ namespace gz { /// \brief Normal rendering GORM_NORMAL = 0, - IORM_NORMAL = 0, // TODO(CH3): Deprecated. Remove on tock. /// \brief Render a solid color explicit per object. /// Used by e.g. Segmentation camera mode GORM_SOLID_COLOR = 1, - IORM_SOLID_COLOR = 1, // TODO(CH3): Deprecated. Remove on tock. /// \brief Like GORM_SOLID_COLOR, but if CustomParameter 2u /// is present, raw diffuse texture will be multiplied against @@ -48,19 +46,10 @@ namespace gz /// /// Used by thermal camera GORM_SOLID_THERMAL_COLOR_TEXTURED = 2, - // TODO(CH3): Deprecated. Remove on tock. - IORM_SOLID_THERMAL_COLOR_TEXTURED = 2, /// \brief Total number of rendering modes GORM_COUNT = 3, - IORM_COUNT = 3, // TODO(CH3): Deprecated. Remove on tock. }; - // TODO(CH3): Deprecated. Remove on tock. - #ifdef _WIN32 - using IgnOgreRenderingMode = GzOgreRenderingMode; - #else - using IgnOgreRenderingMode GZ_DEPRECATED(7) = GzOgreRenderingMode; - #endif } // namespace GZ_RENDERING_VERSION_NAMESPACE } // namespace rendering } // namespace gz diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh b/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh index d1a8c4441..9223385d6 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh @@ -183,10 +183,6 @@ namespace gz /// \return a list of FSAA levels public: std::vector FSAALevels() const; - /// \brief Deprecated. Use SphericalClipMinDistance instead - public: Ogre2GzHlmsSphericalClipMinDistance GZ_DEPRECATED(7) & - HlmsCustomizations(); - /// \brief Retrieves Hlms customizations for tweaking them /// \return Ogre HLMS customizations public: Ogre2GzHlmsSphericalClipMinDistance &SphericalClipMinDistance(); @@ -201,13 +197,6 @@ namespace gz /// and see Ogre::GzHlmsPbs /// \param[in] renderingMode public: void SetGzOgreRenderingMode(GzOgreRenderingMode renderingMode); - // TODO(CH3): Deprecated. Remove on tock. - public: - inline void GZ_DEPRECATED(7) SetIgnOgreRenderingMode( - GzOgreRenderingMode renderingMode) - { - return SetGzOgreRenderingMode(renderingMode); - } /// \internal /// \brief Get a pointer to the Pbs listener that adds terra shadows. diff --git a/ogre2/src/Ogre2GpuRays.cc b/ogre2/src/Ogre2GpuRays.cc index 48e1dc5f6..293fbefb3 100644 --- a/ogre2/src/Ogre2GpuRays.cc +++ b/ogre2/src/Ogre2GpuRays.cc @@ -383,7 +383,7 @@ void Ogre2LaserRetroMaterialSwitcher::passPreExecute( // // material may be a nullptr if we called setMaterial directly // (i.e. it's not using Ogre2Material interface). - // In those cases we fallback to PBS in the current IORM mode. + // In those cases we fallback to PBS in the current GORM mode. auto material = Ogre::MaterialManager::getSingleton().getByName( subItem->getMaterial()->getName() + "_solid", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME); diff --git a/ogre2/src/Ogre2MaterialSwitcher.cc b/ogre2/src/Ogre2MaterialSwitcher.cc index bacb89a3f..2ee007a3f 100644 --- a/ogre2/src/Ogre2MaterialSwitcher.cc +++ b/ogre2/src/Ogre2MaterialSwitcher.cc @@ -106,7 +106,7 @@ void Ogre2MaterialSwitcher::cameraPreRenderScene( // // material may be a nullptr if we called setMaterial directly // (i.e. it's not using Ogre2Material interface). - // In those cases we fallback to PBS in the current IORM mode. + // In those cases we fallback to PBS in the current GORM mode. auto material = Ogre::MaterialManager::getSingleton().getByName( subItem->getMaterial()->getName() + "_solid", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME); diff --git a/ogre2/src/Ogre2RenderEngine.cc b/ogre2/src/Ogre2RenderEngine.cc index 93ee74c41..dfe35d670 100644 --- a/ogre2/src/Ogre2RenderEngine.cc +++ b/ogre2/src/Ogre2RenderEngine.cc @@ -873,19 +873,6 @@ void Ogre2RenderEngine::RegisterHlms() { const char *env = std::getenv("GZ_RENDERING_RESOURCE_PATH"); - // TODO(CH3): Deprecated. Remove on tock. - if (!env) - { - env = std::getenv("IGN_RENDERING_RESOURCE_PATH"); - - if (env) - { - gzwarn << "Using deprecated environment variable " - << "[IGN_RENDERING_RESOURCE_PATH]. Please use " - << "[GZ_RENDERING_RESOURCE_PATH] instead." << std::endl; - } - } - std::string resourcePath = (env) ? std::string(env) : gz::rendering::getResourcePath(); @@ -1077,19 +1064,6 @@ void Ogre2RenderEngine::CreateResources() { const char *env = std::getenv("GZ_RENDERING_RESOURCE_PATH"); - // TODO(CH3): Deprecated. Remove on tock. - if (!env) - { - env = std::getenv("IGN_RENDERING_RESOURCE_PATH"); - - if (env) - { - gzwarn << "Using deprecated environment variable " - << "[IGN_RENDERING_RESOURCE_PATH]. Please use " - << "[GZ_RENDERING_RESOURCE_PATH] instead." << std::endl; - } - } - std::string resourcePath = (env) ? std::string(env) : gz::rendering::getResourcePath(); // install path @@ -1431,12 +1405,6 @@ std::vector Ogre2RenderEngine::FSAALevels() const return this->dataPtr->fsaaLevels; } -///////////////////////////////////////////////// -Ogre2GzHlmsSphericalClipMinDistance& Ogre2RenderEngine::HlmsCustomizations() -{ - return this->dataPtr->sphericalClipMinDistance; -} - ///////////////////////////////////////////////// Ogre2GzHlmsSphericalClipMinDistance& Ogre2RenderEngine:: SphericalClipMinDistance() diff --git a/ogre2/src/Ogre2RenderTarget.cc b/ogre2/src/Ogre2RenderTarget.cc index bdf5062e8..0321bc1f1 100644 --- a/ogre2/src/Ogre2RenderTarget.cc +++ b/ogre2/src/Ogre2RenderTarget.cc @@ -945,16 +945,9 @@ void Ogre2RenderTarget::RebuildMaterial() ////////////////////////////////////////////////// // Ogre2RenderTexture ////////////////////////////////////////////////// -#ifndef _WIN32 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif Ogre2RenderTexture::Ogre2RenderTexture() { } -#ifndef _WIN32 -#pragma GCC diagnostic pop -#endif ////////////////////////////////////////////////// Ogre2RenderTexture::~Ogre2RenderTexture() diff --git a/ogre2/src/Ogre2SegmentationMaterialSwitcher.cc b/ogre2/src/Ogre2SegmentationMaterialSwitcher.cc index 8597acb7b..b96fbaf45 100644 --- a/ogre2/src/Ogre2SegmentationMaterialSwitcher.cc +++ b/ogre2/src/Ogre2SegmentationMaterialSwitcher.cc @@ -313,7 +313,7 @@ void Ogre2SegmentationMaterialSwitcher::cameraPreRenderScene( // // material may be a nullptr if we called setMaterial directly // (i.e. it's not using Ogre2Material interface). - // In those cases we fallback to PBS in the current IORM mode. + // In those cases we fallback to PBS in the current GORM mode. auto material = Ogre::MaterialManager::getSingleton().getByName( subItem->getMaterial()->getName() + "_solid", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME); diff --git a/ogre2/src/Ogre2ThermalCamera.cc b/ogre2/src/Ogre2ThermalCamera.cc index 2a888071d..fb617c463 100644 --- a/ogre2/src/Ogre2ThermalCamera.cc +++ b/ogre2/src/Ogre2ThermalCamera.cc @@ -341,7 +341,7 @@ void Ogre2ThermalCameraMaterialSwitcher::cameraPreRenderScene( // // material may be a nullptr if we called setMaterial directly // (i.e. it's not using Ogre2Material interface). - // In those cases we fallback to PBS in the current IORM mode. + // In those cases we fallback to PBS in the current GORM mode. auto material = Ogre::MaterialManager::getSingleton().getByName( subItem->getMaterial()->getName() + "_solid", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME); @@ -504,7 +504,7 @@ void Ogre2ThermalCameraMaterialSwitcher::cameraPreRenderScene( // // material may be a nullptr if we called setMaterial directly // (i.e. it's not using Ogre2Material interface). - // In those cases we fallback to PBS in the current IORM mode. + // In those cases we fallback to PBS in the current GORM mode. auto material = Ogre::MaterialManager::getSingleton().getByName( subItem->getMaterial()->getName() + "_solid", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME); diff --git a/src/RenderEngineManager.cc b/src/RenderEngineManager.cc index 505e1d90a..8e3a6f0f4 100644 --- a/src/RenderEngineManager.cc +++ b/src/RenderEngineManager.cc @@ -95,10 +95,6 @@ class gz::rendering::RenderEngineManagerPrivate /// \brief Plugin loader for managing render engine plugin libraries. public: gz::plugin::Loader pluginLoader; - /// \brief Deprecated environment variable which holds paths to look for - /// plugins - public: std::string pluginPathEnvDeprecated = "IGN_RENDERING_PLUGIN_PATH"; - /// \brief Environment variable which holds paths to look for plugins public: std::string pluginPathEnv = "GZ_RENDERING_PLUGIN_PATH"; @@ -475,23 +471,9 @@ bool RenderEngineManagerPrivate::LoadEnginePlugin( auto pathToLib = systemPaths.FindSharedLibrary(_filename); if (pathToLib.empty()) { - // Try deprecated environment variable - common::SystemPaths systemPathsDep; - systemPathsDep.SetPluginPathEnv(this->pluginPathEnvDeprecated); - pathToLib = systemPathsDep.FindSharedLibrary(_filename); - if (pathToLib.empty()) - { - gzerr << "Failed to load plugin [" << _filename << - "] : couldn't find shared library." << std::endl; - return false; - } - else - { - gzwarn << "Found plugin [" << _filename - << "] using deprecated environment variable [" - << this->pluginPathEnvDeprecated << "]. Please use [" - << this->pluginPathEnv << "] instead." << std::endl; - } + gzerr << "Failed to load plugin [" << _filename << + "] : couldn't find shared library." << std::endl; + return false; } // Load plugin diff --git a/src/base/BaseScene.cc b/src/base/BaseScene.cc index e4161a2aa..bdd997438 100644 --- a/src/base/BaseScene.cc +++ b/src/base/BaseScene.cc @@ -1655,20 +1655,6 @@ void BaseScene::CreateMaterials() material->SetLightingEnabled(true); const char *env = std::getenv("GZ_RENDERING_RESOURCE_PATH"); - - // TODO(CH3): Deprecated. Remove on tock. - if (!env) - { - env = std::getenv("IGN_RENDERING_RESOURCE_PATH"); - - if (env) - { - gzwarn << "Using deprecated environment variable " - << "[IGN_RENDERING_RESOURCE_PATH]. Please use " - << "[GZ_RENDERING_RESOURCE_PATH] instead." << std::endl; - } - } - std::string resourcePath = (env) ? std::string(env) : gz::rendering::getResourcePath();