birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/o3de/o3de into mp_blending_cleanup

Browse Source
This commit is contained in:
puvvadar
2021-09-17 15:03:43 -07:00
parent 67e2498a12 df9b0714a4
commit bc8ccde318
3870 changed files with 475008 additions and 107412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Multiplayer/Code/Source/Components/LocalPredictionPlayerInputComponent.cpp
+6
View File
@@ -81,6 +81,12 @@ namespace Multiplayer
LocalPredictionPlayerInputComponentBase::Reflect(context);
}
void LocalPredictionPlayerInputComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
{
LocalPredictionPlayerInputComponentBase::GetProvidedServices(provided);
provided.push_back(AZ_CRC_CE("MultiplayerInputDriver"));
}
void LocalPredictionPlayerInputComponent::OnInit()
{
;
Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp
+2
View File
@@ -278,6 +278,7 @@ namespace Multiplayer
AZ_Assert(IsNetEntityRoleAutonomous(), "Incorrect network role for input creation");
for (MultiplayerComponent* multiplayerComponent : m_multiplayerInputComponentVector)
{
multiplayerComponent->GetController()->CreateInputFromScript(networkInput, deltaTime);
multiplayerComponent->GetController()->CreateInput(networkInput, deltaTime);
}
}
@@ -289,6 +290,7 @@ namespace Multiplayer
AZ_Assert((NetworkRoleHasController(m_netEntityRole)), "Incorrect network role for input processing");
for (MultiplayerComponent* multiplayerComponent : m_multiplayerInputComponentVector)
{
multiplayerComponent->GetController()->ProcessInputFromScript(networkInput, deltaTime);
multiplayerComponent->GetController()->ProcessInput(networkInput, deltaTime);
}
m_isProcessingInput = false;