Skip to content
Snippets Groups Projects
Commit 1a7f574e authored by David Gilbert's avatar David Gilbert :bug:
Browse files

chore(all): renames master -> primaryNode, slave -> secondaryNode

parent 283b158b
No related branches found
No related tags found
1 merge request!50chore(all): renames master -> primaryNode, slave -> secondaryNode
......@@ -156,7 +156,7 @@ void ACAVEOverlayController::BeginPlay()
return;
//Input config
if (UVirtualRealityUtilities::IsMaster())
if (UVirtualRealityUtilities::IsPrimaryNode())
{
if (CycleDoorTypeInputAction == nullptr || IMCCaveOverlayInputMapping == nullptr)
{
......
......@@ -39,9 +39,9 @@ void ACaveSetup::BeginPlay()
}
}
// Apply the DTrack LiveLink Preset. Only do this if we are the master
// Apply the DTrack LiveLink Preset. Only do this if we are the primaryNode
if (UVirtualRealityUtilities::IsMaster())
if (UVirtualRealityUtilities::IsPrimaryNode())
{
if (LiveLinkPresetToApplyOnCave && LiveLinkPresetToApplyOnCave->IsValidLowLevelFast())
{
......
......@@ -67,9 +67,9 @@ void AVirtualRealityPawn::NotifyControllerChanged()
// Only do this for all local controlled pawns
if (IsLocallyControlled())
{
// Only do this for the master or when we're running in standalone
if (UVirtualRealityUtilities::IsRoomMountedMode() && (UVirtualRealityUtilities::IsMaster() || GetNetMode()) ==
NM_Standalone)
// Only do this for the primary node or when we're running in standalone
if (UVirtualRealityUtilities::IsRoomMountedMode() && (UVirtualRealityUtilities::IsPrimaryNode() || GetNetMode())
== NM_Standalone)
{
if (HasAuthority())
AttachDCRAtoPawn();
......
......@@ -81,8 +81,8 @@ bool UVirtualRealityUtilities::IsRolv()
#endif
}
/* Return true on the Master in cluster mode and in a normal desktop session. Otherwise false */
bool UVirtualRealityUtilities::IsMaster()
/* Return true on the Primary in cluster mode and in a normal desktop session. Otherwise false */
bool UVirtualRealityUtilities::IsPrimaryNode()
{
#if PLATFORM_SUPPORTS_NDISPLAY
if (!IDisplayCluster::IsAvailable())
......@@ -92,7 +92,7 @@ bool UVirtualRealityUtilities::IsMaster()
IDisplayClusterClusterManager* Manager = IDisplayCluster::Get().GetClusterMgr();
if (Manager == nullptr)
{
return true; // if we are not in cluster mode, we are always the master
return true; // if we are not in cluster mode, we are always the primary node
}
return Manager->IsPrimary() || !Manager->IsSecondary();
#else
......@@ -100,9 +100,9 @@ bool UVirtualRealityUtilities::IsMaster()
#endif
}
bool UVirtualRealityUtilities::IsSlave()
bool UVirtualRealityUtilities::IsSecondaryNode()
{
return !IsMaster();
return !IsPrimaryNode();
}
FString UVirtualRealityUtilities::GetNodeName()
......
......@@ -63,9 +63,9 @@ public:
static bool IsRolv();
UFUNCTION(BlueprintPure, Category = "DisplayCluster")
static bool IsMaster();
static bool IsPrimaryNode();
UFUNCTION(BlueprintPure, Category = "DisplayCluster")
static bool IsSlave();
static bool IsSecondaryNode();
UFUNCTION(BlueprintPure, Category = "DisplayCluster")
static FString GetNodeName();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment