Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove more deprecated env vars #1031

Merged
merged 1 commit into from
Aug 9, 2024
Merged

Remove more deprecated env vars #1031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions ogre/src/OgreDepthCamera.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,19 +227,6 @@ void OgreDepthCamera::CreatePointCloudTexture()

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();

Expand Down
13 changes: 0 additions & 13 deletions ogre/src/OgreMaterial.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,19 +821,6 @@ void OgreMaterial::SetDepthMaterial(const double _far,
// Get shader parameters path
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();

Expand Down
13 changes: 0 additions & 13 deletions ogre/src/OgreRTShaderSystem.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,19 +487,6 @@ bool OgreRTShaderSystem::Paths(std::string &coreLibsPath,
{
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();

Expand Down
13 changes: 0 additions & 13 deletions ogre/src/OgreRenderEngine.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,19 +577,6 @@ void OgreRenderEngine::CreateResources()
std::list<std::string> paths;
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
Expand Down
13 changes: 0 additions & 13 deletions optix/src/OptixRenderEngine.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,19 +82,6 @@ std::string OptixRenderEngine::PtxFile(const std::string& _fileBase) const

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();
resourcePath = common::joinPaths(resourcePath, "optix");
Expand Down
Loading