validate if terrain is available | on activate fix | working solution

Signed-off-by: Wojciech Czerski <[email protected]>
RobotecAI · Jan 14, 2025 · a1c596c · a1c596c
1 parent e90d334
commit a1c596c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerComponent.cpp b/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerComponent.cpp
@@ -42,7 +42,14 @@ namespace CsvSpawner
 
     void CsvSpawnerComponent::Activate()
     {
-        AzFramework::Terrain::TerrainDataNotificationBus::Handler::BusConnect();
+        if (IsTerrainAvailable())
+        {
+            AzFramework::Terrain::TerrainDataNotificationBus::Handler::BusConnect();
+        }
+        else
+        {
+            OnTerrainDataCreateEnd();
+        }
     }
 
     void CsvSpawnerComponent::Deactivate()
@@ -77,4 +84,9 @@ namespace CsvSpawner
         m_terrainCreatedOnlyOnce = false;
         AzFramework::Terrain::TerrainDataNotificationBus::Handler::BusDisconnect();
     }
+
+    bool CsvSpawnerComponent::IsTerrainAvailable()
+    {
+        return AzFramework::Terrain::TerrainDataRequestBus::HasHandlers();
+    }
 } // namespace CsvSpawner
diff --git a/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerComponent.h b/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerComponent.h
@@ -57,5 +57,6 @@ namespace CsvSpawner
         void OnTerrainDataCreateEnd() override;
         void OnTerrainDataDestroyBegin() override;
         bool m_terrainCreatedOnlyOnce{ false }; //!< Is terrain fully generated once
+        [[nodiscard]] static bool IsTerrainAvailable(); //!< @returns True if current level has terrain, otherwise false.
     };
 } // namespace CsvSpawner