Fix heightmap errors

Add missing listener redirections

Signed-off-by: Matias N. Goldberg <[email protected]>

ogre2/src/Ogre2IgnHlmsPbsPrivate.cc

@@ -56,6 +56,39 @@ namespace Ogre
     this->customizations.push_back(terraShadows);
   }
 
+  /////////////////////////////////////////////////
+  uint16 Ogre2IgnHlmsPbs::getNumExtraPassTextures(
+          const HlmsPropertyVec &_properties, bool _casterPass) const
+  {
+    uint16 numExtraTextures = 0u;
+
+    // Allow additional listener-only customizations to inject their stuff
+    for (Ogre::HlmsListener *listener : this->customizations)
+    {
+      numExtraTextures +=
+        listener->getNumExtraPassTextures(_properties, _casterPass);
+    }
+
+    return numExtraTextures;
+  }
+
+  /////////////////////////////////////////////////
+  void Ogre2IgnHlmsPbs::propertiesMergedPreGenerationStep(
+    Hlms *_hlms, const HlmsCache &_passCache,
+    const HlmsPropertyVec &_renderableCacheProperties,
+    const PiecesMap _renderableCachePieces[NumShaderTypes],
+    const HlmsPropertyVec &_properties,
+    const QueuedRenderable &_queuedRenderable)
+  {
+    // Allow additional listener-only customizations to inject their stuff
+    for (Ogre::HlmsListener *listener : this->customizations)
+    {
+      listener->propertiesMergedPreGenerationStep(
+        _hlms, _passCache, _renderableCacheProperties, _renderableCachePieces,
+        _properties, _queuedRenderable);
+    }
+  }
+
   /////////////////////////////////////////////////
   void Ogre2IgnHlmsPbs::preparePassHash(const CompositorShadowNode *_shadowNode,
                                         bool _casterPass, bool _dualParaboloid,

ogre2/src/Ogre2IgnHlmsPbsPrivate.hh

@@ -74,6 +74,34 @@ namespace Ogre
     /// \brief Destructor. Virtual to silence warnings
     public: virtual ~Ogre2IgnHlmsPbs() override = default;
 
+    /// \brief Override so listeners can inform Hlms the number of
+    /// extra textures they need to make room for.
+    ///
+    /// \remarks We cannot read 'this' state. All state data
+    /// must come from _properties. Otherwise we can't use
+    /// HlmsDiskCache
+    ///
+    /// \param[in] _properties Properties to read state from
+    /// \param[in] _casterPass Whether this is a caster pass
+    public: virtual uint16 getNumExtraPassTextures(
+        const HlmsPropertyVec &_properties, bool _casterPass) const override;
+
+    /// \brief Override so listeners can set extra properties after
+    /// a renderable is assigned an HlmsDatablock
+    ///
+    /// \param[in, out] _hlms Hlms to modify
+    /// \param[in] _passCache Current properties at pass level
+    /// \param[in] _renderableCacheProperties properties at renderable level
+    /// \param[in] _renderableCachePieces Custom pieces for this renderable
+    /// \param[in] _properties Properties defined so far (amalgamated)
+    /// \param[in] _queuedRenderable Renderable being affected
+    public: virtual void propertiesMergedPreGenerationStep(
+        Hlms *_hlms, const HlmsCache &_passCache,
+        const HlmsPropertyVec &_renderableCacheProperties,
+        const PiecesMap _renderableCachePieces[NumShaderTypes],
+        const HlmsPropertyVec &_properties,
+        const QueuedRenderable &_queuedRenderable);
+
     // Documentation inherited
     public: using HlmsPbs::preparePassHash;
 

ogre2/src/Ogre2IgnHlmsTerraPrivate.cc

@@ -54,6 +54,39 @@ namespace Ogre
     this->customizations.push_back(_sphericalClipMinDistance);
   }
 
+  /////////////////////////////////////////////////
+  uint16 Ogre2IgnHlmsTerra::getNumExtraPassTextures(
+          const HlmsPropertyVec &_properties, bool _casterPass) const
+  {
+    uint16 numExtraTextures = 0u;
+
+    // Allow additional listener-only customizations to inject their stuff
+    for (Ogre::HlmsListener *listener : this->customizations)
+    {
+      numExtraTextures +=
+        listener->getNumExtraPassTextures(_properties, _casterPass);
+    }
+
+    return numExtraTextures;
+  }
+
+  /////////////////////////////////////////////////
+  void Ogre2IgnHlmsTerra::propertiesMergedPreGenerationStep(
+    Hlms *_hlms, const HlmsCache &_passCache,
+    const HlmsPropertyVec &_renderableCacheProperties,
+    const PiecesMap _renderableCachePieces[NumShaderTypes],
+    const HlmsPropertyVec &_properties,
+    const QueuedRenderable &_queuedRenderable)
+  {
+    // Allow additional listener-only customizations to inject their stuff
+    for (Ogre::HlmsListener *listener : this->customizations)
+    {
+      listener->propertiesMergedPreGenerationStep(
+        _hlms, _passCache, _renderableCacheProperties, _renderableCachePieces,
+        _properties, _queuedRenderable);
+    }
+  }
+
   /////////////////////////////////////////////////
   void Ogre2IgnHlmsTerra::preparePassHash(
     const CompositorShadowNode *_shadowNode, bool _casterPass,

ogre2/src/Ogre2IgnHlmsTerraPrivate.hh

@@ -71,6 +71,34 @@ namespace Ogre
       /// \brief Destructor. Virtual to silence warnings
     public: virtual ~Ogre2IgnHlmsTerra() override = default;
 
+    /// \brief Override so listeners can inform Hlms the number of
+    /// extra textures they need to make room for.
+    ///
+    /// \remarks We cannot read 'this' state. All state data
+    /// must come from _properties. Otherwise we can't use
+    /// HlmsDiskCache
+    ///
+    /// \param[in] _properties Properties to read state from
+    /// \param[in] _casterPass Whether this is a caster pass
+    public: virtual uint16 getNumExtraPassTextures(
+        const HlmsPropertyVec &_properties, bool _casterPass) const override;
+
+    /// \brief Override so listeners can set extra properties after
+    /// a renderable is assigned an HlmsDatablock
+    ///
+    /// \param[in, out] _hlms Hlms to modify
+    /// \param[in] _passCache Current properties at pass level
+    /// \param[in] _renderableCacheProperties properties at renderable level
+    /// \param[in] _renderableCachePieces Custom pieces for this renderable
+    /// \param[in] _properties Properties defined so far (amalgamated)
+    /// \param[in] _queuedRenderable Renderable being affected
+    public: virtual void propertiesMergedPreGenerationStep(
+        Hlms *_hlms, const HlmsCache &_passCache,
+        const HlmsPropertyVec &_renderableCacheProperties,
+        const PiecesMap _renderableCachePieces[NumShaderTypes],
+        const HlmsPropertyVec &_properties,
+        const QueuedRenderable &_queuedRenderable);
+
     // Documentation inherited
     public: using HlmsTerra::preparePassHash;
 

ogre2/src/Ogre2IgnHlmsUnlitPrivate.cc

@@ -52,6 +52,39 @@ namespace Ogre
     this->customizations.push_back(_sphericalClipMinDistance);
   }
 
+  /////////////////////////////////////////////////
+  uint16 Ogre2IgnHlmsUnlit::getNumExtraPassTextures(
+          const HlmsPropertyVec &_properties, bool _casterPass) const
+  {
+    uint16 numExtraTextures = 0u;
+
+    // Allow additional listener-only customizations to inject their stuff
+    for (Ogre::HlmsListener *listener : this->customizations)
+    {
+      numExtraTextures +=
+        listener->getNumExtraPassTextures(_properties, _casterPass);
+    }
+
+    return numExtraTextures;
+  }
+
+  /////////////////////////////////////////////////
+  void Ogre2IgnHlmsUnlit::propertiesMergedPreGenerationStep(
+    Hlms *_hlms, const HlmsCache &_passCache,
+    const HlmsPropertyVec &_renderableCacheProperties,
+    const PiecesMap _renderableCachePieces[NumShaderTypes],
+    const HlmsPropertyVec &_properties,
+    const QueuedRenderable &_queuedRenderable)
+  {
+    // Allow additional listener-only customizations to inject their stuff
+    for (Ogre::HlmsListener *listener : this->customizations)
+    {
+      listener->propertiesMergedPreGenerationStep(
+        _hlms, _passCache, _renderableCacheProperties, _renderableCachePieces,
+        _properties, _queuedRenderable);
+    }
+  }
+
   /////////////////////////////////////////////////
   void Ogre2IgnHlmsUnlit::preparePassHash(
     const CompositorShadowNode *_shadowNode, bool _casterPass,

ogre2/src/Ogre2IgnHlmsUnlitPrivate.hh

@@ -71,6 +71,34 @@ namespace Ogre
     /// \brief Destructor. Virtual to silence warnings
     public: virtual ~Ogre2IgnHlmsUnlit() override = default;
 
+    /// \brief Override so listeners can inform Hlms the number of
+    /// extra textures they need to make room for.
+    ///
+    /// \remarks We cannot read 'this' state. All state data
+    /// must come from _properties. Otherwise we can't use
+    /// HlmsDiskCache
+    ///
+    /// \param[in] _properties Properties to read state from
+    /// \param[in] _casterPass Whether this is a caster pass
+    public: virtual uint16 getNumExtraPassTextures(
+        const HlmsPropertyVec &_properties, bool _casterPass) const override;
+
+    /// \brief Override so listeners can set extra properties after
+    /// a renderable is assigned an HlmsDatablock
+    ///
+    /// \param[in, out] _hlms Hlms to modify
+    /// \param[in] _passCache Current properties at pass level
+    /// \param[in] _renderableCacheProperties properties at renderable level
+    /// \param[in] _renderableCachePieces Custom pieces for this renderable
+    /// \param[in] _properties Properties defined so far (amalgamated)
+    /// \param[in] _queuedRenderable Renderable being affected
+    public: virtual void propertiesMergedPreGenerationStep(
+        Hlms *_hlms, const HlmsCache &_passCache,
+        const HlmsPropertyVec &_renderableCacheProperties,
+        const PiecesMap _renderableCachePieces[NumShaderTypes],
+        const HlmsPropertyVec &_properties,
+        const QueuedRenderable &_queuedRenderable);
+
     // Documentation inherited
     public: using HlmsUnlit::preparePassHash;