Integrating up through commit 90f050496

This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
@@ -62,26 +62,26 @@ namespace Multiplayer
void OnEntityDeactivated(const AZ::EntityId&) override;
//! @}
//void CollectControlledEntitiesRecursive(ReplicationSet& a_ReplicationSet, EntityHierarchyComponent::Authority& a_HierarchyController);
//void OnAddFilteredEntity(EntityIdT a_FitleredEntityId);
//void CollectControlledEntitiesRecursive(ReplicationSet& replicationSet, EntityHierarchyComponent::Authority& hierarchyController);
//void OnAddFilteredEntity(NetEntityId filteredEntityId);
void EvaluateConnection();
void AddEntityToReplicationSet(ConstNetworkEntityHandle& entityHandle, float priority, float distanceSquared);
ServerToClientReplicationWindow& operator=(const ServerToClientReplicationWindow&) = delete;
NetworkEntityHandle m_controlledEntity;
AZ::TransformInterface* m_controlledEntityTransform = nullptr;
//FilteredEntityComponent::Authority* mp_ControlledFilteredEntityComponent = nullptr;
//NetSystemComponent* mp_ControlledNetSystemComponent = nullptr;
// sorted in reverse, lowest priority is the top()
ReplicationCandidateQueue m_candidateQueue;
ReplicationSet m_replicationSet;
AZ::ScheduledEvent m_updateWindowEvent;
NetworkEntityHandle m_controlledEntity;
AZ::TransformInterface* m_controlledEntityTransform = nullptr;
//FilteredEntityComponent::Authority* m_controlledFilteredEntityComponent = nullptr;
//NetBindComponent* m_controlledNetBindComponent = nullptr;
const AzNetworking::IConnection* m_connection = nullptr;
float m_minPriorityReplicated = 0.0f; ///< Lowest replicated entity priority in last update