From fad01b718a248ff9a3841b3226346a0af181702a Mon Sep 17 00:00:00 2001 From: Wojciech Czerski Date: Tue, 14 Jan 2025 16:21:31 +0100 Subject: [PATCH] clang format | remove using namespace Signed-off-by: Wojciech Czerski --- .../Source/CsvSpawner/CsvSpawnerComponent.cpp | 16 +++++++--------- .../Code/Source/CsvSpawner/CsvSpawnerComponent.h | 12 +++++------- .../Code/Source/CsvSpawner/CsvSpawnerUtils.cpp | 5 +++++ .../Code/Source/CsvSpawner/CsvSpawnerUtils.h | 2 ++ 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerComponent.cpp b/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerComponent.cpp index de1d7260..c601c0b8 100644 --- a/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerComponent.cpp +++ b/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerComponent.cpp @@ -14,8 +14,6 @@ namespace CsvSpawner { - using namespace CsvSpawnerUtils; - void CsvSpawnerComponent::Reflect(AZ::ReflectContext* context) { CsvSpawnerUtils::CsvSpawnableAssetConfiguration::Reflect(context); @@ -31,8 +29,8 @@ namespace CsvSpawner } CsvSpawnerComponent::CsvSpawnerComponent( - const AZStd::unordered_map& spawnableAssetConfiguration, - const AZStd::vector& spawnableEntityInfo, + const AZStd::unordered_map& spawnableAssetConfiguration, + const AZStd::vector& spawnableEntityInfo, AZ::u64 defaultSeed) : m_spawnableAssetConfigurations(spawnableAssetConfiguration) , m_spawnableEntityInfo(spawnableEntityInfo) @@ -42,7 +40,7 @@ namespace CsvSpawner void CsvSpawnerComponent::Activate() { - if (IsTerrainAvailable()) + if (CsvSpawnerUtils::IsTerrainAvailable()) { AzFramework::Terrain::TerrainDataNotificationBus::Handler::BusConnect(); } @@ -85,8 +83,8 @@ namespace CsvSpawner AzFramework::Terrain::TerrainDataNotificationBus::Handler::BusDisconnect(); } - bool CsvSpawnerComponent::IsTerrainAvailable() - { - return AzFramework::Terrain::TerrainDataRequestBus::HasHandlers(); - } + // 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 index 048a0f77..a1a12411 100644 --- a/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerComponent.h +++ b/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerComponent.h @@ -18,8 +18,6 @@ namespace CsvSpawner { - using namespace CsvSpawnerUtils; - //! Game component that spawns entities from a CSV file. //! This component is used to spawn trees, on the first tick. //! In contrast to the CsvSpawnerEditorComponent, this component's reflection contains all the data it needs to spawn trees ( it is not @@ -34,8 +32,8 @@ namespace CsvSpawner CsvSpawnerComponent() = default; CsvSpawnerComponent( - const AZStd::unordered_map& spawnableAssetConfiguration, - const AZStd::vector& spawnableEntityInfo, + const AZStd::unordered_map& spawnableAssetConfiguration, + const AZStd::vector& spawnableEntityInfo, AZ::u64 defaultSeed); ~CsvSpawnerComponent() = default; @@ -47,8 +45,9 @@ namespace CsvSpawner void Deactivate() override; private: - AZStd::unordered_map m_spawnableAssetConfigurations; //!< List of assets to spawn - AZStd::vector m_spawnableEntityInfo; //!< List of entities to spawn + AZStd::unordered_map + m_spawnableAssetConfigurations; //!< List of assets to spawn + AZStd::vector m_spawnableEntityInfo; //!< List of entities to spawn AZ::u64 m_defaultSeed{ 0 }; //!< Default seed value AZStd::unordered_map m_spawnedTickets; @@ -57,6 +56,5 @@ 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 diff --git a/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerUtils.cpp b/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerUtils.cpp index 95039af5..2d753108 100644 --- a/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerUtils.cpp +++ b/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerUtils.cpp @@ -12,6 +12,7 @@ #include "CsvSpawnerUtils.h" #include "AzFramework/Physics/CollisionBus.h" +#include "AzFramework/Terrain/TerrainDataRequestBus.h" #include #include @@ -292,4 +293,8 @@ namespace CsvSpawner::CsvSpawnerUtils return tickets; } + const bool IsTerrainAvailable() + { + return AzFramework::Terrain::TerrainDataRequestBus::HasHandlers(); + } } // namespace CsvSpawner::CsvSpawnerUtils diff --git a/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerUtils.h b/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerUtils.h index 364c936d..49e3e533 100644 --- a/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerUtils.h +++ b/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerUtils.h @@ -99,4 +99,6 @@ namespace CsvSpawner::CsvSpawnerUtils const AZStd::string& physicsSceneName = AZStd::string(), AZ::EntityId parentId = AZ::EntityId()); + [[nodiscard]] const bool IsTerrainAvailable(); //!< @returns True if current level has terrain, otherwise false. + }; // namespace CsvSpawner::CsvSpawnerUtils