Non-terrain-gem changes in support of upcoming terrain work. (#3345)

In preparation for a prototype Terrain Gem to get submitted, there are a few changes that are needed outside of the Terrain Gem as well:

The TerrainDataNotificationBus lives in AzFramework/Terrain, and needed to be extended to contain an optional OnTerrainDataChanged event to notify other systems when a terrain region has changed.
The HeightmapUpdateNotificationBus was removed, as this was a legacy file from the old already-removed terrain system.
The EditorWrappedComponentBase<> wrapper received a small optimization to ensure that ConfigurationChanged() is only called when the value of visibility actually changes. With prefabs, it appears that sometimes OnEntityVisibilityChanged could be called multiple times in a row with the same visibility value.
The TerrainSurfaceDataSystemComponent was updated to use the correct busses, and is ready to be moved to the Terrain Gem in a subsequent PR.

Signed-off-by: Mike Balfour 82224783+mbalfour-amzn@users.noreply.github.com

Gems/SurfaceData/Code/Source/TerrainSurfaceDataSystemComponent.h

@@ -10,12 +10,11 @@
 #include <AzCore/Component/Component.h>
 #include <AzCore/Component/Entity.h>
 #include <AzCore/EBus/EBus.h>
-#include <CrySystemBus.h>
-#include <HeightmapUpdateNotificationBus.h>
+#include <AzFramework/Terrain/TerrainDataRequestBus.h>
 #include <SurfaceData/SurfaceDataModifierRequestBus.h>
 #include <SurfaceData/SurfaceDataProviderRequestBus.h>
 
-namespace SurfaceData
+namespace Terrain
 {
     class TerrainSurfaceDataSystemConfig
         : public AZ::ComponentConfig
@@ -31,9 +30,8 @@ namespace SurfaceData
     */
     class TerrainSurfaceDataSystemComponent
         : public AZ::Component
-        , private SurfaceDataProviderRequestBus::Handler
-        , private AZ::HeightmapUpdateNotificationBus::Handler
-        , private CrySystemEventBus::Handler
+        , private SurfaceData::SurfaceDataProviderRequestBus::Handler
+        , private AzFramework::Terrain::TerrainDataNotificationBus::Handler
     {
         friend class EditorTerrainSurfaceDataSystemComponent;
         TerrainSurfaceDataSystemComponent(const TerrainSurfaceDataSystemConfig&);
@@ -58,25 +56,19 @@ namespace SurfaceData
 
         //////////////////////////////////////////////////////////////////////////
         // SurfaceDataProviderRequestBus
-        void GetSurfacePoints(const AZ::Vector3& inPosition, SurfacePointList& surfacePointList) const;
-
-        ////////////////////////////////////////////////////////////////////////////
-        // CrySystemEvents
-        void OnCrySystemInitialized(ISystem& system, const SSystemInitParams& systemInitParams) override;
-        void OnCrySystemShutdown(ISystem& system) override;
+        void GetSurfacePoints(const AZ::Vector3& inPosition, SurfaceData::SurfacePointList& surfacePointList) const;
 
         //////////////////////////////////////////////////////////////////////////
-        // AZ::HeightmapUpdateNotificationBus
-        void HeightmapModified(const AZ::Aabb& bounds) override;
+        // AzFramework::Terrain::TerrainDataNotificationBus
+        void OnTerrainDataChanged(const AZ::Aabb& dirtyRegion, TerrainDataChangedMask dataChangedMask) override;
 
     private:
         void UpdateTerrainData(const AZ::Aabb& dirtyRegion);
         AZ::Aabb GetSurfaceAabb() const;
-        SurfaceTagVector GetSurfaceTags() const;
-        SurfaceDataRegistryHandle m_providerHandle = InvalidSurfaceDataRegistryHandle;
+        SurfaceData::SurfaceTagVector GetSurfaceTags() const;
+        SurfaceData::SurfaceDataRegistryHandle m_providerHandle = SurfaceData::InvalidSurfaceDataRegistryHandle;
 
         TerrainSurfaceDataSystemConfig m_configuration;
-        ISystem* m_system = nullptr;
 
         AZ::Aabb m_terrainBounds = AZ::Aabb::CreateNull();
         AZStd::atomic_bool m_terrainBoundsIsValid{ false };