A bunch of work to get external multiplayer components to actually work

2021-05-12 16:01:59 -07:00
parent 293e0057f4
commit 254ad165c1
70 changed files with 162 additions and 185 deletions
@@ -12,7 +12,7 @@

 #pragma once

-#include <Include/INetworkEntityManager.h>
+#include <Multiplayer/INetworkEntityManager.h>
 #include <AzNetworking/ConnectionLayer/IConnection.h>

 namespace Multiplayer
@@ -12,7 +12,7 @@

 #pragma once

-#include <Include/INetworkEntityManager.h>
+#include <Multiplayer/INetworkEntityManager.h>

 namespace Multiplayer
 {
@@ -15,9 +15,9 @@
 #include <AzCore/RTTI/RTTI.h>
 #include <AzNetworking/ConnectionLayer/IConnection.h>
 #include <AzNetworking/DataStructures/ByteBuffer.h>
-#include <Include/INetworkEntityManager.h>
-#include <Include/INetworkTime.h>
-#include <Include/MultiplayerStats.h>
+#include <Multiplayer/INetworkEntityManager.h>
+#include <Multiplayer/INetworkTime.h>
+#include <Multiplayer/MultiplayerStats.h>

 namespace AzNetworking
 {
@@ -12,7 +12,7 @@

 #pragma once

-#include <Include/MultiplayerTypes.h>
+#include <Multiplayer/MultiplayerTypes.h>
 #include <AzNetworking/DataStructures/FixedSizeBitset.h>
 #include <AzCore/std/containers/vector.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
@@ -12,8 +12,8 @@

 #pragma once

-#include <Include/MultiplayerTypes.h>
-#include <Include/NetworkEntityHandle.h>
+#include <Multiplayer/MultiplayerTypes.h>
+#include <Multiplayer/NetworkEntityHandle.h>
 #include <AzCore/Component/Entity.h>
 #include <AzCore/EBus/Event.h>
 #include <AzCore/Asset/AssetCommon.h>
@@ -14,7 +14,7 @@

 #include <AzCore/Time/ITime.h>
 #include <AzNetworking/ConnectionLayer/IConnection.h>
-#include <Include/MultiplayerTypes.h>
+#include <Multiplayer/MultiplayerTypes.h>

 namespace Multiplayer
 {
@@ -12,8 +12,8 @@

 #pragma once

-#include <Include/MultiplayerTypes.h>
-#include <Include/NetworkEntityHandle.h>
+#include <Multiplayer/MultiplayerTypes.h>
+#include <Multiplayer/NetworkEntityHandle.h>
 #include <AzCore/std/containers/unordered_map.h>

 namespace Multiplayer
@@ -15,9 +15,9 @@
 #include <AzCore/Component/Component.h>
 #include <AzNetworking/Serialization/ISerializer.h>
 #include <AzNetworking/DataStructures/FixedSizeBitsetView.h>
-#include <Include/NetworkEntityHandle.h>
-#include <Include/MultiplayerTypes.h>
-#include <Include/IMultiplayer.h>
+#include <Multiplayer/NetworkEntityHandle.h>
+#include <Multiplayer/MultiplayerTypes.h>
+#include <Multiplayer/IMultiplayer.h>

 //! Macro to declare bindings for a multiplayer component inheriting from MultiplayerComponent
 #define AZ_MULTIPLAYER_COMPONENT(ComponentClass, Guid, Base) \
@@ -14,7 +14,7 @@

 #include <AzCore/Name/Name.h>
 #include <AzCore/std/containers/unordered_map.h>
-#include <Source/Components/MultiplayerComponent.h>
+#include <Multiplayer/MultiplayerComponent.h>

 namespace Multiplayer
 {
@@ -12,7 +12,7 @@

 #pragma once

-#include <Include/NetworkEntityHandle.h>
+#include <Multiplayer/NetworkEntityHandle.h>
 #include <AzCore/Math/Aabb.h>

 namespace Multiplayer
@@ -84,12 +84,6 @@ namespace Multiplayer
        //! Returns the input priority ordering for determining the order of ProcessInput or CreateInput functions.
        virtual InputPriorityOrder GetInputOrder() const = 0;

-        //! Queries the rewind system to determine what volume is relevent for a given input, this is very important for performance at scale.
-        //! @param networkInput input structure to process
-        //! @param deltaTime    amount of time the provided input would be integrated over
-        //! @return a world-space aabb representing the volume relevent to the provided input
-        virtual AZ::Aabb GetRewindBoundsForInput(const NetworkInput& networkInput, float deltaTime) const = 0;
-
        //! Base execution for ProcessInput packet, do not call directly.
        //! @param networkInput input structure to process
        //! @param deltaTime    amount of time to integrate the provided inputs over
@@ -10,7 +10,7 @@
 *
 */

-#include <Include/MultiplayerStats.h>
+#include <Multiplayer/MultiplayerStats.h>

 namespace Multiplayer
 {
@@ -15,7 +15,7 @@
 #include <AzCore/Time/ITime.h>
 #include <AzCore/std/containers/vector.h>
 #include <AzCore/std/containers/array.h>
-#include <Include/MultiplayerTypes.h>
+#include <Multiplayer/MultiplayerTypes.h>

 namespace AzNetworking
 {
@@ -20,11 +20,11 @@
 #include <AzCore/std/smart_ptr/unique_ptr.h>
 #include <AzNetworking/Serialization/ISerializer.h>
 #include <AzNetworking/ConnectionLayer/IConnection.h>
-#include <Source/NetworkEntity/EntityReplication/ReplicationRecord.h>
-#include <Include/NetworkEntityHandle.h>
-#include <Include/IMultiplayerComponentInput.h>
-#include <Include/INetworkTime.h>
-#include <Include/MultiplayerTypes.h>
+#include <Multiplayer/ReplicationRecord.h>
+#include <Multiplayer/NetworkEntityHandle.h>
+#include <Multiplayer/IMultiplayerComponentInput.h>
+#include <Multiplayer/INetworkTime.h>
+#include <Multiplayer/MultiplayerTypes.h>
 #include <AzCore/EBus/Event.h>

 namespace Multiplayer
@@ -73,7 +73,6 @@ namespace Multiplayer
        bool IsProcessingInput() const;
        void CreateInput(NetworkInput& networkInput, float deltaTime);
        void ProcessInput(NetworkInput& networkInput, float deltaTime);
-        AZ::Aabb GetRewindBoundsForInput(const NetworkInput& networkInput, float deltaTime) const;

        bool HandleRpcMessage(AzNetworking::IConnection* invokingConnection, NetEntityRole remoteRole, NetworkEntityRpcMessage& message);
        bool HandlePropertyChangeMessage(AzNetworking::ISerializer& serializer, bool notifyChanges = true);
@@ -13,7 +13,7 @@
 #pragma once

 #include <AzCore/Component/Entity.h>
-#include <Include/MultiplayerTypes.h>
+#include <Multiplayer/MultiplayerTypes.h>

 namespace Multiplayer
 {
@@ -138,4 +138,4 @@ namespace Multiplayer
    };
 }

-#include <Include/NetworkEntityHandle.inl>
+#include <Multiplayer/NetworkEntityHandle.inl>
@@ -14,7 +14,7 @@

 #include <AzNetworking/Serialization/ISerializer.h>
 #include <AzNetworking/DataStructures/ByteBuffer.h>
-#include <Include/MultiplayerTypes.h>
+#include <Multiplayer/MultiplayerTypes.h>

 namespace Multiplayer
 {
@@ -15,7 +15,7 @@
 #include <AzNetworking/Serialization/ISerializer.h>
 #include <AzNetworking/DataStructures/ByteBuffer.h>
 #include <AzCore/Name/Name.h>
-#include <Include/MultiplayerTypes.h>
+#include <Multiplayer/MultiplayerTypes.h>

 namespace Multiplayer
 {
@@ -12,9 +12,9 @@

 #pragma once

-#include <Include/IMultiplayerComponentInput.h>
-#include <Include/INetworkTime.h>
-#include <Include/NetworkEntityHandle.h>
+#include <Multiplayer/IMultiplayerComponentInput.h>
+#include <Multiplayer/INetworkTime.h>
+#include <Multiplayer/NetworkEntityHandle.h>
 #include <AzCore/RTTI/TypeSafeIntegral.h>

 namespace Multiplayer
@@ -15,7 +15,7 @@
 #include <AzNetworking/DataStructures/FixedSizeVectorBitset.h>
 #include <AzNetworking/Serialization/ISerializer.h>
 #include <AzNetworking/Utilities/NetworkCommon.h>
-#include <Include/MultiplayerTypes.h>
+#include <Multiplayer/MultiplayerTypes.h>

 namespace Multiplayer
 {
@@ -12,7 +12,7 @@

 #pragma once

-#include <Include/INetworkTime.h>
+#include <Multiplayer/INetworkTime.h>
 #include <AzNetworking/Serialization/ISerializer.h>
 #include <AzNetworking/ConnectionLayer/IConnection.h>
 #include <AzNetworking/Utilities/NetworkCommon.h>
@@ -115,4 +115,4 @@ namespace AZ
    AZ_TYPE_INFO_TEMPLATE(Multiplayer::RewindableObject, "{B2937B44-FEE1-4277-B1E0-863DE76D363F}", AZ_TYPE_INFO_TYPENAME, AZ_TYPE_INFO_AUTO);
 }

-#include <Source/NetworkTime/RewindableObject.inl>
+#include <Multiplayer/RewindableObject.inl>
@@ -1,7 +1,7 @@
 #pragma once

 #include <AzCore/std/containers/list.h>
-#include <Include/MultiplayerTypes.h>
+#include <Multiplayer/MultiplayerTypes.h>

 namespace AZ
 {
@@ -1,6 +1,6 @@
 #include <AzCore/Component/Component.h>
-#include <Source/Components/MultiplayerComponentRegistry.h>
-#include <Include/INetworkEntityManager.h>
+#include <Multiplayer/MultiplayerComponentRegistry.h>
+#include <Multiplayer/INetworkEntityManager.h>
 {% for Component in dataFiles %}
 {% set ComponentDerived = Component.attrib['OverrideComponent']|booleanTrue %}
 {% set ControllerDerived = Component.attrib['OverrideController']|booleanTrue %}
@@ -21,8 +21,8 @@ namespace {{ Namespace }}
 {
    void RegisterMultiplayerComponents()
    {
-        Multiplayer::MultiplayerComponentRegistry* multiplayerComponentRegistry = GetMultiplayerComponentRegistry();
-        Multiplayer::MultiplayerStats& stats = GetMultiplayer()->GetStats();
+        Multiplayer::MultiplayerComponentRegistry* multiplayerComponentRegistry = Multiplayer::GetMultiplayerComponentRegistry();
+        Multiplayer::MultiplayerStats& stats = Multiplayer::GetMultiplayer()->GetStats();
 {% for Component in dataFiles %}
 {%      set ComponentName = Component.attrib['Name'] %}
 {%      set ComponentBaseName = ComponentName %}
@@ -221,13 +221,14 @@ AZStd::fixed_vector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }
 #include <AzCore/EBus/Event.h>
 #include <AzCore/EBus/ScheduledEvent.h>
 #include <AzNetworking/DataStructures/FixedSizeBitsetView.h>
-#include <Include/IMultiplayerComponentInput.h>
-#include <Include/NetworkEntityHandle.h>
-#include <Source/NetworkEntity/EntityReplication/ReplicationRecord.h>
-#include <Source/Components/MultiplayerComponent.h>
-#include <Source/Components/MultiplayerController.h>
-#include <Source/NetworkTime/RewindableObject.h>
-#include <Include/MultiplayerTypes.h>
+#include <Multiplayer/IMultiplayerComponentInput.h>
+#include <Multiplayer/NetworkEntityHandle.h>
+#include <Multiplayer/MultiplayerComponent.h>
+#include <Multiplayer/MultiplayerController.h>
+#include <Multiplayer/NetworkInput.h>
+#include <Multiplayer/ReplicationRecord.h>
+#include <Multiplayer/RewindableObject.h>
+#include <Multiplayer/MultiplayerTypes.h>
 {% call(Include) AutoComponentMacros.ParseIncludes(Component) %}
 #include <{{ Include.attrib['File'] }}>
 {% endcall %}
@@ -359,7 +360,6 @@ namespace {{ Component.attrib['Namespace'] }}
        //! MultiplayerController interface
        //! @{
        Multiplayer::MultiplayerController::InputPriorityOrder GetInputOrder() const override { return Multiplayer::MultiplayerController::InputPriorityOrder::Default; }
-        AZ::Aabb GetRewindBoundsForInput([[maybe_unused]] const NetworkInput& networkInput, [[maybe_unused]] float deltaTime) const override { return AZ::Aabb::CreateNull(); }
        void CreateInput([[maybe_unused]] Multiplayer::NetworkInput& input, [[maybe_unused]] float deltaTime) override {}
        void ProcessInput([[maybe_unused]] Multiplayer::NetworkInput& input, [[maybe_unused]] float deltaTime) override {}
        //! @}
@@ -434,12 +434,12 @@ namespace {{ Component.attrib['Namespace'] }}

        //! MultiplayerComponent interface
        //! @{
-        NetComponentId GetNetComponentId() const override;
+        Multiplayer::NetComponentId GetNetComponentId() const override;
        bool HandleRpcMessage(AzNetworking::IConnection* invokingConnection, Multiplayer::NetEntityRole remoteRole, Multiplayer::NetworkEntityRpcMessage& rpcMessage) override;
        bool SerializeStateDeltaMessage(Multiplayer::ReplicationRecord& replicationRecord, AzNetworking::ISerializer& serializer) override;
        void NotifyStateDeltaChanges(Multiplayer::ReplicationRecord& replicationRecord) override;
        bool HasController() const override;
-        MultiplayerController* GetController() override;
+        Multiplayer::MultiplayerController* GetController() override;

    protected:
        void ConstructController() override;
@@ -484,8 +484,8 @@ namespace {{ Component.attrib['Namespace'] }}
        void NotifyChangesAutonomousToAuthorityProperties(const {{ RecordName }}& replicationRecord) const;

        //! Debug name helpers
-        static const char* GetNetworkPropertyName(PropertyIndex propertyIndex);
-        static const char* GetRpcName(RpcIndex rpcIndex);
+        static const char* GetNetworkPropertyName(Multiplayer::PropertyIndex propertyIndex);
+        static const char* GetRpcName(Multiplayer::RpcIndex rpcIndex);

        AZStd::unique_ptr<{{ RecordName }}> m_currentRecord;
        AZStd::unique_ptr<{{ ControllerName }}> m_controller;
@@ -517,7 +517,7 @@ namespace {{ Component.attrib['Namespace'] }}
 	    {{ Type }}* {{ Name }} = nullptr;
 {% endcall %}

-        static NetComponentId s_netComponentId;
+        static Multiplayer::NetComponentId s_netComponentId;
        friend void RegisterMultiplayerComponents();
    };
 }
@@ -902,8 +902,8 @@ m_{{ LowerFirst(Property.attrib['Name']) }} = m_{{ LowerFirst(Property.attrib['N
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/Component/Entity.h>
-#include <Source/Components/NetBindComponent.h>
-#include <Source/NetworkEntity/NetworkEntityRpcMessage.h>
+#include <Multiplayer/NetBindComponent.h>
+#include <Multiplayer/NetworkEntityRpcMessage.h>
 {% if ComponentDerived or ControllerDerived %}
 #include <{{ Component.attrib['OverrideInclude'] }}>
 {% endif %}
@@ -915,7 +915,7 @@ m_{{ LowerFirst(Property.attrib['Name']) }} = m_{{ LowerFirst(Property.attrib['N

 namespace {{ Component.attrib['Namespace'] }}
 {
-    NetComponentId {{ UpperFirst(ComponentBaseName) }}::s_netComponentId = InvalidNetComponentId;
+    Multiplayer::NetComponentId {{ UpperFirst(ComponentBaseName) }}::s_netComponentId = Multiplayer::InvalidNetComponentId;

    namespace {{ UpperFirst(Component.attrib['Name']) }}Internal
    {
@@ -1408,7 +1408,7 @@ namespace {{ Component.attrib['Namespace'] }}
    }

 {%      endif %}
-    const char* {{ ComponentBaseName }}::GetNetworkPropertyName([[maybe_unused]] PropertyIndex propertyIndex)
+    const char* {{ ComponentBaseName }}::GetNetworkPropertyName([[maybe_unused]] Multiplayer::PropertyIndex propertyIndex)
    {
 {% if NetworkPropertyCount > 0 %}
        const {{ UpperFirst(Component.attrib['Name']) }}Internal::NetworkProperties propertyId = static_cast<{{ UpperFirst(Component.attrib['Name']) }}Internal::NetworkProperties>(propertyIndex);
@@ -1423,7 +1423,7 @@ namespace {{ Component.attrib['Namespace'] }}
        return "Unknown network property";
    }

-    const char* {{ ComponentBaseName }}::GetRpcName([[maybe_unused]] RpcIndex rpcIndex)
+    const char* {{ ComponentBaseName }}::GetRpcName([[maybe_unused]] Multiplayer::RpcIndex rpcIndex)
    {
 {% if RpcCount > 0 %}
        const {{ UpperFirst(Component.attrib['Name']) }}Internal::RemoteProcedure rpcId = static_cast<{{ UpperFirst(Component.attrib['Name']) }}Internal::RemoteProcedure>(rpcIndex);
@@ -10,8 +10,8 @@

    <ComponentRelation Constraint="Weak" HasController="true" Name="NetworkTransformComponent" Namespace="Multiplayer" Include="Source/Components/NetworkTransformComponent.h" />

-    <Include File="Include/MultiplayerTypes.h"/>
-    <Include File="Source/NetworkInput/NetworkInput.h"/>
+    <Include File="Multiplayer/MultiplayerTypes.h"/>
+    <Include File="Multiplayer/NetworkInput.h"/>
    <Include File="Source/NetworkInput/NetworkInputArray.h"/>
    <Include File="Source/NetworkInput/NetworkInputHistory.h"/>
    <Include File="Source/NetworkInput/NetworkInputMigrationVector.h"/>
@@ -2,10 +2,10 @@

 <PacketGroup Name="MultiplayerPackets" PacketStart="CorePackets::PacketType::MAX">
    <Include File="AzNetworking/AutoGen/CorePackets.AutoPackets.h" />
-    <Include File="Include/MultiplayerTypes.h" />
-    <Include File="Include/INetworkTime.h" />
-    <Include File="Source/NetworkEntity/NetworkEntityRpcMessage.h" />
-    <Include File="Source/NetworkEntity/NetworkEntityUpdateMessage.h" />
+    <Include File="Multiplayer/MultiplayerTypes.h" />
+    <Include File="Multiplayer/INetworkTime.h" />
+    <Include File="Multiplayer/NetworkEntityRpcMessage.h" />
+    <Include File="Multiplayer/NetworkEntityUpdateMessage.h" />

    <Packet Name="Connect" Desc="Client connection packet, on success the server will reply with an Accept">
        <Member Type="uint16_t" Name="networkProtocolVersion" Init="0" />
@@ -10,7 +10,7 @@

    <ComponentRelation Constraint="Weak" HasController="false" Name="TransformComponent" Namespace="AzFramework" Include="AzFramework/Components/TransformComponent.h" />

-    <Include File="Include/MultiplayerTypes.h"/>
+    <Include File="Multiplayer/MultiplayerTypes.h"/>

    <NetworkProperty Type="AZ::Quaternion" Name="rotation" Init="AZ::Quaternion::CreateIdentity()" ReplicateFrom="Authority" ReplicateTo="Client" IsRewindable="true" IsPredictable="true" IsPublic="true" Container="Object" ExposeToEditor="false" GenerateEventBindings="true" />
    <NetworkProperty Type="AZ::Vector3" Name="translation" Init="AZ::Vector3::CreateZero()" ReplicateFrom="Authority" ReplicateTo="Client" IsRewindable="true" IsPredictable="true" IsPublic="true" Container="Object" ExposeToEditor="false" GenerateEventBindings="true" />
@@ -13,7 +13,7 @@
 #pragma once

 #include <Source/AutoGen/LocalPredictionPlayerInputComponent.AutoComponent.h>
-#include <Source/Components/NetBindComponent.h>
+#include <Multiplayer/NetBindComponent.h>

 namespace Multiplayer
 {
@@ -10,8 +10,8 @@
 *
 */

-#include <Source/Components/MultiplayerComponent.h>
-#include <Source/Components/NetBindComponent.h>
+#include <Multiplayer/MultiplayerComponent.h>
+#include <Multiplayer/NetBindComponent.h>
 #include <AzCore/Serialization/SerializeContext.h>

 namespace Multiplayer
@@ -10,7 +10,7 @@
 *
 */

-#include <Source/Components/MultiplayerComponentRegistry.h>
+#include <Multiplayer/MultiplayerComponentRegistry.h>

 namespace Multiplayer
 {
@@ -10,9 +10,9 @@
 *
 */

-#include <Source/Components/MultiplayerController.h>
-#include <Source/Components/MultiplayerComponent.h>
-#include <Source/Components/NetBindComponent.h>
+#include <Multiplayer/MultiplayerController.h>
+#include <Multiplayer/MultiplayerComponent.h>
+#include <Multiplayer/NetBindComponent.h>

 namespace Multiplayer
 {
@@ -10,13 +10,13 @@
 *
 */

-#include <Source/Components/NetBindComponent.h>
-#include <Source/Components/MultiplayerComponent.h>
-#include <Source/Components/MultiplayerController.h>
-#include <Source/NetworkEntity/NetworkEntityRpcMessage.h>
-#include <Source/NetworkEntity/NetworkEntityUpdateMessage.h>
-#include <Source/NetworkInput/NetworkInput.h>
-#include <Include/INetworkEntityManager.h>
+#include <Multiplayer/NetBindComponent.h>
+#include <Multiplayer/NetworkEntityRpcMessage.h>
+#include <Multiplayer/NetworkEntityUpdateMessage.h>
+#include <Multiplayer/NetworkInput.h>
+#include <Multiplayer/INetworkEntityManager.h>
+#include <Multiplayer/MultiplayerComponent.h>
+#include <Multiplayer/MultiplayerController.h>
 #include <AzCore/Console/IConsole.h>
 #include <AzCore/Console/ILogger.h>
 #include <AzCore/Interface/Interface.h>
@@ -177,21 +177,6 @@ namespace Multiplayer
        }
    }

-    AZ::Aabb NetBindComponent::GetRewindBoundsForInput(const NetworkInput& networkInput, float deltaTime) const
-    {
-        AZ_Assert(m_netEntityRole == NetEntityRole::Authority, "Incorrect network role for computing rewind bounds");
-        AZ::Aabb bounds = AZ::Aabb::CreateNull();
-        for (MultiplayerComponent* multiplayerComponent : m_multiplayerInputComponentVector)
-        {
-            const AZ::Aabb componentBounds = multiplayerComponent->GetController()->GetRewindBoundsForInput(networkInput, deltaTime);
-            if (componentBounds.IsValid())
-            {
-                bounds.AddAabb(componentBounds);
-            }
-        }
-        return bounds;
-    }
-
    bool NetBindComponent::HandleRpcMessage(AzNetworking::IConnection* invokingConnection, NetEntityRole remoteRole, NetworkEntityRpcMessage& message)
    {
        auto findIt = m_multiplayerComponentMap.find(message.GetComponentId());
@@ -12,7 +12,7 @@

 #pragma once

-#include <Include/IConnectionData.h>
+#include <Multiplayer/IConnectionData.h>
 #include <Source/NetworkEntity/EntityReplication/EntityReplicationManager.h>

 namespace Multiplayer
@@ -12,7 +12,7 @@

 #pragma once

-#include <Include/IConnectionData.h>
+#include <Multiplayer/IConnectionData.h>
 #include <Source/NetworkEntity/EntityReplication/EntityReplicationManager.h>

 namespace Multiplayer
@@ -12,7 +12,7 @@

 #pragma once

-#include <Include/IEntityDomain.h>
+#include <Multiplayer/IEntityDomain.h>

 namespace Multiplayer 
 {
@@ -13,10 +13,10 @@
 #include <Source/Multiplayer_precompiled.h>
 #include <Source/MultiplayerGem.h>
 #include <Source/MultiplayerSystemComponent.h>
-#include <Source/Components/NetBindComponent.h>
 #include <Source/AutoGen/AutoComponentTypes.h>
 #include <Source/Pipeline/NetBindMarkerComponent.h>
 #include <Source/Pipeline/NetworkSpawnableHolderComponent.h>
+#include <Multiplayer/NetBindComponent.h>
 #include <AzNetworking/Framework/NetworkingSystemComponent.h>

 namespace Multiplayer
@@ -11,13 +11,13 @@
 */

 #include <Source/MultiplayerSystemComponent.h>
-#include <Source/Components/MultiplayerComponent.h>
 #include <Source/AutoGen/AutoComponentTypes.h>
 #include <Source/ConnectionData/ClientToServerConnectionData.h>
 #include <Source/ConnectionData/ServerToClientConnectionData.h>
 #include <Source/ReplicationWindows/NullReplicationWindow.h>
 #include <Source/ReplicationWindows/ServerToClientReplicationWindow.h>
 #include <Source/EntityDomains/FullOwnershipEntityDomain.h>
+#include <Multiplayer/MultiplayerComponent.h>
 #include <AzNetworking/Framework/INetworking.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Interface/Interface.h>
@@ -19,7 +19,7 @@
 #include <AzCore/Threading/ThreadSafeDeque.h>
 #include <AzCore/std/string/string.h>
 #include <AzNetworking/ConnectionLayer/IConnectionListener.h>
-#include <Include/IMultiplayer.h>
+#include <Multiplayer/IMultiplayer.h>
 #include <Source/NetworkTime/NetworkTime.h>
 #include <Source/NetworkEntity/NetworkEntityManager.h>
 #include <Source/AutoGen/Multiplayer.AutoPacketDispatcher.h>
@@ -14,14 +14,14 @@
 #include <Source/NetworkEntity/EntityReplication/EntityReplicator.h>
 #include <Source/NetworkEntity/EntityReplication/PropertyPublisher.h>
 #include <Source/NetworkEntity/EntityReplication/PropertySubscriber.h>
-#include <Source/NetworkEntity/NetworkEntityUpdateMessage.h>
-#include <Source/NetworkEntity/NetworkEntityRpcMessage.h>
-#include <Source/Components/NetBindComponent.h>
 #include <Source/AutoGen/Multiplayer.AutoPackets.h>
-#include <Include/IEntityDomain.h>
-#include <Include/IMultiplayer.h>
-#include <Include/INetworkEntityManager.h>
-#include <Include/IReplicationWindow.h>
+#include <Multiplayer/NetworkEntityUpdateMessage.h>
+#include <Multiplayer/NetworkEntityRpcMessage.h>
+#include <Multiplayer/NetBindComponent.h>
+#include <Multiplayer/IEntityDomain.h>
+#include <Multiplayer/IMultiplayer.h>
+#include <Multiplayer/INetworkEntityManager.h>
+#include <Multiplayer/IReplicationWindow.h>
 #include <AzNetworking/ConnectionLayer/IConnection.h>
 #include <AzNetworking/ConnectionLayer/IConnectionListener.h>
 #include <AzNetworking/PacketLayer/IPacketHeader.h>
@@ -13,11 +13,11 @@
 #pragma once

 #include <Source/NetworkEntity/EntityReplication/EntityReplicator.h>
-#include <Source/Components/NetBindComponent.h>
-#include <Include/INetworkEntityManager.h>
-#include <Include/IReplicationWindow.h>
-#include <Include/IEntityDomain.h>
-#include <Include/NetworkEntityHandle.h>
+#include <Multiplayer/NetBindComponent.h>
+#include <Multiplayer/INetworkEntityManager.h>
+#include <Multiplayer/IReplicationWindow.h>
+#include <Multiplayer/IEntityDomain.h>
+#include <Multiplayer/NetworkEntityHandle.h>
 #include <AzNetworking/DataStructures/TimeoutQueue.h>
 #include <AzNetworking/PacketLayer/IPacketHeader.h>
 #include <AzCore/std/containers/map.h>
@@ -16,11 +16,11 @@
 #include <Source/NetworkEntity/EntityReplication/PropertySubscriber.h>
 #include <Source/NetworkEntity/NetworkEntityAuthorityTracker.h>
 #include <Source/NetworkEntity/NetworkEntityTracker.h>
-#include <Source/NetworkEntity/NetworkEntityRpcMessage.h>
-#include <Source/Components/NetBindComponent.h>
 #include <Source/Components/NetworkTransformComponent.h>
 #include <Source/AutoGen/Multiplayer.AutoPackets.h>
-#include <Include/IMultiplayer.h>
+#include <Multiplayer/IMultiplayer.h>
+#include <Multiplayer/NetworkEntityRpcMessage.h>
+#include <Multiplayer/NetBindComponent.h>

 #include <AzNetworking/PacketLayer/IPacket.h>
 #include <AzNetworking/Serialization/ISerializer.h>
@@ -18,8 +18,8 @@
 #include <AzCore/Component/EntityBus.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
 #include <AzCore/std/containers/ring_buffer.h>
-#include <Source/Components/NetBindComponent.h>
-#include <Source/NetworkEntity/NetworkEntityUpdateMessage.h>
+#include <Multiplayer/NetBindComponent.h>
+#include <Multiplayer/NetworkEntityUpdateMessage.h>

 namespace AzNetworking
 {
@@ -12,7 +12,7 @@

 #pragma once

-#include <Source/Components/NetBindComponent.h>
+#include <Multiplayer/NetBindComponent.h>
 #include <AzCore/std/containers/ring_buffer.h>

 namespace AzNetworking
@@ -12,7 +12,7 @@

 #include <Source/NetworkEntity/EntityReplication/PropertySubscriber.h>
 #include <Source/NetworkEntity/EntityReplication/EntityReplicationManager.h>
-#include <Source/Components/NetBindComponent.h>
+#include <Multiplayer/NetBindComponent.h>

 namespace Multiplayer
 {
@@ -10,7 +10,7 @@
 *
 */

-#include <Source/NetworkEntity/EntityReplication/ReplicationRecord.h>
+#include <Multiplayer/ReplicationRecord.h>

 namespace Multiplayer
 {
@@ -11,8 +11,8 @@
 */

 #include <Source/NetworkEntity/NetworkEntityAuthorityTracker.h>
-#include <Source/Components/NetBindComponent.h>
-#include <Include/INetworkEntityManager.h>
+#include <Multiplayer/NetBindComponent.h>
+#include <Multiplayer/INetworkEntityManager.h>
 #include <AzCore/Console/IConsole.h>
 #include <AzCore/Console/ILogger.h>
 #include <AzNetworking/Utilities/NetworkCommon.h>
@@ -10,11 +10,11 @@
 *
 */

-#include <Include/NetworkEntityHandle.h>
+#include <Multiplayer/NetworkEntityHandle.h>
+#include <Multiplayer/MultiplayerController.h>
+#include <Multiplayer/MultiplayerComponent.h>
+#include <Multiplayer/NetBindComponent.h>
 #include <Source/NetworkEntity/NetworkEntityTracker.h>
-#include <Source/Components/NetBindComponent.h>
-#include <Source/Components/MultiplayerController.h>
-#include <Source/Components/MultiplayerComponent.h>
 #include <AzCore/Console/IConsole.h>
 #include <AzCore/Console/ILogger.h>

@@ -11,7 +11,6 @@
 */

 #include <Source/NetworkEntity/NetworkEntityManager.h>
-
 #include <AzCore/Asset/AssetManager.h>
 #include <AzCore/Console/IConsole.h>
 #include <AzCore/Console/ILogger.h>
@@ -22,9 +21,9 @@
 #include <AzFramework/Entity/EntityContextBus.h>
 #include <AzFramework/Entity/GameEntityContextBus.h>
 #include <AzFramework/Spawnable/SpawnableEntitiesInterface.h>
-#include <Include/IMultiplayer.h>
+#include <Multiplayer/IMultiplayer.h>
+#include <Multiplayer/NetBindComponent.h>
 #include <Pipeline/NetworkSpawnableHolderComponent.h>
-#include <Source/Components/NetBindComponent.h>

 namespace Multiplayer
 {
@@ -17,11 +17,11 @@
 #include <AzFramework/Spawnable/RootSpawnableInterface.h>
 #include <Source/NetworkEntity/NetworkEntityAuthorityTracker.h>
 #include <Source/NetworkEntity/NetworkEntityTracker.h>
-#include <Source/NetworkEntity/NetworkEntityRpcMessage.h>
-#include <Include/IEntityDomain.h>
-#include <Include/INetworkEntityManager.h>
 #include <Source/NetworkEntity/NetworkSpawnableLibrary.h>
-#include <Source/Components/MultiplayerComponentRegistry.h>
+#include <Multiplayer/IEntityDomain.h>
+#include <Multiplayer/INetworkEntityManager.h>
+#include <Multiplayer/MultiplayerComponentRegistry.h>
+#include <Multiplayer/NetworkEntityRpcMessage.h>

 namespace Multiplayer
 {
@@ -10,7 +10,7 @@
 *
 */

-#include <Source/NetworkEntity/NetworkEntityRpcMessage.h>
+#include <Multiplayer/NetworkEntityRpcMessage.h>
 #include <AzNetworking/Serialization/NetworkInputSerializer.h>
 #include <AzNetworking/Serialization/NetworkOutputSerializer.h>
 #include <AzCore/Console/ILogger.h>
@@ -11,7 +11,7 @@
 */

 #include <Source/NetworkEntity/NetworkEntityTracker.h>
-#include <Include/NetworkEntityHandle.h>
+#include <Multiplayer/NetworkEntityHandle.h>
 #include <AzCore/Console/IConsole.h>
 #include <AzCore/Console/ILogger.h>

@@ -12,8 +12,8 @@

 #pragma once

-#include <Include/MultiplayerTypes.h>
-#include <Include/NetworkEntityHandle.h>
+#include <Multiplayer/MultiplayerTypes.h>
+#include <Multiplayer/NetworkEntityHandle.h>
 #include <AzCore/std/containers/unordered_map.h>
 #include <AzCore/Component/Entity.h>

@@ -10,7 +10,7 @@
 *
 */

-#include <Source/NetworkEntity/NetworkEntityUpdateMessage.h>
+#include <Multiplayer/NetworkEntityUpdateMessage.h>
 #include <AzNetworking/Serialization/NetworkInputSerializer.h>
 #include <AzNetworking/Serialization/NetworkOutputSerializer.h>
 #include <AzCore/Console/ILogger.h>
@@ -10,8 +10,8 @@
 *
 */

-#include <Source/NetworkInput/NetworkInput.h>
-#include <Source/Components/NetBindComponent.h>
+#include <Multiplayer/NetworkInput.h>
+#include <Multiplayer/NetBindComponent.h>
 #include <AzCore/Console/IConsole.h>
 #include <AzCore/Console/ILogger.h>

@@ -11,7 +11,7 @@
 */

 #include <Source/NetworkInput/NetworkInputArray.h>
-#include <Include/INetworkEntityManager.h>
+#include <Multiplayer/INetworkEntityManager.h>
 #include <AzNetworking/Serialization/ISerializer.h>
 #include <AzNetworking/Serialization/DeltaSerializer.h>

@@ -12,8 +12,8 @@

 #pragma once

-#include <Source/NetworkInput/NetworkInput.h>
-#include <Include/NetworkEntityHandle.h>
+#include <Multiplayer/NetworkInput.h>
+#include <Multiplayer/NetworkEntityHandle.h>
 #include <AzCore/std/containers/array.h>
 #include <AzCore/std/containers/fixed_vector.h>

@@ -11,7 +11,7 @@
 */

 #include <Source/NetworkInput/NetworkInputChild.h>
-#include <Include/IMultiplayer.h>
+#include <Multiplayer/IMultiplayer.h>
 #include <AzNetworking/Serialization/ISerializer.h>

 namespace Multiplayer
@@ -12,7 +12,7 @@

 #pragma once

-#include <Source/NetworkInput/NetworkInput.h>
+#include <Multiplayer/NetworkInput.h>

 namespace Multiplayer
 {
@@ -12,7 +12,7 @@

 #pragma once

-#include <Source/NetworkInput/NetworkInput.h>
+#include <Multiplayer/NetworkInput.h>
 #include <AzCore/std/containers/deque.h>

 namespace Multiplayer
@@ -11,7 +11,7 @@
 */

 #include <Source/NetworkInput/NetworkInputMigrationVector.h>
-#include <Include/IMultiplayer.h>
+#include <Multiplayer/IMultiplayer.h>
 #include <AzNetworking/Serialization/ISerializer.h>

 namespace Multiplayer
@@ -12,8 +12,8 @@

 #pragma once

-#include <Source/NetworkInput/NetworkInput.h>
-#include <Include/NetworkEntityHandle.h>
+#include <Multiplayer/NetworkInput.h>
+#include <Multiplayer/NetworkEntityHandle.h>
 #include <AzCore/std/containers/array.h>
 #include <AzCore/std/containers/fixed_vector.h>

@@ -11,8 +11,8 @@
 */

 #include <Source/NetworkTime/NetworkTime.h>
-#include <Source/Components/NetBindComponent.h>
-#include <Include/IMultiplayer.h>
+#include <Multiplayer/NetBindComponent.h>
+#include <Multiplayer/IMultiplayer.h>
 #include <AzFramework/Visibility/IVisibilitySystem.h>

 namespace Multiplayer
@@ -12,7 +12,7 @@

 #pragma once

-#include <Include/INetworkTime.h>
+#include <Multiplayer/INetworkTime.h>
 #include <AzCore/Component/Component.h>
 #include <AzCore/Console/IConsole.h>

@@ -12,7 +12,7 @@

 #pragma once

-#include <Include/IReplicationWindow.h>
+#include <Multiplayer/IReplicationWindow.h>

 namespace Multiplayer
 {
@@ -11,7 +11,7 @@
 */

 #include <Source/ReplicationWindows/ServerToClientReplicationWindow.h>
-#include <Source/Components/NetBindComponent.h>
+#include <Multiplayer/NetBindComponent.h>
 #include <AzFramework/Visibility/IVisibilitySystem.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Console/ILogger.h>
@@ -12,9 +12,9 @@

 #pragma once

-#include <Include/IMultiplayer.h>
-#include <Include/IReplicationWindow.h>
-#include <Include/NetworkEntityHandle.h>
+#include <Multiplayer/IMultiplayer.h>
+#include <Multiplayer/IReplicationWindow.h>
+#include <Multiplayer/NetworkEntityHandle.h>
 #include <AzNetworking/ConnectionLayer/IConnection.h>
 #include <AzCore/Component/EntityBus.h>
 #include <AzCore/EBus/ScheduledEvent.h>
@@ -10,18 +10,28 @@
 #

 set(FILES
-    Include/IConnectionData.h
-    Include/IEntityDomain.h
-    Include/IMultiplayer.h
-    Include/IMultiplayerComponentInput.h
-    Include/INetworkEntityManager.h
-    Include/INetworkTime.h
-    Include/IReplicationWindow.h
-    Include/MultiplayerStats.cpp
-    Include/MultiplayerStats.h
-    Include/MultiplayerTypes.h
-    Include/NetworkEntityHandle.h
-    Include/NetworkEntityHandle.inl
+    Include/Multiplayer/IConnectionData.h
+    Include/Multiplayer/IEntityDomain.h
+    Include/Multiplayer/IMultiplayer.h
+    Include/Multiplayer/IMultiplayerComponentInput.h
+    Include/Multiplayer/INetworkEntityManager.h
+    Include/Multiplayer/INetworkTime.h
+    Include/Multiplayer/IReplicationWindow.h
+    Include/Multiplayer/MultiplayerComponent.h
+    Include/Multiplayer/MultiplayerController.h
+    Include/Multiplayer/MultiplayerComponentRegistry.h
+    Include/Multiplayer/MultiplayerStats.cpp
+    Include/Multiplayer/MultiplayerStats.h
+    Include/Multiplayer/MultiplayerTypes.h
+    Include/Multiplayer/NetBindComponent.h
+	Include/Multiplayer/NetworkEntityRpcMessage.h
+    Include/Multiplayer/NetworkEntityUpdateMessage.h
+    Include/Multiplayer/NetworkEntityHandle.h
+    Include/Multiplayer/NetworkEntityHandle.inl
+    Include/Multiplayer/NetworkInput.h
+	Include/Multiplayer/ReplicationRecord.h
+    Include/Multiplayer/RewindableObject.h
+    Include/Multiplayer/RewindableObject.inl
    Source/Multiplayer_precompiled.cpp
    Source/Multiplayer_precompiled.h
    Source/MultiplayerSystemComponent.cpp
@@ -36,14 +46,10 @@ set(FILES
    Source/AutoGen/NetworkTransformComponent.AutoComponent.xml
    Source/Components/LocalPredictionPlayerInputComponent.cpp
    Source/Components/LocalPredictionPlayerInputComponent.h
-    Source/Components/MultiplayerComponentRegistry.cpp
-    Source/Components/MultiplayerComponentRegistry.h
    Source/Components/MultiplayerComponent.cpp
-    Source/Components/MultiplayerComponent.h
    Source/Components/MultiplayerController.cpp
-    Source/Components/MultiplayerController.h
+	Source/Components/MultiplayerComponentRegistry.cpp
    Source/Components/NetBindComponent.cpp
-    Source/Components/NetBindComponent.h
    Source/Components/NetworkTransformComponent.cpp
    Source/Components/NetworkTransformComponent.h
    Source/ConnectionData/ClientToServerConnectionData.cpp
@@ -64,7 +70,6 @@ set(FILES
    Source/NetworkEntity/EntityReplication/PropertySubscriber.cpp
    Source/NetworkEntity/EntityReplication/PropertySubscriber.h
    Source/NetworkEntity/EntityReplication/ReplicationRecord.cpp
-    Source/NetworkEntity/EntityReplication/ReplicationRecord.h
    Source/NetworkEntity/NetworkEntityAuthorityTracker.cpp
    Source/NetworkEntity/NetworkEntityAuthorityTracker.h
    Source/NetworkEntity/NetworkEntityHandle.cpp
@@ -73,14 +78,11 @@ set(FILES
    Source/NetworkEntity/NetworkSpawnableLibrary.cpp
    Source/NetworkEntity/NetworkSpawnableLibrary.h
    Source/NetworkEntity/NetworkEntityRpcMessage.cpp
-    Source/NetworkEntity/NetworkEntityRpcMessage.h
    Source/NetworkEntity/NetworkEntityTracker.cpp
    Source/NetworkEntity/NetworkEntityTracker.h
    Source/NetworkEntity/NetworkEntityTracker.inl
    Source/NetworkEntity/NetworkEntityUpdateMessage.cpp
-    Source/NetworkEntity/NetworkEntityUpdateMessage.h
    Source/NetworkInput/NetworkInput.cpp
-    Source/NetworkInput/NetworkInput.h
    Source/NetworkInput/NetworkInputArray.cpp
    Source/NetworkInput/NetworkInputArray.h
    Source/NetworkInput/NetworkInputChild.cpp
@@ -91,8 +93,6 @@ set(FILES
    Source/NetworkInput/NetworkInputMigrationVector.h
    Source/NetworkTime/NetworkTime.cpp
    Source/NetworkTime/NetworkTime.h
-    Source/NetworkTime/RewindableObject.h
-    Source/NetworkTime/RewindableObject.inl
    Source/Pipeline/NetBindMarkerComponent.cpp
    Source/Pipeline/NetBindMarkerComponent.h
    Source/Pipeline/NetworkSpawnableHolderComponent.cpp