From c4641f2594d0c9e63058a930b571c64d6b6545fc Mon Sep 17 00:00:00 2001 From: Gene Walters Date: Tue, 18 May 2021 14:13:01 -0700 Subject: [PATCH 1/3] ScriptCanvas can now check if an entity net-component is authority, autonomous, server, or client --- .../Components/MultiplayerComponent.cpp | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/Gems/Multiplayer/Code/Source/Components/MultiplayerComponent.cpp b/Gems/Multiplayer/Code/Source/Components/MultiplayerComponent.cpp index 8542288b23..ff3b64aa38 100644 --- a/Gems/Multiplayer/Code/Source/Components/MultiplayerComponent.cpp +++ b/Gems/Multiplayer/Code/Source/Components/MultiplayerComponent.cpp @@ -24,6 +24,82 @@ namespace Multiplayer serializeContext->Class() ->Version(1); } + + AZ::BehaviorContext* behaviorContext = azrtti_cast(context); + if (behaviorContext) + { + behaviorContext->Class("MultiplayerComponent") + ->Attribute(AZ::Script::Attributes::Module, "multiplayer") + ->Attribute(AZ::Script::Attributes::Category, "Multiplayer") + + ->Method("Is Authority", [](AZ::EntityId id) -> bool { + AZ::Entity* entity = AZ::Interface::Get()->FindEntity(id); + if (!entity) + { + AZ_Warning( "MultiplayerComponent", false, "MultiplayerComponent IsAuthority failed. The entity with id %s doesn't exist, please provide a valid entity id.", id.ToString().c_str()) + return false; + } + + MultiplayerComponent* multiplayerComponent = entity->FindComponent(); + if (!multiplayerComponent) + { + AZ_Warning( "MultiplayerComponent", false, "MultiplayerComponent IsAuthority failed. Entity '%s' (id: %s) is missing a MultiplayerComponent, make sure this entity contains a component which derives from MultiplayerComponent.", entity->GetName().c_str(), id.ToString().c_str()) + return false; + } + return multiplayerComponent->IsAuthority(); + }) + ->Method("Is Autonomous", [](AZ::EntityId id) -> bool { + AZ::Entity* entity = AZ::Interface::Get()->FindEntity(id); + if (!entity) + { + AZ_Warning( "MultiplayerComponent", false, "MultiplayerComponent IsAutonomous failed. The entity with id %s doesn't exist, please provide a valid entity id.", id.ToString().c_str()) + return false; + } + + MultiplayerComponent* multiplayerComponent = entity->FindComponent(); + if (!multiplayerComponent) + { + AZ_Warning( + "MultiplayerComponent", false, + "MultiplayerComponent IsAutonomous failed. Entity '%s' (id: %s) is missing a MultiplayerComponent, make sure this entity contains a component which derives from MultiplayerComponent.", + entity->GetName().c_str(), id.ToString().c_str()) return false; + } + return multiplayerComponent->IsAutonomous(); + }) + ->Method("Is Client", [](AZ::EntityId id) -> bool { + AZ::Entity* entity = AZ::Interface::Get()->FindEntity(id); + if (!entity) + { + AZ_Warning( "MultiplayerComponent", false, "MultiplayerComponent IsClient failed. The entity with id %s doesn't exist, please provide a valid entity id.", id.ToString().c_str()) + return false; + } + + MultiplayerComponent* multiplayerComponent = entity->FindComponent(); + if (!multiplayerComponent) + { + AZ_Warning("MultiplayerComponent", false, "MultiplayerComponent IsClient failed. Entity '%s' (id: %s) is missing a MultiplayerComponent, make sure this entity contains a component which derives from MultiplayerComponent.", entity->GetName().c_str(), id.ToString().c_str()) + return false; + } + return multiplayerComponent->IsClient(); + }) + ->Method("Is Server", [](AZ::EntityId id) -> bool { + AZ::Entity* entity = AZ::Interface::Get()->FindEntity(id); + if (!entity) + { + AZ_Warning( "MultiplayerComponent", false, "MultiplayerComponent IsServer failed. The entity with id %s doesn't exist, please provide a valid entity id.", id.ToString().c_str()) + return false; + } + + MultiplayerComponent* multiplayerComponent = entity->FindComponent(); + if (!multiplayerComponent) + { + AZ_Warning("MultiplayerComponent", false, "MultiplayerComponent IsServer failed. Entity '%s' (id: %s) is missing a MultiplayerComponent, make sure this entity contains a component which derives from MultiplayerComponent.", entity->GetName().c_str(), id.ToString().c_str()) + return false; + } + return multiplayerComponent->IsServer(); + }) + ; + } } void MultiplayerComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required) From 0d207eab191e1f86a84167506eb6e1d3b21a1b56 Mon Sep 17 00:00:00 2001 From: Gene Walters Date: Tue, 18 May 2021 14:27:17 -0700 Subject: [PATCH 2/3] fixes minor auto-formatting issue --- .../Code/Source/Components/MultiplayerComponent.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Gems/Multiplayer/Code/Source/Components/MultiplayerComponent.cpp b/Gems/Multiplayer/Code/Source/Components/MultiplayerComponent.cpp index ff3b64aa38..b0fd671686 100644 --- a/Gems/Multiplayer/Code/Source/Components/MultiplayerComponent.cpp +++ b/Gems/Multiplayer/Code/Source/Components/MultiplayerComponent.cpp @@ -59,10 +59,8 @@ namespace Multiplayer MultiplayerComponent* multiplayerComponent = entity->FindComponent(); if (!multiplayerComponent) { - AZ_Warning( - "MultiplayerComponent", false, - "MultiplayerComponent IsAutonomous failed. Entity '%s' (id: %s) is missing a MultiplayerComponent, make sure this entity contains a component which derives from MultiplayerComponent.", - entity->GetName().c_str(), id.ToString().c_str()) return false; + AZ_Warning("MultiplayerComponent", false, "MultiplayerComponent IsAutonomous failed. Entity '%s' (id: %s) is missing a MultiplayerComponent, make sure this entity contains a component which derives from MultiplayerComponent.", entity->GetName().c_str(), id.ToString().c_str()) + return false; } return multiplayerComponent->IsAutonomous(); }) From f61b9c4081ff1b2c40f500c796cd2da3207f1d64 Mon Sep 17 00:00:00 2001 From: Gene Walters Date: Wed, 19 May 2021 16:03:13 -0700 Subject: [PATCH 3/3] Removing spaces in behavior context method names. While whitespace works in Lua and ScriptCanvas, the Scripting team wants to keep the script API and code API consistent (ie: no spaces) --- .../Code/Source/Components/MultiplayerComponent.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gems/Multiplayer/Code/Source/Components/MultiplayerComponent.cpp b/Gems/Multiplayer/Code/Source/Components/MultiplayerComponent.cpp index b0fd671686..21ae9d9f01 100644 --- a/Gems/Multiplayer/Code/Source/Components/MultiplayerComponent.cpp +++ b/Gems/Multiplayer/Code/Source/Components/MultiplayerComponent.cpp @@ -32,7 +32,7 @@ namespace Multiplayer ->Attribute(AZ::Script::Attributes::Module, "multiplayer") ->Attribute(AZ::Script::Attributes::Category, "Multiplayer") - ->Method("Is Authority", [](AZ::EntityId id) -> bool { + ->Method("IsAuthority", [](AZ::EntityId id) -> bool { AZ::Entity* entity = AZ::Interface::Get()->FindEntity(id); if (!entity) { @@ -48,7 +48,7 @@ namespace Multiplayer } return multiplayerComponent->IsAuthority(); }) - ->Method("Is Autonomous", [](AZ::EntityId id) -> bool { + ->Method("IsAutonomous", [](AZ::EntityId id) -> bool { AZ::Entity* entity = AZ::Interface::Get()->FindEntity(id); if (!entity) { @@ -64,7 +64,7 @@ namespace Multiplayer } return multiplayerComponent->IsAutonomous(); }) - ->Method("Is Client", [](AZ::EntityId id) -> bool { + ->Method("IsClient", [](AZ::EntityId id) -> bool { AZ::Entity* entity = AZ::Interface::Get()->FindEntity(id); if (!entity) { @@ -80,7 +80,7 @@ namespace Multiplayer } return multiplayerComponent->IsClient(); }) - ->Method("Is Server", [](AZ::EntityId id) -> bool { + ->Method("IsServer", [](AZ::EntityId id) -> bool { AZ::Entity* entity = AZ::Interface::Get()->FindEntity(id); if (!entity) {