merging latest development

Signed-off-by: kberg-amzn <karlberg@amazon.com>

Gems/Multiplayer/Code/Source/Components/LocalPredictionPlayerInputComponent.cpp

@@ -185,12 +185,9 @@ namespace Multiplayer
             // Discard move input events, client may be speed hacking
             if (m_clientBankedTime < sv_MaxBankTimeWindowSec)
             {
-                // Client blends from previous frame to target so here we subtract blend factor to get to that state
-                const float blendFactor = AZStd::min(AZStd::max(0.f, input.GetHostBlendFactor()), 1.0f);
-                const AZ::TimeMs blendMs = AZ::TimeMs(static_cast<float>(static_cast<AZ::TimeMs>(cl_InputRateMs)) * (1.0f - blendFactor));
                 m_clientBankedTime = AZStd::min(m_clientBankedTime + clientInputRateSec, (double)sv_MaxBankTimeWindowSec); // clamp to boundary
                 {
-                    ScopedAlterTime scopedTime(input.GetHostFrameId(), input.GetHostTimeMs() - blendMs, input.GetHostBlendFactor(), invokingConnection->GetConnectionId());
+                    ScopedAlterTime scopedTime(input.GetHostFrameId(), input.GetHostTimeMs(), input.GetHostBlendFactor(), invokingConnection->GetConnectionId());
                     GetNetBindComponent()->ProcessInput(input, static_cast<float>(clientInputRateSec));
                 }
 
@@ -436,10 +433,13 @@ namespace Multiplayer
 
             NetworkInputArray inputArray(GetEntityHandle());
             NetworkInput& input = inputArray[0];
+            const float blendFactor = AZStd::min(AZStd::max(0.f, multiplayer->GetCurrentBlendFactor()), 1.0f);
+            const AZ::TimeMs blendMs = AZ::TimeMs(static_cast<float>(static_cast<AZ::TimeMs>(cl_InputRateMs)) * (1.0f - blendFactor));
 
             input.SetClientInputId(m_clientInputId);
             input.SetHostFrameId(networkTime->GetHostFrameId());
-            input.SetHostTimeMs(multiplayer->GetCurrentHostTimeMs());
+            // Account for the client blending from previous frame to current
+            input.SetHostTimeMs(multiplayer->GetCurrentHostTimeMs() - blendMs);
             input.SetHostBlendFactor(multiplayer->GetCurrentBlendFactor());
 
             // Allow components to form the input for this frame

Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp

@@ -395,9 +395,9 @@ namespace Multiplayer
         m_entityServerMigrationEvent.Signal(m_netEntityHandle, hostId, connectionId);
     }
 
-    void NetBindComponent::NotifyPreRender(float deltaTime, float blendFactor)
+    void NetBindComponent::NotifyPreRender(float deltaTime)
     {
-        m_entityPreRenderEvent.Signal(deltaTime, blendFactor);
+        m_entityPreRenderEvent.Signal(deltaTime);
     }
 
     void NetBindComponent::NotifyCorrection()

Gems/Multiplayer/Code/Source/Components/NetworkTransformComponent.cpp

@@ -26,11 +26,7 @@ namespace Multiplayer
     }
 
     NetworkTransformComponent::NetworkTransformComponent()
-        : m_rotationEventHandler([this](const AZ::Quaternion& rotation) { OnRotationChangedEvent(rotation); })
-        , m_translationEventHandler([this](const AZ::Vector3& translation) { OnTranslationChangedEvent(translation); })
-        , m_scaleEventHandler([this](float scale) { OnScaleChangedEvent(scale); })
-        , m_resetCountEventHandler([this](const uint8_t&) { OnResetCountChangedEvent(); })
-        , m_entityPreRenderEventHandler([this](float deltaTime, float blendFactor) { OnPreRender(deltaTime, blendFactor); })
+        : m_entityPreRenderEventHandler([this](float deltaTime) { OnPreRender(deltaTime); })
         , m_entityCorrectionEventHandler([this]() { OnCorrection(); })
     {
         ;
@@ -43,15 +39,8 @@ namespace Multiplayer
 
     void NetworkTransformComponent::OnActivate([[maybe_unused]] Multiplayer::EntityIsMigrating entityIsMigrating)
     {
-        RotationAddEvent(m_rotationEventHandler);
-        TranslationAddEvent(m_translationEventHandler);
-        ScaleAddEvent(m_scaleEventHandler);
-        ResetCountAddEvent(m_resetCountEventHandler);
         GetNetBindComponent()->AddEntityPreRenderEventHandler(m_entityPreRenderEventHandler);
         GetNetBindComponent()->AddEntityCorrectionEventHandler(m_entityCorrectionEventHandler);
-
-        // When coming into relevance, reset all blending factors so we don't interpolate to our start position
-        OnResetCountChangedEvent();
     }
 
     void NetworkTransformComponent::OnDeactivate([[maybe_unused]] Multiplayer::EntityIsMigrating entityIsMigrating)
@@ -59,59 +48,31 @@ namespace Multiplayer
         ;
     }
 
-    void NetworkTransformComponent::OnRotationChangedEvent(const AZ::Quaternion& rotation)
-    {
-        m_previousTransform.SetRotation(m_targetTransform.GetRotation());
-        m_targetTransform.SetRotation(rotation);
-        UpdateTargetHostFrameId();
-    }
-
-    void NetworkTransformComponent::OnTranslationChangedEvent(const AZ::Vector3& translation)
-    {
-        m_previousTransform.SetTranslation(m_targetTransform.GetTranslation());
-        m_targetTransform.SetTranslation(translation);
-        UpdateTargetHostFrameId();
-    }
-
-    void NetworkTransformComponent::OnScaleChangedEvent(float scale)
-    {
-        m_previousTransform.SetUniformScale(m_targetTransform.GetUniformScale());
-        m_targetTransform.SetUniformScale(scale);
-        UpdateTargetHostFrameId();
-    }
-
-    void NetworkTransformComponent::OnResetCountChangedEvent()
-    {
-        m_targetTransform.SetRotation(GetRotation());
-        m_targetTransform.SetTranslation(GetTranslation());
-        m_targetTransform.SetUniformScale(GetScale());
-        m_previousTransform = m_targetTransform;
-    }
-
-    void NetworkTransformComponent::UpdateTargetHostFrameId()
-    {
-        HostFrameId currentHostFrameId = Multiplayer::GetNetworkTime()->GetHostFrameId();
-        if (currentHostFrameId > m_targetHostFrameId)
-        {
-            m_targetHostFrameId = currentHostFrameId;
-        }
-    }
-
-    void NetworkTransformComponent::OnPreRender([[maybe_unused]] float deltaTime, float blendFactor)
+    void NetworkTransformComponent::OnPreRender([[maybe_unused]] float deltaTime)
     {
         if (!HasController())
         {
             AZ::Transform blendTransform;
-            if (Multiplayer::GetNetworkTime() && Multiplayer::GetNetworkTime()->GetHostFrameId() > m_targetHostFrameId)
+            blendTransform.SetRotation(GetRotation());
+            blendTransform.SetTranslation(GetTranslation());
+            blendTransform.SetUniformScale(GetScale());
+
+            const float blendFactor = GetMultiplayer()->GetCurrentBlendFactor();
+            if (!AZ::IsClose(blendFactor, 1.0f))
             {
-                m_previousTransform = m_targetTransform;
-                blendTransform = m_targetTransform;
-            }
-            else
-            {
-                blendTransform.SetRotation(m_previousTransform.GetRotation().Slerp(m_targetTransform.GetRotation(), blendFactor));
-                blendTransform.SetTranslation(m_previousTransform.GetTranslation().Lerp(m_targetTransform.GetTranslation(), blendFactor));
-                blendTransform.SetUniformScale(AZ::Lerp(m_previousTransform.GetUniformScale(), m_targetTransform.GetUniformScale(), blendFactor));
+                AZ::Transform blendTransformPrevious;
+                blendTransformPrevious.SetRotation(GetRotationPrevious());
+                blendTransformPrevious.SetTranslation(GetTranslationPrevious());
+                blendTransformPrevious.SetUniformScale(GetScalePrevious());
+
+                if (!blendTransform.IsClose(blendTransformPrevious))
+                {
+                    blendTransform.SetRotation(blendTransformPrevious.GetRotation().Slerp(blendTransform.GetRotation(), blendFactor));
+                    blendTransform.SetTranslation(
+                        blendTransformPrevious.GetTranslation().Lerp(blendTransform.GetTranslation(), blendFactor));
+                    blendTransform.SetUniformScale(
+                        AZ::Lerp(blendTransformPrevious.GetUniformScale(), blendTransform.GetUniformScale(), blendFactor));
+                }
             }
 
             if (!GetTransformComponent()->GetWorldTM().IsClose(blendTransform))
@@ -124,12 +85,15 @@ namespace Multiplayer
     void NetworkTransformComponent::OnCorrection()
     {
         // Snap to latest
-        OnResetCountChangedEvent();
+        AZ::Transform targetTransform;
+        targetTransform.SetRotation(GetRotation());
+        targetTransform.SetTranslation(GetTranslation());
+        targetTransform.SetUniformScale(GetScale());
 
         // Hard set the entities transform
-        if (!GetTransformComponent()->GetWorldTM().IsClose(m_targetTransform))
+        if (!GetTransformComponent()->GetWorldTM().IsClose(targetTransform))
         {
-            GetTransformComponent()->SetWorldTM(m_targetTransform);
+            GetTransformComponent()->SetWorldTM(targetTransform);
         }
     }