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
@@ -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
 {
@@ -1,104 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzNetworking/DataStructures/FixedSizeVectorBitset.h>
-#include <AzNetworking/Serialization/ISerializer.h>
-#include <AzNetworking/Utilities/NetworkCommon.h>
-#include <Include/MultiplayerTypes.h>
-
-namespace Multiplayer
-{
-    struct ReplicationRecordStats
-    {
-        ReplicationRecordStats() = default;
-        ReplicationRecordStats
-        (
-            uint32_t authorityToAuthorityCount,
-            uint32_t authorityToClientCount,
-            uint32_t authorityToServerCount,
-            uint32_t authorityToAutonomousCount,
-            uint32_t autonomousToAuthorityCount
-        );
-
-        uint32_t m_authorityToAuthorityCount = 0;
-        uint32_t m_authorityToClientCount = 0;
-        uint32_t m_authorityToServerCount = 0;
-        uint32_t m_authorityToAutonomousCount = 0;
-        uint32_t m_autonomousToAuthorityCount = 0;
-
-        bool operator ==(const ReplicationRecordStats& rhs) const;
-        ReplicationRecordStats operator-(const ReplicationRecordStats& rhs) const;
-    };
-
-    class ReplicationRecord
-    {
-    public:
-        static constexpr uint32_t MaxRecordBits = 2048;
-
-        ReplicationRecord() = default;
-        ReplicationRecord(NetEntityRole netEntityRole);
-
-        void SetNetworkRole(NetEntityRole netEntityRole);
-        NetEntityRole GetNetworkRole() const;
-
-        bool AreAllBitsConsumed() const;
-        void ResetConsumedBits();
-
-        void Clear();
-
-        void Append(const ReplicationRecord &rhs);
-        void Subtract(const ReplicationRecord &rhs);
-        bool HasChanges() const;
-
-        bool Serialize(AzNetworking::ISerializer& serializer);
-
-        void ConsumeAuthorityToAuthorityBits(uint32_t consumedBits);
-        void ConsumeAuthorityToClientBits(uint32_t consumedBits);
-        void ConsumeAuthorityToServerBits(uint32_t consumedBits);
-        void ConsumeAuthorityToAutonomousBits(uint32_t consumedBits);
-        void ConsumeAutonomousToAuthorityBits(uint32_t consumedBits);
-
-        bool ContainsAuthorityToAuthorityBits() const;
-        bool ContainsAuthorityToClientBits() const;
-        bool ContainsAuthorityToServerBits() const;
-        bool ContainsAuthorityToAutonomousBits() const;
-        bool ContainsAutonomousToAuthorityBits() const;
-
-        uint32_t GetRemainingAuthorityToAuthorityBits() const;
-        uint32_t GetRemainingAuthorityToClientBits() const;
-        uint32_t GetRemainingAuthorityToServerBits() const;
-        uint32_t GetRemainingAuthorityToAutonomousBits() const;
-        uint32_t GetRemainingAutonomousToAuthorityBits() const;
-
-        ReplicationRecordStats GetStats() const;
-
-        using RecordBitset = AzNetworking::FixedSizeVectorBitset<MaxRecordBits>;
-        RecordBitset m_authorityToAuthority;
-        RecordBitset m_authorityToClient;
-        RecordBitset m_authorityToServer;
-        RecordBitset m_authorityToAutonomous;
-        RecordBitset m_autonomousToAuthority;
-
-        uint32_t m_authorityToAuthorityConsumedBits = 0;
-        uint32_t m_authorityToClientConsumedBits = 0;
-        uint32_t m_authorityToServerConsumedBits = 0;
-        uint32_t m_authorityToAutonomousConsumedBits = 0;
-        uint32_t m_autonomousToAuthorityConsumedBits = 0;
-
-        // Sequence number this ReplicationRecord was sent on
-        AzNetworking::PacketId m_sentPacketId = AzNetworking::InvalidPacketId;
-
-        NetEntityRole m_netEntityRole = NetEntityRole::InvalidRole;;
-    };
-}