Merging latest dev

Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-10-21 10:11:37 -07:00
parent c228e77e1c 1c409e0a23
commit 79b41686c4
722 changed files with 17211 additions and 651879 deletions
@@ -20,6 +20,7 @@
 namespace Multiplayer
 {
    class NetSystemComponent;
+    class NetworkHierarchyRootComponent;

    class ServerToClientReplicationWindow
        : public IReplicationWindow
@@ -56,7 +57,7 @@ namespace Multiplayer
        void OnEntityActivated(AZ::Entity* entity);
        void OnEntityDeactivated(AZ::Entity* entity);

-        //void CollectControlledEntitiesRecursive(ReplicationSet& replicationSet, EntityHierarchyComponent::Authority& hierarchyController);
+        void UpdateHierarchyReplicationSet(ReplicationSet& replicationSet, NetworkHierarchyRootComponent& hierarchyComponent);

        void EvaluateConnection();
        void AddEntityToReplicationSet(ConstNetworkEntityHandle& entityHandle, float priority, float distanceSquared);