Skip to content

Commit

Permalink
Fix MSVC build
Browse files Browse the repository at this point in the history
Fix deprecation warnings

Signed-off-by: Matias N. Goldberg <[email protected]>
  • Loading branch information
darksylinc committed Jan 9, 2022
1 parent 77b887f commit 82bf629
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ namespace ignition
public: std::vector<unsigned int> FSAALevels() const;

/// \brief Deprecated. Use SphericalClipMinDistance instead
public: Ogre2IgnHlmsSphericalClipMinDistance &IGN_DEPRECATED(7)
public: Ogre2IgnHlmsSphericalClipMinDistance IGN_DEPRECATED(7) &
HlmsCustomizations();

/// \brief Retrieves Hlms customizations for tweaking them
Expand Down
4 changes: 2 additions & 2 deletions ogre2/src/Ogre2GpuRays.cc
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ void Ogre2LaserRetroMaterialSwitcher::cameraPreRenderScene(
{
auto engine = Ogre2RenderEngine::Instance();
Ogre2IgnHlmsSphericalClipMinDistance &hlmsCustomizations =
engine->HlmsCustomizations();
engine->SphericalClipMinDistance();
Ogre::Pass *pass =
this->laserRetroSourceMaterial->getBestTechnique()->getPass(0u);
pass->getVertexProgramParameters()->setNamedConstant(
Expand Down Expand Up @@ -1246,7 +1246,7 @@ void Ogre2GpuRays::Render()
// "near plane distances" as proposed in:
// https://github.com/ignitionrobotics/ign-rendering/issues/395
Ogre2IgnHlmsSphericalClipMinDistance &hlmsCustomizations =
engine->HlmsCustomizations();
engine->SphericalClipMinDistance();

hlmsCustomizations.minDistanceClip =
static_cast<float>(this->NearClipPlane());
Expand Down

0 comments on commit 82bf629

Please sign in to comment.