From 54de15b0ecd555a481c24f569e382d8a1e514ad0 Mon Sep 17 00:00:00 2001
From: Gene Walters <genewalt@amazon.com>
Date: Tue, 18 Jan 2022 16:34:58 -0800
Subject: [PATCH] Adding '.network.spawnable' as a network constant

Signed-off-by: Gene Walters <genewalt@amazon.com>
---
 .../Code/Include/Multiplayer/MultiplayerConstants.h            | 1 +
 .../Code/Source/NetworkEntity/NetworkSpawnableLibrary.cpp      | 3 ++-
 .../Code/Source/Pipeline/NetworkPrefabProcessor.cpp            | 3 ++-
 Gems/Multiplayer/Code/Tests/PrefabProcessingTests.cpp          | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerConstants.h b/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerConstants.h
index 4471aa0c2b..3a4a9b1f58 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerConstants.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerConstants.h
@@ -20,6 +20,7 @@ namespace Multiplayer
     constexpr AZStd::string_view MpNetworkInterfaceName("MultiplayerNetworkInterface");
     constexpr AZStd::string_view MpEditorInterfaceName("MultiplayerEditorNetworkInterface");
     constexpr AZStd::string_view LocalHost("127.0.0.1");
+    constexpr AZStd::string_view NetworkSpawnableFileExtension(".network.spawnable");
 
     constexpr uint16_t DefaultServerPort = 33450;
     constexpr uint16_t DefaultServerEditorPort = 33451;
diff --git a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.cpp
index 7fb7bfdc39..e668d43267 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.cpp
@@ -11,6 +11,7 @@
 #include <AzCore/Component/ComponentApplicationLifecycle.h>
 #include <AzFramework/Spawnable/Spawnable.h>
 #include <AzCore/Interface/Interface.h>
+#include <Multiplayer/MultiplayerConstants.h>
 
 namespace Multiplayer
 {
@@ -42,7 +43,7 @@ namespace Multiplayer
         auto enumerateCallback = [this](const AZ::Data::AssetId id, const AZ::Data::AssetInfo& info)
         {
             if (info.m_assetType == AZ::AzTypeInfo<AzFramework::Spawnable>::Uuid() &&
-                info.m_relativePath.ends_with(".network.spawnable"))
+                info.m_relativePath.ends_with(NetworkSpawnableFileExtension))
             {
                 ProcessSpawnableAsset(info.m_relativePath, id);
             }
diff --git a/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.cpp b/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.cpp
index a797523bc0..9d6c47bb00 100644
--- a/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.cpp
+++ b/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.cpp
@@ -8,6 +8,7 @@
 
 #include <Multiplayer/IMultiplayerTools.h>
 #include <Multiplayer/Components/NetBindComponent.h>
+#include <Multiplayer/MultiplayerConstants.h>
 #include <Pipeline/NetworkPrefabProcessor.h>
 #include <Pipeline/NetworkSpawnableHolderComponent.h>
 
@@ -95,7 +96,7 @@ namespace Multiplayer
         using namespace AzToolsFramework::Prefab;
 
         AZStd::string uniqueName = prefab.GetName();
-        uniqueName += ".network.spawnable";
+        uniqueName += NetworkSpawnableFileExtension;
 
         auto serializer = [serializationFormat](AZStd::vector<uint8_t>& output, const ProcessedObjectStore& object) -> bool {
             AZ::IO::ByteContainerStream stream(&output);
diff --git a/Gems/Multiplayer/Code/Tests/PrefabProcessingTests.cpp b/Gems/Multiplayer/Code/Tests/PrefabProcessingTests.cpp
index aef13fbfe2..32be828686 100644
--- a/Gems/Multiplayer/Code/Tests/PrefabProcessingTests.cpp
+++ b/Gems/Multiplayer/Code/Tests/PrefabProcessingTests.cpp
@@ -13,6 +13,7 @@
 #include <Prefab/PrefabDomTypes.h>
 #include <Prefab/Spawnable/PrefabProcessorContext.h>
 #include <Multiplayer/Components/NetBindComponent.h>
+#include <Multiplayer/MultiplayerConstants.h>
 #include <Source/Pipeline/NetworkPrefabProcessor.h>
 
 namespace UnitTest
@@ -92,7 +93,7 @@ namespace UnitTest
 
         // Verify the name and the type of the spawnable asset 
         const AZ::Data::AssetData& spawnableAsset = processedObjects[0].GetAsset();
-        EXPECT_EQ(prefabName + ".network.spawnable", processedObjects[0].GetId());
+        EXPECT_EQ(prefabName + Multiplayer::NetworkSpawnableFileExtension.data(), processedObjects[0].GetId());
         EXPECT_EQ(spawnableAsset.GetType(), azrtti_typeid<AzFramework::Spawnable>());
 
         // Verify we have only the networked entity in the network spawnable and not the static one