From ec318470f5e8066f355bbcd985d92c023e4069e4 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Tue, 17 May 2022 22:45:16 -0700 Subject: [PATCH] Migrate IgnHlms to GzHlms Signed-off-by: methylDragon --- Migration.md | 4 +- .../ogre2/Ogre2GzOgreRenderingMode.hh | 2 +- .../gz/rendering/ogre2/Ogre2RenderEngine.hh | 8 ++-- ogre2/src/Ogre2GpuRays.cc | 4 +- ...PbsPrivate.cc => Ogre2GzHlmsPbsPrivate.cc} | 28 +++++++------- ...PbsPrivate.hh => Ogre2GzHlmsPbsPrivate.hh} | 20 +++++----- ...Private.cc => Ogre2GzHlmsSharedPrivate.cc} | 8 ++-- ...Private.hh => Ogre2GzHlmsSharedPrivate.hh} | 8 ++-- ...=> Ogre2GzHlmsSphericalClipMinDistance.cc} | 8 ++-- ...=> Ogre2GzHlmsSphericalClipMinDistance.hh} | 12 +++--- ...aPrivate.cc => Ogre2GzHlmsTerraPrivate.cc} | 28 +++++++------- ...aPrivate.hh => Ogre2GzHlmsTerraPrivate.hh} | 20 +++++----- ...tPrivate.cc => Ogre2GzHlmsUnlitPrivate.cc} | 28 +++++++------- ...tPrivate.hh => Ogre2GzHlmsUnlitPrivate.hh} | 20 +++++----- ogre2/src/Ogre2RenderEngine.cc | 38 +++++++++---------- .../Pbs/500.IgnPbsStructs_piece_all.any | 2 +- 16 files changed, 119 insertions(+), 119 deletions(-) rename ogre2/src/{Ogre2IgnHlmsPbsPrivate.cc => Ogre2GzHlmsPbsPrivate.cc} (92%) rename ogre2/src/{Ogre2IgnHlmsPbsPrivate.hh => Ogre2GzHlmsPbsPrivate.hh} (92%) rename ogre2/src/{Ogre2IgnHlmsSharedPrivate.cc => Ogre2GzHlmsSharedPrivate.cc} (95%) rename ogre2/src/{Ogre2IgnHlmsSharedPrivate.hh => Ogre2GzHlmsSharedPrivate.hh} (94%) rename ogre2/src/{Ogre2IgnHlmsSphericalClipMinDistance.cc => Ogre2GzHlmsSphericalClipMinDistance.cc} (94%) rename ogre2/src/{Ogre2IgnHlmsSphericalClipMinDistance.hh => Ogre2GzHlmsSphericalClipMinDistance.hh} (90%) rename ogre2/src/{Ogre2IgnHlmsTerraPrivate.cc => Ogre2GzHlmsTerraPrivate.cc} (93%) rename ogre2/src/{Ogre2IgnHlmsTerraPrivate.hh => Ogre2GzHlmsTerraPrivate.hh} (91%) rename ogre2/src/{Ogre2IgnHlmsUnlitPrivate.cc => Ogre2GzHlmsUnlitPrivate.cc} (91%) rename ogre2/src/{Ogre2IgnHlmsUnlitPrivate.hh => Ogre2GzHlmsUnlitPrivate.hh} (91%) diff --git a/Migration.md b/Migration.md index bd9d8f248..2d0167823 100644 --- a/Migration.md +++ b/Migration.md @@ -10,8 +10,8 @@ release will remove the deprecated code. ### Deprecations 1. **ogre2/include/ignition/rendering/ogre2/Ogre2RenderEngine.hh** - + Deprecated: `Ogre2IgnHlmsSphericalClipMinDistance &HlmsCustomizations()` - + Replacement: `Ogre2IgnHlmsSphericalClipMinDistance &SphericalClipMinDistance()` + + Deprecated: `Ogre2GzHlmsSphericalClipMinDistance &HlmsCustomizations()` + + Replacement: `Ogre2GzHlmsSphericalClipMinDistance &SphericalClipMinDistance()` ## Ignition Rendering 6.2.1 to 6.X diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2GzOgreRenderingMode.hh b/ogre2/include/gz/rendering/ogre2/Ogre2GzOgreRenderingMode.hh index c307b0a86..92a242616 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2GzOgreRenderingMode.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2GzOgreRenderingMode.hh @@ -26,7 +26,7 @@ namespace ignition { inline namespace IGNITION_RENDERING_VERSION_NAMESPACE { - /// \brief Rendering modes so that IgnHlms implementations + /// \brief Rendering modes so that GzHlms implementations /// follow alternate code paths or extra customizations /// when they're enabled enum IgnOgreRenderingMode diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh b/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh index aa4b60772..1a9b634ac 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh @@ -54,7 +54,7 @@ namespace ignition // // forward declaration class Ogre2RenderEnginePrivate; - class Ogre2IgnHlmsSphericalClipMinDistance; + class Ogre2GzHlmsSphericalClipMinDistance; /// \brief Plugin for loading ogre render engine class IGNITION_RENDERING_OGRE2_VISIBLE Ogre2RenderEnginePlugin : @@ -180,12 +180,12 @@ namespace ignition public: std::vector FSAALevels() const; /// \brief Deprecated. Use SphericalClipMinDistance instead - public: Ogre2IgnHlmsSphericalClipMinDistance IGN_DEPRECATED(7) & + public: Ogre2GzHlmsSphericalClipMinDistance IGN_DEPRECATED(7) & HlmsCustomizations(); /// \brief Retrieves Hlms customizations for tweaking them /// \return Ogre HLMS customizations - public: Ogre2IgnHlmsSphericalClipMinDistance &SphericalClipMinDistance(); + public: Ogre2GzHlmsSphericalClipMinDistance &SphericalClipMinDistance(); /// \internal /// \brief Get a pointer to the Ogre overlay system. @@ -194,7 +194,7 @@ namespace ignition /// \internal /// \brief Sets the current rendering mode. See IgnOgreRenderingMode - /// and see Ogre::IgnHlmsPbs + /// and see Ogre::GzHlmsPbs /// \param[in] renderingMode public: void SetIgnOgreRenderingMode(IgnOgreRenderingMode renderingMode); diff --git a/ogre2/src/Ogre2GpuRays.cc b/ogre2/src/Ogre2GpuRays.cc index 29a089db4..978c596da 100644 --- a/ogre2/src/Ogre2GpuRays.cc +++ b/ogre2/src/Ogre2GpuRays.cc @@ -34,7 +34,7 @@ #include "ignition/rendering/ogre2/Ogre2Sensor.hh" #include "ignition/rendering/ogre2/Ogre2Visual.hh" -#include "Ogre2IgnHlmsSphericalClipMinDistance.hh" +#include "Ogre2GzHlmsSphericalClipMinDistance.hh" #include "Ogre2ParticleNoiseListener.hh" #include "Terra/Hlms/PbsListener/OgreHlmsPbsTerraShadows.h" @@ -1409,7 +1409,7 @@ void Ogre2GpuRays::Render() // These customization can be used to implement multi-tiered // "near plane distances" as proposed in: // https://github.com/ignitionrobotics/ign-rendering/issues/395 - Ogre2IgnHlmsSphericalClipMinDistance &hlmsCustomizations = + Ogre2GzHlmsSphericalClipMinDistance &hlmsCustomizations = engine->SphericalClipMinDistance(); hlmsCustomizations.minDistanceClip = diff --git a/ogre2/src/Ogre2IgnHlmsPbsPrivate.cc b/ogre2/src/Ogre2GzHlmsPbsPrivate.cc similarity index 92% rename from ogre2/src/Ogre2IgnHlmsPbsPrivate.cc rename to ogre2/src/Ogre2GzHlmsPbsPrivate.cc index 46da25dff..7bf64e67f 100644 --- a/ogre2/src/Ogre2IgnHlmsPbsPrivate.cc +++ b/ogre2/src/Ogre2GzHlmsPbsPrivate.cc @@ -15,7 +15,7 @@ * */ -#include "Ogre2IgnHlmsPbsPrivate.hh" +#include "Ogre2GzHlmsPbsPrivate.hh" #include "Terra/Hlms/PbsListener/OgreHlmsPbsTerraShadows.h" @@ -45,9 +45,9 @@ namespace Ogre /// \internal static const uint16 kPerObjectDataBufferSlot = 4u; - Ogre2IgnHlmsPbs::Ogre2IgnHlmsPbs( + Ogre2GzHlmsPbs::Ogre2GzHlmsPbs( Archive *dataFolder, ArchiveVec *libraryFolders, - Ogre2IgnHlmsSphericalClipMinDistance *_sphericalClipMinDistance, + Ogre2GzHlmsSphericalClipMinDistance *_sphericalClipMinDistance, Ogre::HlmsPbsTerraShadows *terraShadows) : HlmsPbs(dataFolder, libraryFolders) { @@ -56,7 +56,7 @@ namespace Ogre } ///////////////////////////////////////////////// - void Ogre2IgnHlmsPbs::preparePassHash(const CompositorShadowNode *_shadowNode, + void Ogre2GzHlmsPbs::preparePassHash(const CompositorShadowNode *_shadowNode, bool _casterPass, bool _dualParaboloid, SceneManager *_sceneManager, Hlms *_hlms) @@ -80,7 +80,7 @@ namespace Ogre } ///////////////////////////////////////////////// - uint32 Ogre2IgnHlmsPbs::getPassBufferSize( + uint32 Ogre2GzHlmsPbs::getPassBufferSize( const Ogre::CompositorShadowNode *_shadowNode, bool _casterPass, bool _dualParaboloid, Ogre::SceneManager *_sceneManager) const { @@ -96,7 +96,7 @@ namespace Ogre } ///////////////////////////////////////////////// - float *Ogre2IgnHlmsPbs::preparePassBuffer( + float *Ogre2GzHlmsPbs::preparePassBuffer( const Ogre::CompositorShadowNode *_shadowNode, bool _casterPass, bool _dualParaboloid, Ogre::SceneManager *_sceneManager, float *_passBufferPtr) @@ -112,7 +112,7 @@ namespace Ogre } ///////////////////////////////////////////////// - void Ogre2IgnHlmsPbs::shaderCacheEntryCreated( + void Ogre2GzHlmsPbs::shaderCacheEntryCreated( const String &_shaderProfile, const HlmsCache *_hlmsCacheEntry, const HlmsCache &_passCache, const HlmsPropertyVec &_properties, const QueuedRenderable &_queuedRenderable) @@ -127,7 +127,7 @@ namespace Ogre } ///////////////////////////////////////////////// - void Ogre2IgnHlmsPbs::notifyPropertiesMergedPreGenerationStep() + void Ogre2GzHlmsPbs::notifyPropertiesMergedPreGenerationStep() { HlmsPbs::notifyPropertiesMergedPreGenerationStep(); @@ -135,7 +135,7 @@ namespace Ogre } ///////////////////////////////////////////////// - void Ogre2IgnHlmsPbs::hlmsTypeChanged(bool _casterPass, + void Ogre2GzHlmsPbs::hlmsTypeChanged(bool _casterPass, CommandBuffer *_commandBuffer, const HlmsDatablock *_datablock) { @@ -156,7 +156,7 @@ namespace Ogre } ///////////////////////////////////////////////// - uint32 Ogre2IgnHlmsPbs::fillBuffersForV1( + uint32 Ogre2GzHlmsPbs::fillBuffersForV1( const HlmsCache *_cache, const QueuedRenderable &_queuedRenderable, bool _casterPass, uint32 _lastCacheHash, CommandBuffer *_commandBuffer) { @@ -198,7 +198,7 @@ namespace Ogre } ///////////////////////////////////////////////// - uint32 Ogre2IgnHlmsPbs::fillBuffersForV2( + uint32 Ogre2GzHlmsPbs::fillBuffersForV2( const HlmsCache *_cache, const QueuedRenderable &_queuedRenderable, bool _casterPass, uint32 _lastCacheHash, CommandBuffer *_commandBuffer) { @@ -257,14 +257,14 @@ namespace Ogre } ///////////////////////////////////////////////// - void Ogre2IgnHlmsPbs::preCommandBufferExecution(CommandBuffer *_commandBuffer) + void Ogre2GzHlmsPbs::preCommandBufferExecution(CommandBuffer *_commandBuffer) { this->UnmapObjectDataBuffer(); HlmsPbs::preCommandBufferExecution(_commandBuffer); } ///////////////////////////////////////////////// - void Ogre2IgnHlmsPbs::frameEnded() + void Ogre2GzHlmsPbs::frameEnded() { HlmsPbs::frameEnded(); @@ -274,7 +274,7 @@ namespace Ogre } ///////////////////////////////////////////////// - void Ogre2IgnHlmsPbs::GetDefaultPaths(String &_outDataFolderPath, + void Ogre2GzHlmsPbs::GetDefaultPaths(String &_outDataFolderPath, StringVector &_outLibraryFoldersPaths) { HlmsPbs::getDefaultPaths(_outDataFolderPath, _outLibraryFoldersPaths); diff --git a/ogre2/src/Ogre2IgnHlmsPbsPrivate.hh b/ogre2/src/Ogre2GzHlmsPbsPrivate.hh similarity index 92% rename from ogre2/src/Ogre2IgnHlmsPbsPrivate.hh rename to ogre2/src/Ogre2GzHlmsPbsPrivate.hh index c97a4895c..f3bdf458c 100644 --- a/ogre2/src/Ogre2IgnHlmsPbsPrivate.hh +++ b/ogre2/src/Ogre2GzHlmsPbsPrivate.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2IGNHLMSPBSPRIVATE_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2IGNHLMSPBSPRIVATE_HH_ +#ifndef IGNITION_RENDERING_OGRE2_OGRE2GZHLMSPBSPRIVATE_HH_ +#define IGNITION_RENDERING_OGRE2_OGRE2GZHLMSPBSPRIVATE_HH_ #include "ignition/rendering/config.hh" #include "ignition/rendering/ogre2/Export.hh" -#include "Ogre2IgnHlmsSphericalClipMinDistance.hh" -#include "Ogre2IgnHlmsSharedPrivate.hh" +#include "Ogre2GzHlmsSphericalClipMinDistance.hh" +#include "Ogre2GzHlmsSharedPrivate.hh" #ifdef _MSC_VER #pragma warning(push, 0) @@ -58,21 +58,21 @@ namespace Ogre /// \internal /// \remark Public variables take effect immediately (i.e. for the /// next render) - class IGNITION_RENDERING_OGRE2_HIDDEN Ogre2IgnHlmsPbs final + class IGNITION_RENDERING_OGRE2_HIDDEN Ogre2GzHlmsPbs final : public HlmsPbs, public HlmsListener, - public ignition::rendering::Ogre2IgnHlmsShared + public ignition::rendering::Ogre2GzHlmsShared { /// \brief Constructor. Asks for modular listeners so we can add /// them in the proper order - public: Ogre2IgnHlmsPbs(Archive *dataFolder, ArchiveVec *libraryFolders, + public: Ogre2GzHlmsPbs(Archive *dataFolder, ArchiveVec *libraryFolders, ignition::rendering:: - Ogre2IgnHlmsSphericalClipMinDistance + Ogre2GzHlmsSphericalClipMinDistance *_sphericalClipMinDistance, Ogre::HlmsPbsTerraShadows *terraShadows); /// \brief Destructor. Virtual to silence warnings - public: virtual ~Ogre2IgnHlmsPbs() override = default; + public: virtual ~Ogre2GzHlmsPbs() override = default; // Documentation inherited public: using HlmsPbs::preparePassHash; @@ -136,7 +136,7 @@ namespace Ogre /// \param[in] _casterPass true if this is a caster pass /// \param[in] _commandBuffer command buffer so we can add commands /// \param[in] _datablock material of the object that caused - /// Ogre2IgnHlmsPbs to be bound again + /// Ogre2GzHlmsPbs to be bound again public: virtual void hlmsTypeChanged( bool _casterPass, CommandBuffer *_commandBuffer, diff --git a/ogre2/src/Ogre2IgnHlmsSharedPrivate.cc b/ogre2/src/Ogre2GzHlmsSharedPrivate.cc similarity index 95% rename from ogre2/src/Ogre2IgnHlmsSharedPrivate.cc rename to ogre2/src/Ogre2GzHlmsSharedPrivate.cc index d44901bd4..70ee00a76 100644 --- a/ogre2/src/Ogre2IgnHlmsSharedPrivate.cc +++ b/ogre2/src/Ogre2GzHlmsSharedPrivate.cc @@ -15,7 +15,7 @@ * */ -#include "Ogre2IgnHlmsSharedPrivate.hh" +#include "Ogre2GzHlmsSharedPrivate.hh" #include @@ -38,7 +38,7 @@ namespace ignition namespace rendering { ///////////////////////////////////////////////// - void Ogre2IgnHlmsShared::BindObjectDataBuffer( + void Ogre2GzHlmsShared::BindObjectDataBuffer( Ogre::CommandBuffer *_commandBuffer, uint16_t _perObjectDataBufferSlot) { if (this->currPerObjectDataBuffer) @@ -53,7 +53,7 @@ namespace ignition } ///////////////////////////////////////////////// - float *Ogre2IgnHlmsShared::MapObjectDataBufferFor( + float *Ogre2GzHlmsShared::MapObjectDataBufferFor( uint32_t _instanceIdx, Ogre::CommandBuffer *_commandBuffer, Ogre::VaoManager *_vaoManager, const ConstBufferPackedVec &_constBuffers, uint32_t _currConstBufferIdx, uint32_t *_startMappedConstBuffer, @@ -105,7 +105,7 @@ namespace ignition } ///////////////////////////////////////////////// - void Ogre2IgnHlmsShared::UnmapObjectDataBuffer() + void Ogre2GzHlmsShared::UnmapObjectDataBuffer() { if (this->currPerObjectDataBuffer) { diff --git a/ogre2/src/Ogre2IgnHlmsSharedPrivate.hh b/ogre2/src/Ogre2GzHlmsSharedPrivate.hh similarity index 94% rename from ogre2/src/Ogre2IgnHlmsSharedPrivate.hh rename to ogre2/src/Ogre2GzHlmsSharedPrivate.hh index a9184213f..85934b65e 100644 --- a/ogre2/src/Ogre2IgnHlmsSharedPrivate.hh +++ b/ogre2/src/Ogre2GzHlmsSharedPrivate.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2IGNHLMSSHAREDPRIVATE_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2IGNHLMSSHAREDPRIVATE_HH_ +#ifndef IGNITION_RENDERING_OGRE2_OGRE2GZHLMSSHAREDPRIVATE_HH_ +#define IGNITION_RENDERING_OGRE2_OGRE2GZHLMSSHAREDPRIVATE_HH_ #include "ignition/rendering/config.hh" #include "ignition/rendering/ogre2/Export.hh" @@ -44,7 +44,7 @@ namespace ignition /// \brief Implements code shared across all or most of our Hlms /// customizations /// \internal - class IGNITION_RENDERING_OGRE2_HIDDEN Ogre2IgnHlmsShared + class IGNITION_RENDERING_OGRE2_HIDDEN Ogre2GzHlmsShared { /// \brief Binds currPerObjectDataBuffer to the right slot. /// Does nothing if it's nullptr @@ -71,7 +71,7 @@ namespace ignition /// for validation (to ensure our implementation isn't out of sync /// with Ogre's) /// \param[in] _perObjectDataBufferSlot See - /// Ogre2IgnHlmsShared::BindObjectDataBuffer + /// Ogre2GzHlmsShared::BindObjectDataBuffer /// \return Pointer to write data for that instance /// \internal protected: float *MapObjectDataBufferFor(uint32_t _instanceIdx, diff --git a/ogre2/src/Ogre2IgnHlmsSphericalClipMinDistance.cc b/ogre2/src/Ogre2GzHlmsSphericalClipMinDistance.cc similarity index 94% rename from ogre2/src/Ogre2IgnHlmsSphericalClipMinDistance.cc rename to ogre2/src/Ogre2GzHlmsSphericalClipMinDistance.cc index db936444e..b2a3d2a7c 100644 --- a/ogre2/src/Ogre2IgnHlmsSphericalClipMinDistance.cc +++ b/ogre2/src/Ogre2GzHlmsSphericalClipMinDistance.cc @@ -15,7 +15,7 @@ * */ -#include "Ogre2IgnHlmsSphericalClipMinDistance.hh" +#include "Ogre2GzHlmsSphericalClipMinDistance.hh" #include "ignition/rendering/ogre2/Ogre2RenderEngine.hh" @@ -35,7 +35,7 @@ using namespace ignition; using namespace rendering; ////////////////////////////////////////////////// -void Ogre2IgnHlmsSphericalClipMinDistance::preparePassHash( +void Ogre2GzHlmsSphericalClipMinDistance::preparePassHash( const Ogre::CompositorShadowNode * /*_shadowNode*/, bool _casterPass, bool /*_dualParaboloid*/, Ogre::SceneManager * /*_sceneManager*/, Ogre::Hlms *_hlms) @@ -61,7 +61,7 @@ void Ogre2IgnHlmsSphericalClipMinDistance::preparePassHash( } ////////////////////////////////////////////////// -Ogre::uint32 Ogre2IgnHlmsSphericalClipMinDistance::getPassBufferSize( +Ogre::uint32 Ogre2GzHlmsSphericalClipMinDistance::getPassBufferSize( const Ogre::CompositorShadowNode * /*_shadowNode*/, bool _casterPass, bool /*_dualParaboloid*/, Ogre::SceneManager * /*_sceneManager*/) const { @@ -76,7 +76,7 @@ Ogre::uint32 Ogre2IgnHlmsSphericalClipMinDistance::getPassBufferSize( } ////////////////////////////////////////////////// -float *Ogre2IgnHlmsSphericalClipMinDistance::preparePassBuffer( +float *Ogre2GzHlmsSphericalClipMinDistance::preparePassBuffer( const Ogre::CompositorShadowNode * /*_shadowNode*/, bool _casterPass, bool /*_dualParaboloid*/, Ogre::SceneManager *_sceneManager, float *_passBufferPtr) diff --git a/ogre2/src/Ogre2IgnHlmsSphericalClipMinDistance.hh b/ogre2/src/Ogre2GzHlmsSphericalClipMinDistance.hh similarity index 90% rename from ogre2/src/Ogre2IgnHlmsSphericalClipMinDistance.hh rename to ogre2/src/Ogre2GzHlmsSphericalClipMinDistance.hh index c35e04f46..6612687fd 100644 --- a/ogre2/src/Ogre2IgnHlmsSphericalClipMinDistance.hh +++ b/ogre2/src/Ogre2GzHlmsSphericalClipMinDistance.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2IGNHLMSCUSTOMIZATIONS_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2IGNHLMSCUSTOMIZATIONS_HH_ +#ifndef IGNITION_RENDERING_OGRE2_OGRE2GZHLMSCUSTOMIZATIONS_HH_ +#define IGNITION_RENDERING_OGRE2_OGRE2GZHLMSCUSTOMIZATIONS_HH_ #include "ignition/rendering/config.hh" #include "ignition/rendering/ogre2/Export.hh" @@ -46,10 +46,10 @@ namespace ignition /// \internal /// \remark Public variables take effect immediately (i.e. for the /// next render) - class IGNITION_RENDERING_OGRE2_HIDDEN Ogre2IgnHlmsSphericalClipMinDistance + class IGNITION_RENDERING_OGRE2_HIDDEN Ogre2GzHlmsSphericalClipMinDistance final : public Ogre::HlmsListener { - public: virtual ~Ogre2IgnHlmsSphericalClipMinDistance() = default; + public: virtual ~Ogre2GzHlmsSphericalClipMinDistance() = default; /// \brief /// \return Returns true if spherical clipping customizations should @@ -72,7 +72,7 @@ namespace ignition /// bigger to fit our data we need to send /// /// This data is sent in - /// Ogre2IgnHlmsSphericalClipMinDistance::preparePassBuffer + /// Ogre2GzHlmsSphericalClipMinDistance::preparePassBuffer /// \param _casterPass /// \param _hlms private: virtual Ogre::uint32 getPassBufferSize( @@ -82,7 +82,7 @@ namespace ignition /// \brief Sends our custom data to GPU buffers that our /// pieces activated in - /// Ogre2IgnHlmsSphericalClipMinDistance::preparePassHash will need. + /// Ogre2GzHlmsSphericalClipMinDistance::preparePassHash will need. /// /// Bytes written must not exceed what we informed in getPassBufferSize /// \param _casterPass diff --git a/ogre2/src/Ogre2IgnHlmsTerraPrivate.cc b/ogre2/src/Ogre2GzHlmsTerraPrivate.cc similarity index 93% rename from ogre2/src/Ogre2IgnHlmsTerraPrivate.cc rename to ogre2/src/Ogre2GzHlmsTerraPrivate.cc index 0317aaa97..a6798b262 100644 --- a/ogre2/src/Ogre2IgnHlmsTerraPrivate.cc +++ b/ogre2/src/Ogre2GzHlmsTerraPrivate.cc @@ -15,7 +15,7 @@ * */ -#include "Ogre2IgnHlmsTerraPrivate.hh" +#include "Ogre2GzHlmsTerraPrivate.hh" #include #include @@ -45,16 +45,16 @@ namespace Ogre /// \internal static const uint16 kPerObjectDataBufferSlot = 4u; - Ogre2IgnHlmsTerra::Ogre2IgnHlmsTerra( + Ogre2GzHlmsTerra::Ogre2GzHlmsTerra( Archive *dataFolder, ArchiveVec *libraryFolders, - Ogre2IgnHlmsSphericalClipMinDistance *_sphericalClipMinDistance) : + Ogre2GzHlmsSphericalClipMinDistance *_sphericalClipMinDistance) : HlmsTerra(dataFolder, libraryFolders) { this->customizations.push_back(_sphericalClipMinDistance); } ///////////////////////////////////////////////// - void Ogre2IgnHlmsTerra::preparePassHash( + void Ogre2GzHlmsTerra::preparePassHash( const CompositorShadowNode *_shadowNode, bool _casterPass, bool _dualParaboloid, SceneManager *_sceneManager, Hlms *_hlms) { @@ -77,7 +77,7 @@ namespace Ogre } ///////////////////////////////////////////////// - uint32 Ogre2IgnHlmsTerra::getPassBufferSize( + uint32 Ogre2GzHlmsTerra::getPassBufferSize( const Ogre::CompositorShadowNode *_shadowNode, bool _casterPass, bool _dualParaboloid, Ogre::SceneManager *_sceneManager) const { @@ -93,7 +93,7 @@ namespace Ogre } ///////////////////////////////////////////////// - float *Ogre2IgnHlmsTerra::preparePassBuffer( + float *Ogre2GzHlmsTerra::preparePassBuffer( const Ogre::CompositorShadowNode *_shadowNode, bool _casterPass, bool _dualParaboloid, Ogre::SceneManager *_sceneManager, float *_passBufferPtr) @@ -109,7 +109,7 @@ namespace Ogre } ///////////////////////////////////////////////// - void Ogre2IgnHlmsTerra::shaderCacheEntryCreated( + void Ogre2GzHlmsTerra::shaderCacheEntryCreated( const String &_shaderProfile, const HlmsCache *_hlmsCacheEntry, const HlmsCache &_passCache, const HlmsPropertyVec &_properties, const QueuedRenderable &_queuedRenderable) @@ -124,7 +124,7 @@ namespace Ogre } ///////////////////////////////////////////////// - void Ogre2IgnHlmsTerra::notifyPropertiesMergedPreGenerationStep() + void Ogre2GzHlmsTerra::notifyPropertiesMergedPreGenerationStep() { HlmsTerra::notifyPropertiesMergedPreGenerationStep(); @@ -132,7 +132,7 @@ namespace Ogre } ///////////////////////////////////////////////// - void Ogre2IgnHlmsTerra::hlmsTypeChanged(bool _casterPass, + void Ogre2GzHlmsTerra::hlmsTypeChanged(bool _casterPass, CommandBuffer *_commandBuffer, const HlmsDatablock *_datablock) { @@ -153,7 +153,7 @@ namespace Ogre } ///////////////////////////////////////////////// - uint32 Ogre2IgnHlmsTerra::fillBuffersForV1( + uint32 Ogre2GzHlmsTerra::fillBuffersForV1( const HlmsCache *_cache, const QueuedRenderable &_queuedRenderable, bool _casterPass, uint32 _lastCacheHash, CommandBuffer *_commandBuffer) { @@ -214,7 +214,7 @@ namespace Ogre } ///////////////////////////////////////////////// - uint32 Ogre2IgnHlmsTerra::fillBuffersForV2( + uint32 Ogre2GzHlmsTerra::fillBuffersForV2( const HlmsCache *_cache, const QueuedRenderable &_queuedRenderable, bool _casterPass, uint32 _lastCacheHash, CommandBuffer *_commandBuffer) { @@ -276,7 +276,7 @@ namespace Ogre } ///////////////////////////////////////////////// - void Ogre2IgnHlmsTerra::preCommandBufferExecution( + void Ogre2GzHlmsTerra::preCommandBufferExecution( CommandBuffer *_commandBuffer) { this->UnmapObjectDataBuffer(); @@ -284,7 +284,7 @@ namespace Ogre } ///////////////////////////////////////////////// - void Ogre2IgnHlmsTerra::frameEnded() + void Ogre2GzHlmsTerra::frameEnded() { HlmsTerra::frameEnded(); @@ -294,7 +294,7 @@ namespace Ogre } ///////////////////////////////////////////////// - void Ogre2IgnHlmsTerra::GetDefaultPaths(String &_outDataFolderPath, + void Ogre2GzHlmsTerra::GetDefaultPaths(String &_outDataFolderPath, StringVector &_outLibraryFoldersPaths) { HlmsTerra::getDefaultPaths(_outDataFolderPath, _outLibraryFoldersPaths); diff --git a/ogre2/src/Ogre2IgnHlmsTerraPrivate.hh b/ogre2/src/Ogre2GzHlmsTerraPrivate.hh similarity index 91% rename from ogre2/src/Ogre2IgnHlmsTerraPrivate.hh rename to ogre2/src/Ogre2GzHlmsTerraPrivate.hh index 5e42869cb..cb9d230f1 100644 --- a/ogre2/src/Ogre2IgnHlmsTerraPrivate.hh +++ b/ogre2/src/Ogre2GzHlmsTerraPrivate.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2IGNHLMSTERRAPRIVATE_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2IGNHLMSTERRAPRIVATE_HH_ +#ifndef IGNITION_RENDERING_OGRE2_OGRE2GZHLMSTERRAPRIVATE_HH_ +#define IGNITION_RENDERING_OGRE2_OGRE2GZHLMSTERRAPRIVATE_HH_ #include "ignition/rendering/config.hh" #include "ignition/rendering/ogre2/Export.hh" -#include "Ogre2IgnHlmsSharedPrivate.hh" -#include "Ogre2IgnHlmsSphericalClipMinDistance.hh" +#include "Ogre2GzHlmsSharedPrivate.hh" +#include "Ogre2GzHlmsSphericalClipMinDistance.hh" #include "Terra/Hlms/OgreHlmsTerra.h" #ifdef _MSC_VER @@ -56,20 +56,20 @@ namespace Ogre /// \internal /// \remark Public variables take effect immediately (i.e. for the /// next render) - class IGNITION_RENDERING_OGRE2_HIDDEN Ogre2IgnHlmsTerra final + class IGNITION_RENDERING_OGRE2_HIDDEN Ogre2GzHlmsTerra final : public HlmsTerra, public HlmsListener, - public ignition::rendering::Ogre2IgnHlmsShared + public ignition::rendering::Ogre2GzHlmsShared { /// \brief Constructor. Asks for modular listeners so we can add /// them in the proper order - public: Ogre2IgnHlmsTerra(Archive *dataFolder, ArchiveVec *libraryFolders, + public: Ogre2GzHlmsTerra(Archive *dataFolder, ArchiveVec *libraryFolders, ignition::rendering:: - Ogre2IgnHlmsSphericalClipMinDistance + Ogre2GzHlmsSphericalClipMinDistance *_sphericalClipMinDistance); /// \brief Destructor. Virtual to silence warnings - public: virtual ~Ogre2IgnHlmsTerra() override = default; + public: virtual ~Ogre2GzHlmsTerra() override = default; // Documentation inherited public: using HlmsTerra::preparePassHash; @@ -133,7 +133,7 @@ namespace Ogre /// \param[in] _casterPass true if this is a caster pass /// \param[in] _commandBuffer command buffer so we can add commands /// \param[in] _datablock material of the object that caused - /// Ogre2IgnHlmsTerra to be bound again + /// Ogre2GzHlmsTerra to be bound again public: virtual void hlmsTypeChanged( bool _casterPass, CommandBuffer *_commandBuffer, diff --git a/ogre2/src/Ogre2IgnHlmsUnlitPrivate.cc b/ogre2/src/Ogre2GzHlmsUnlitPrivate.cc similarity index 91% rename from ogre2/src/Ogre2IgnHlmsUnlitPrivate.cc rename to ogre2/src/Ogre2GzHlmsUnlitPrivate.cc index d43880006..8d99606c9 100644 --- a/ogre2/src/Ogre2IgnHlmsUnlitPrivate.cc +++ b/ogre2/src/Ogre2GzHlmsUnlitPrivate.cc @@ -15,7 +15,7 @@ * */ -#include "Ogre2IgnHlmsUnlitPrivate.hh" +#include "Ogre2GzHlmsUnlitPrivate.hh" #include #include @@ -43,16 +43,16 @@ namespace Ogre /// \internal static const uint16 kPerObjectDataBufferSlot = 3u; - Ogre2IgnHlmsUnlit::Ogre2IgnHlmsUnlit( + Ogre2GzHlmsUnlit::Ogre2GzHlmsUnlit( Archive *dataFolder, ArchiveVec *libraryFolders, - Ogre2IgnHlmsSphericalClipMinDistance *_sphericalClipMinDistance) : + Ogre2GzHlmsSphericalClipMinDistance *_sphericalClipMinDistance) : HlmsUnlit(dataFolder, libraryFolders) { this->customizations.push_back(_sphericalClipMinDistance); } ///////////////////////////////////////////////// - void Ogre2IgnHlmsUnlit::preparePassHash( + void Ogre2GzHlmsUnlit::preparePassHash( const CompositorShadowNode *_shadowNode, bool _casterPass, bool _dualParaboloid, SceneManager *_sceneManager, Hlms *_hlms) { @@ -70,7 +70,7 @@ namespace Ogre } ///////////////////////////////////////////////// - uint32 Ogre2IgnHlmsUnlit::getPassBufferSize( + uint32 Ogre2GzHlmsUnlit::getPassBufferSize( const Ogre::CompositorShadowNode *_shadowNode, bool _casterPass, bool _dualParaboloid, Ogre::SceneManager *_sceneManager) const { @@ -86,7 +86,7 @@ namespace Ogre } ///////////////////////////////////////////////// - float *Ogre2IgnHlmsUnlit::preparePassBuffer( + float *Ogre2GzHlmsUnlit::preparePassBuffer( const Ogre::CompositorShadowNode *_shadowNode, bool _casterPass, bool _dualParaboloid, Ogre::SceneManager *_sceneManager, float *_passBufferPtr) @@ -102,7 +102,7 @@ namespace Ogre } ///////////////////////////////////////////////// - void Ogre2IgnHlmsUnlit::shaderCacheEntryCreated( + void Ogre2GzHlmsUnlit::shaderCacheEntryCreated( const String &_shaderProfile, const HlmsCache *_hlmsCacheEntry, const HlmsCache &_passCache, const HlmsPropertyVec &_properties, const QueuedRenderable &_queuedRenderable) @@ -117,7 +117,7 @@ namespace Ogre } ///////////////////////////////////////////////// - void Ogre2IgnHlmsUnlit::notifyPropertiesMergedPreGenerationStep() + void Ogre2GzHlmsUnlit::notifyPropertiesMergedPreGenerationStep() { HlmsUnlit::notifyPropertiesMergedPreGenerationStep(); @@ -125,7 +125,7 @@ namespace Ogre } ///////////////////////////////////////////////// - void Ogre2IgnHlmsUnlit::hlmsTypeChanged(bool _casterPass, + void Ogre2GzHlmsUnlit::hlmsTypeChanged(bool _casterPass, CommandBuffer *_commandBuffer, const HlmsDatablock *_datablock) { @@ -144,7 +144,7 @@ namespace Ogre } ///////////////////////////////////////////////// - uint32 Ogre2IgnHlmsUnlit::fillBuffersForV1( + uint32 Ogre2GzHlmsUnlit::fillBuffersForV1( const HlmsCache *_cache, const QueuedRenderable &_queuedRenderable, bool _casterPass, uint32 _lastCacheHash, CommandBuffer *_commandBuffer) { @@ -185,7 +185,7 @@ namespace Ogre } ///////////////////////////////////////////////// - uint32 Ogre2IgnHlmsUnlit::fillBuffersForV2( + uint32 Ogre2GzHlmsUnlit::fillBuffersForV2( const HlmsCache *_cache, const QueuedRenderable &_queuedRenderable, bool _casterPass, uint32 _lastCacheHash, CommandBuffer *_commandBuffer) { @@ -210,7 +210,7 @@ namespace Ogre } ///////////////////////////////////////////////// - void Ogre2IgnHlmsUnlit::preCommandBufferExecution( + void Ogre2GzHlmsUnlit::preCommandBufferExecution( CommandBuffer *_commandBuffer) { this->UnmapObjectDataBuffer(); @@ -218,7 +218,7 @@ namespace Ogre } ///////////////////////////////////////////////// - void Ogre2IgnHlmsUnlit::frameEnded() + void Ogre2GzHlmsUnlit::frameEnded() { HlmsUnlit::frameEnded(); @@ -228,7 +228,7 @@ namespace Ogre } ///////////////////////////////////////////////// - void Ogre2IgnHlmsUnlit::GetDefaultPaths(String &_outDataFolderPath, + void Ogre2GzHlmsUnlit::GetDefaultPaths(String &_outDataFolderPath, StringVector &_outLibraryFoldersPaths) { HlmsUnlit::getDefaultPaths(_outDataFolderPath, _outLibraryFoldersPaths); diff --git a/ogre2/src/Ogre2IgnHlmsUnlitPrivate.hh b/ogre2/src/Ogre2GzHlmsUnlitPrivate.hh similarity index 91% rename from ogre2/src/Ogre2IgnHlmsUnlitPrivate.hh rename to ogre2/src/Ogre2GzHlmsUnlitPrivate.hh index ccc7583cd..7d92becb0 100644 --- a/ogre2/src/Ogre2IgnHlmsUnlitPrivate.hh +++ b/ogre2/src/Ogre2GzHlmsUnlitPrivate.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2IGNHLMSUNLITPRIVATE_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2IGNHLMSUNLITPRIVATE_HH_ +#ifndef IGNITION_RENDERING_OGRE2_OGRE2GZHLMSUNLITPRIVATE_HH_ +#define IGNITION_RENDERING_OGRE2_OGRE2GZHLMSUNLITPRIVATE_HH_ #include "ignition/rendering/config.hh" #include "ignition/rendering/ogre2/Export.hh" -#include "Ogre2IgnHlmsSphericalClipMinDistance.hh" -#include "Ogre2IgnHlmsSharedPrivate.hh" +#include "Ogre2GzHlmsSphericalClipMinDistance.hh" +#include "Ogre2GzHlmsSharedPrivate.hh" #ifdef _MSC_VER #pragma warning(push, 0) @@ -56,20 +56,20 @@ namespace Ogre /// \internal /// \remark Public variables take effect immediately (i.e. for the /// next render) - class IGNITION_RENDERING_OGRE2_HIDDEN Ogre2IgnHlmsUnlit final + class IGNITION_RENDERING_OGRE2_HIDDEN Ogre2GzHlmsUnlit final : public HlmsUnlit, public HlmsListener, - public ignition::rendering::Ogre2IgnHlmsShared + public ignition::rendering::Ogre2GzHlmsShared { /// \brief Constructor. Asks for modular listeners so we can add /// them in the proper order - public: Ogre2IgnHlmsUnlit(Archive *dataFolder, ArchiveVec *libraryFolders, + public: Ogre2GzHlmsUnlit(Archive *dataFolder, ArchiveVec *libraryFolders, ignition::rendering:: - Ogre2IgnHlmsSphericalClipMinDistance + Ogre2GzHlmsSphericalClipMinDistance *_sphericalClipMinDistance); /// \brief Destructor. Virtual to silence warnings - public: virtual ~Ogre2IgnHlmsUnlit() override = default; + public: virtual ~Ogre2GzHlmsUnlit() override = default; // Documentation inherited public: using HlmsUnlit::preparePassHash; @@ -133,7 +133,7 @@ namespace Ogre /// \param[in] _casterPass true if this is a caster pass /// \param[in] _commandBuffer command buffer so we can add commands /// \param[in] _datablock material of the object that caused - /// Ogre2IgnHlmsUnlit to be bound again + /// Ogre2GzHlmsUnlit to be bound again public: virtual void hlmsTypeChanged( bool _casterPass, CommandBuffer *_commandBuffer, diff --git a/ogre2/src/Ogre2RenderEngine.cc b/ogre2/src/Ogre2RenderEngine.cc index f1c008b21..b9a7d644e 100644 --- a/ogre2/src/Ogre2RenderEngine.cc +++ b/ogre2/src/Ogre2RenderEngine.cc @@ -42,14 +42,14 @@ #include "ignition/rendering/ogre2/Ogre2Scene.hh" #include "ignition/rendering/ogre2/Ogre2Storage.hh" -#include "Ogre2IgnHlmsPbsPrivate.hh" -#include "Ogre2IgnHlmsTerraPrivate.hh" -#include "Ogre2IgnHlmsUnlitPrivate.hh" +#include "Ogre2GzHlmsPbsPrivate.hh" +#include "Ogre2GzHlmsTerraPrivate.hh" +#include "Ogre2GzHlmsUnlitPrivate.hh" #include "Terra/Hlms/OgreHlmsTerra.h" #include "Terra/Hlms/PbsListener/OgreHlmsPbsTerraShadows.h" #include "Terra/TerraWorkspaceListener.h" -#include "Ogre2IgnHlmsSphericalClipMinDistance.hh" +#include "Ogre2GzHlmsSphericalClipMinDistance.hh" class IGNITION_RENDERING_OGRE2_HIDDEN ignition::rendering::Ogre2RenderEnginePrivate @@ -65,7 +65,7 @@ class IGNITION_RENDERING_OGRE2_HIDDEN public: std::vector fsaaLevels; /// \brief Controls Hlms customizations for both PBS and Unlit - public: ignition::rendering::Ogre2IgnHlmsSphericalClipMinDistance + public: ignition::rendering::Ogre2GzHlmsSphericalClipMinDistance sphericalClipMinDistance; /// \brief Pbs listener that adds terra shadows @@ -76,13 +76,13 @@ class IGNITION_RENDERING_OGRE2_HIDDEN public: std::unique_ptr terraWorkspaceListener; /// \brief Custom PBS modifications - public: Ogre::Ogre2IgnHlmsPbs *ignHlmsPbs{nullptr}; + public: Ogre::Ogre2GzHlmsPbs *ignHlmsPbs{nullptr}; /// \brief Custom Unlit modifications - public: Ogre::Ogre2IgnHlmsUnlit *ignHlmsUnlit{nullptr}; + public: Ogre::Ogre2GzHlmsUnlit *ignHlmsUnlit{nullptr}; /// \brief Custom Terra modifications - public: Ogre::Ogre2IgnHlmsTerra *ignHlmsTerra{nullptr}; + public: Ogre::Ogre2GzHlmsTerra *ignHlmsTerra{nullptr}; }; using namespace ignition; @@ -743,10 +743,10 @@ void Ogre2RenderEngine::RegisterHlms() "FileSystem", true); { - Ogre::Ogre2IgnHlmsUnlit *hlmsUnlit = 0; + Ogre::Ogre2GzHlmsUnlit *hlmsUnlit = 0; // Create & Register HlmsUnlit // Get the path to all the subdirectories used by HlmsUnlit - Ogre::Ogre2IgnHlmsUnlit::getDefaultPaths(mainFolderPath, + Ogre::Ogre2GzHlmsUnlit::getDefaultPaths(mainFolderPath, libraryFoldersPaths); Ogre::Archive *archiveUnlit = archiveManager.load( rootHlmsFolder + mainFolderPath, "FileSystem", true); @@ -765,7 +765,7 @@ void Ogre2RenderEngine::RegisterHlms() archiveUnlitLibraryFolders.push_back(customizationsArchiveLibrary); // Create and register the unlit Hlms - hlmsUnlit = OGRE_NEW Ogre::Ogre2IgnHlmsUnlit( + hlmsUnlit = OGRE_NEW Ogre::Ogre2GzHlmsUnlit( archiveUnlit, &archiveUnlitLibraryFolders, &this->dataPtr->sphericalClipMinDistance); Ogre::Root::getSingleton().getHlmsManager()->registerHlms(hlmsUnlit); @@ -778,10 +778,10 @@ void Ogre2RenderEngine::RegisterHlms() } { - Ogre::Ogre2IgnHlmsPbs *hlmsPbs = 0; + Ogre::Ogre2GzHlmsPbs *hlmsPbs = 0; // Create & Register HlmsPbs // Do the same for HlmsPbs: - Ogre::Ogre2IgnHlmsPbs::GetDefaultPaths(mainFolderPath, libraryFoldersPaths); + Ogre::Ogre2GzHlmsPbs::GetDefaultPaths(mainFolderPath, libraryFoldersPaths); Ogre::Archive *archivePbs = archiveManager.load( rootHlmsFolder + mainFolderPath, "FileSystem", true); @@ -810,7 +810,7 @@ void Ogre2RenderEngine::RegisterHlms() // Create and register hlmsPbs = - OGRE_NEW Ogre::Ogre2IgnHlmsPbs(archivePbs, &archivePbsLibraryFolders, + OGRE_NEW Ogre::Ogre2GzHlmsPbs(archivePbs, &archivePbsLibraryFolders, &this->dataPtr->sphericalClipMinDistance, this->dataPtr->hlmsPbsTerraShadows.get()); Ogre::Root::getSingleton().getHlmsManager()->registerHlms(hlmsPbs); @@ -823,10 +823,10 @@ void Ogre2RenderEngine::RegisterHlms() } { - Ogre::Ogre2IgnHlmsTerra *hlmsTerra = 0; + Ogre::Ogre2GzHlmsTerra *hlmsTerra = 0; // Create & Register HlmsPbs // Do the same for HlmsPbs: - Ogre::Ogre2IgnHlmsTerra::GetDefaultPaths(mainFolderPath, + Ogre::Ogre2GzHlmsTerra::GetDefaultPaths(mainFolderPath, libraryFoldersPaths); Ogre::Archive *archiveTerra = archiveManager.load( rootHlmsFolder + mainFolderPath, "FileSystem", true); @@ -845,7 +845,7 @@ void Ogre2RenderEngine::RegisterHlms() } // Create and register - hlmsTerra = OGRE_NEW Ogre::Ogre2IgnHlmsTerra( + hlmsTerra = OGRE_NEW Ogre::Ogre2GzHlmsTerra( archiveTerra, &archiveTerraLibraryFolders, &this->dataPtr->sphericalClipMinDistance); Ogre::Root::getSingleton().getHlmsManager()->registerHlms(hlmsTerra); @@ -1035,13 +1035,13 @@ std::vector Ogre2RenderEngine::FSAALevels() const } ///////////////////////////////////////////////// -Ogre2IgnHlmsSphericalClipMinDistance& Ogre2RenderEngine::HlmsCustomizations() +Ogre2GzHlmsSphericalClipMinDistance& Ogre2RenderEngine::HlmsCustomizations() { return this->dataPtr->sphericalClipMinDistance; } ///////////////////////////////////////////////// -Ogre2IgnHlmsSphericalClipMinDistance& Ogre2RenderEngine:: +Ogre2GzHlmsSphericalClipMinDistance& Ogre2RenderEngine:: SphericalClipMinDistance() { return this->dataPtr->sphericalClipMinDistance; diff --git a/ogre2/src/media/Hlms/Ignition/Pbs/500.IgnPbsStructs_piece_all.any b/ogre2/src/media/Hlms/Ignition/Pbs/500.IgnPbsStructs_piece_all.any index 2639e478f..0fc0830cd 100644 --- a/ogre2/src/media/Hlms/Ignition/Pbs/500.IgnPbsStructs_piece_all.any +++ b/ogre2/src/media/Hlms/Ignition/Pbs/500.IgnPbsStructs_piece_all.any @@ -1,7 +1,7 @@ // This file interfaces all modular pieces into one // Order in custom_passBuffer MUST be the same as they're added to -// IgnHlmsPbs::customizations +// GzHlmsPbs::customizations @piece( custom_passBuffer ) @insertpiece( custom_passBuffer_spherical_clip_min_distance ) @insertpiece( custom_passBuffer_terra )