WW1Series
/
EpicVoiceTest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Adapted code to changes in the EOS API's....... EVERYTHING IS REF NOW ARGH

master
Nico de Poel 4 years ago
parent
ef6b709da1
commit
8f7620a571
2 changed files with 271 additions and 143 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 184
      Assets/Scripts/EOSVoiceChat.cs
  2. 160
      Assets/Scripts/EpicVoiceChatTest.cs

184
Assets/Scripts/EOSVoiceChat.cs
View File

@ -70,58 +70,67 @@ public class EOSVoiceChat: IDisposable
var connectArgs = new ChatConnectArgs(chatLobbyName, maxChatPlayers); var connectArgs = new ChatConnectArgs(chatLobbyName, maxChatPlayers);
lobbyInterface.CreateLobbySearch(new CreateLobbySearchOptions { MaxResults = 1 }, out var searchHandle);
searchHandle.SetLobbyId(new LobbySearchSetLobbyIdOptions { LobbyId = chatLobbyName });
var createSearchOptions = new CreateLobbySearchOptions { MaxResults = 1 };
lobbyInterface.CreateLobbySearch(ref createSearchOptions, out var searchHandle);
var setLobbyIdOptions = new LobbySearchSetLobbyIdOptions { LobbyId = chatLobbyName };
searchHandle.SetLobbyId(ref setLobbyIdOptions);
var localUserId = localUserProvider.Invoke(); var localUserId = localUserProvider.Invoke();
if (localUserId == null) if (localUserId == null)
return; return;
searchHandle.Find(new LobbySearchFindOptions { LocalUserId = localUserId }, null, findData =>
var searchOptions = new LobbySearchFindOptions { LocalUserId = localUserId };
searchHandle.Find(ref searchOptions, null, LobbySearchOnFindCallback);
void LobbySearchOnFindCallback(ref LobbySearchFindCallbackInfo findData)
{ {
switch (findData.ResultCode) switch (findData.ResultCode)
{ {
case Result.Success: case Result.Success:
searchHandle.CopySearchResultByIndex(new LobbySearchCopySearchResultByIndexOptions { LobbyIndex = 0 }, out var lobbyDetails);
var copyOptions = new LobbySearchCopySearchResultByIndexOptions { LobbyIndex = 0 };
searchHandle.CopySearchResultByIndex(ref copyOptions, out var lobbyDetails);
Debug.Log("Found existing chat lobby, joining..."); Debug.Log("Found existing chat lobby, joining...");
var joinLobbyOptions = new JoinLobbyOptions
{
LocalUserId = localUserId,
LobbyDetailsHandle = lobbyDetails,
PresenceEnabled = false,
};
lobbyInterface.JoinLobby lobbyInterface.JoinLobby
( (
new JoinLobbyOptions
{
LocalUserId = localUserId,
LobbyDetailsHandle = lobbyDetails,
PresenceEnabled = false,
},
ref joinLobbyOptions,
connectArgs, connectArgs,
HandleLobbyJoined HandleLobbyJoined
); );
break; break;
default: default:
Debug.Log($"Creating new chat lobby..."); Debug.Log($"Creating new chat lobby...");
var createLobbyOptions = new CreateLobbyOptions
{
LocalUserId = localUserId,
AllowInvites = false,
PermissionLevel = LobbyPermissionLevel.Publicadvertised,
PresenceEnabled = false,
MaxLobbyMembers = maxChatPlayers,
DisableHostMigration = false,
LobbyId = chatLobbyName,
BucketId = Application.productName, // TODO: do we need anything more specific than this?
EnableRTCRoom = true,
};
lobbyInterface.CreateLobby lobbyInterface.CreateLobby
( (
new CreateLobbyOptions
{
LocalUserId = localUserId,
AllowInvites = false,
PermissionLevel = LobbyPermissionLevel.Publicadvertised,
PresenceEnabled = false,
MaxLobbyMembers = maxChatPlayers,
DisableHostMigration = false,
LobbyId = chatLobbyName,
BucketId = Application.productName, // TODO: do we need anything more specific than this?
EnableRTCRoom = true,
},
ref createLobbyOptions,
connectArgs, connectArgs,
HandleLobbyCreated HandleLobbyCreated
); );
break; break;
} }
});
}
} }
private void HandleLobbyCreated(CreateLobbyCallbackInfo data)
private void HandleLobbyCreated(ref CreateLobbyCallbackInfo data)
{ {
var connectArgs = (ChatConnectArgs)data.ClientData; var connectArgs = (ChatConnectArgs)data.ClientData;
switch (data.ResultCode) switch (data.ResultCode)
@ -153,9 +162,8 @@ public class EOSVoiceChat: IDisposable
} }
} }
private void HandleLobbyJoined(JoinLobbyCallbackInfo data)
private void HandleLobbyJoined(ref JoinLobbyCallbackInfo data)
{ {
var connectArgs = (ChatConnectArgs)data.ClientData;
switch (data.ResultCode) switch (data.ResultCode)
{ {
case Result.Success: case Result.Success:
@ -181,9 +189,12 @@ public class EOSVoiceChat: IDisposable
{ {
rtcRoomName = null; rtcRoomName = null;
var result = lobbyInterface.GetRTCRoomName(
new GetRTCRoomNameOptions { LocalUserId = localUserProvider.Invoke(), LobbyId = connectedLobbyId },
out string roomName);
var getRoomNameOptions = new GetRTCRoomNameOptions
{
LocalUserId = localUserProvider.Invoke(),
LobbyId = connectedLobbyId
};
var result = lobbyInterface.GetRTCRoomName(ref getRoomNameOptions, out Utf8String roomName);
if (result != Result.Success) if (result != Result.Success)
{ {
@ -202,16 +213,14 @@ public class EOSVoiceChat: IDisposable
// Unsubscribing first means we don't get a Disconnected notification for intentionally leaving the lobby // Unsubscribing first means we don't get a Disconnected notification for intentionally leaving the lobby
UnsubscribeFromRoomNotifications(); UnsubscribeFromRoomNotifications();
lobbyInterface.LeaveLobby
(
new LeaveLobbyOptions
{
LocalUserId = localUserProvider.Invoke(),
LobbyId = connectedLobbyId,
},
null,
data => { }
);
void OnLeaveLobbyCallback(ref LeaveLobbyCallbackInfo data) { }
var leaveLobbyOptions = new LeaveLobbyOptions
{
LocalUserId = localUserProvider.Invoke(),
LobbyId = connectedLobbyId,
};
lobbyInterface.LeaveLobby(ref leaveLobbyOptions, null, OnLeaveLobbyCallback);
connectedLobbyId = null; connectedLobbyId = null;
rtcRoomName = null; rtcRoomName = null;
@ -228,12 +237,15 @@ public class EOSVoiceChat: IDisposable
if (!IsConnected) if (!IsConnected)
return; return;
audioInterface.UpdateSending(new UpdateSendingOptions
void OnUpdateSendingCallback(ref UpdateSendingCallbackInfo data) { }
var updateSendingOptions = new UpdateSendingOptions
{ {
LocalUserId = localUserProvider.Invoke(), LocalUserId = localUserProvider.Invoke(),
RoomName = rtcRoomName, RoomName = rtcRoomName,
AudioStatus = muted ? RTCAudioStatus.Disabled : RTCAudioStatus.Enabled, AudioStatus = muted ? RTCAudioStatus.Disabled : RTCAudioStatus.Enabled,
}, null, data => { });
};
audioInterface.UpdateSending(ref updateSendingOptions, null, OnUpdateSendingCallback);
} }
/// <summary> /// <summary>
@ -245,13 +257,16 @@ public class EOSVoiceChat: IDisposable
if (!IsConnected) if (!IsConnected)
return; return;
audioInterface.UpdateReceiving(new UpdateReceivingOptions
void OnUpdateReceivingCallback(ref UpdateReceivingCallbackInfo data) { }
var updateReceivingOptions = new UpdateReceivingOptions
{ {
LocalUserId = localUserProvider.Invoke(), LocalUserId = localUserProvider.Invoke(),
ParticipantId = remoteUser, ParticipantId = remoteUser,
RoomName = rtcRoomName, RoomName = rtcRoomName,
AudioEnabled = !muted, AudioEnabled = !muted,
}, null, data => { });
};
audioInterface.UpdateReceiving(ref updateReceivingOptions, null, OnUpdateReceivingCallback);
} }
/// <summary> /// <summary>
@ -263,16 +278,19 @@ public class EOSVoiceChat: IDisposable
if (!IsConnected) if (!IsConnected)
return; return;
void OnUpdateReceivingCallback(ref UpdateReceivingCallbackInfo data) { }
var localUserId = localUserProvider.Invoke(); var localUserId = localUserProvider.Invoke();
foreach (var remoteProductUser in chatUsers.Keys) foreach (var remoteProductUser in chatUsers.Keys)
{ {
audioInterface.UpdateReceiving(new UpdateReceivingOptions
var updateReceivingOptions = new UpdateReceivingOptions
{ {
LocalUserId = localUserId, LocalUserId = localUserId,
ParticipantId = remoteProductUser, ParticipantId = remoteProductUser,
RoomName = rtcRoomName, RoomName = rtcRoomName,
AudioEnabled = false, AudioEnabled = false,
}, null, data => { });
};
audioInterface.UpdateReceiving(ref updateReceivingOptions, null, OnUpdateReceivingCallback);
} }
} }
@ -282,12 +300,13 @@ public class EOSVoiceChat: IDisposable
/// </summary> /// </summary>
public void SetOutputVolume(float volume) public void SetOutputVolume(float volume)
{ {
audioInterface.SetAudioOutputSettings(new SetAudioOutputSettingsOptions
var setAudioOptions = new SetAudioOutputSettingsOptions
{ {
LocalUserId = localUserProvider.Invoke(), LocalUserId = localUserProvider.Invoke(),
DeviceId = null, // Default output device
DeviceId = null, // Default output device
Volume = volume * 50f, Volume = volume * 50f,
});
};
audioInterface.SetAudioOutputSettings(ref setAudioOptions);
} }
/// <summary> /// <summary>
@ -308,12 +327,13 @@ public class EOSVoiceChat: IDisposable
{ {
if (!onAudioDevicesChangedCallbackId.HasValue) if (!onAudioDevicesChangedCallbackId.HasValue)
{ {
var addNotifyOptions = new AddNotifyAudioDevicesChangedOptions();
onAudioDevicesChangedCallbackId = audioInterface.AddNotifyAudioDevicesChanged( onAudioDevicesChangedCallbackId = audioInterface.AddNotifyAudioDevicesChanged(
new AddNotifyAudioDevicesChangedOptions(), null,
HandleAudioDevicesChanged);
ref addNotifyOptions, null, HandleAudioDevicesChanged);
// Call the event handler once to query the audio devices in their initial state // Call the event handler once to query the audio devices in their initial state
HandleAudioDevicesChanged(null);
AudioDevicesChangedCallbackInfo callbackInfo;
HandleAudioDevicesChanged(ref callbackInfo);
} }
} }
@ -326,38 +346,40 @@ public class EOSVoiceChat: IDisposable
} }
} }
private void HandleAudioDevicesChanged(AudioDevicesChangedCallbackInfo data)
private void HandleAudioDevicesChanged(ref AudioDevicesChangedCallbackInfo data)
{ {
defaultInputDeviceId = null; defaultInputDeviceId = null;
var sb = new System.Text.StringBuilder(); var sb = new System.Text.StringBuilder();
// Update the default input device, so we know whether we can actually talk or not // Update the default input device, so we know whether we can actually talk or not
uint inputDevicesCount = audioInterface.GetAudioInputDevicesCount(new GetAudioInputDevicesCountOptions());
var getInputDevicesOptions = new GetAudioInputDevicesCountOptions();
uint inputDevicesCount = audioInterface.GetAudioInputDevicesCount(ref getInputDevicesOptions);
sb.AppendLine($"Found {inputDevicesCount} audio input device(s):"); sb.AppendLine($"Found {inputDevicesCount} audio input device(s):");
for (uint inputDeviceIndex = 0; inputDeviceIndex < inputDevicesCount; ++inputDeviceIndex) for (uint inputDeviceIndex = 0; inputDeviceIndex < inputDevicesCount; ++inputDeviceIndex)
{ {
var inputDeviceInfo = audioInterface.GetAudioInputDeviceByIndex(
new GetAudioInputDeviceByIndexOptions { DeviceInfoIndex = inputDeviceIndex });
var getDeviceOptions = new GetAudioInputDeviceByIndexOptions { DeviceInfoIndex = inputDeviceIndex };
var inputDeviceInfo = audioInterface.GetAudioInputDeviceByIndex(ref getDeviceOptions);
sb.AppendLine($"Input device {inputDeviceIndex}: ID = {inputDeviceInfo.DeviceId}, Name = {inputDeviceInfo.DeviceName}, Default = {inputDeviceInfo.DefaultDevice}");
sb.AppendLine($"Input device {inputDeviceIndex}: ID = {inputDeviceInfo?.DeviceId}, Name = {inputDeviceInfo?.DeviceName}, Default = {inputDeviceInfo?.DefaultDevice}");
if (inputDeviceInfo.DefaultDevice)
if (inputDeviceInfo?.DefaultDevice ?? false)
{ {
defaultInputDeviceId = inputDeviceInfo.DeviceId;
defaultInputDeviceId = inputDeviceInfo.Value.DeviceId;
} }
} }
uint outputDevicesCount = audioInterface.GetAudioOutputDevicesCount(new GetAudioOutputDevicesCountOptions());
var getOutputDevicesOptions = new GetAudioOutputDevicesCountOptions();
uint outputDevicesCount = audioInterface.GetAudioOutputDevicesCount(ref getOutputDevicesOptions);
sb.AppendLine($"Found {outputDevicesCount} audio output device(s):"); sb.AppendLine($"Found {outputDevicesCount} audio output device(s):");
for (uint outputDeviceIndex = 0; outputDeviceIndex < outputDevicesCount; ++outputDeviceIndex) for (uint outputDeviceIndex = 0; outputDeviceIndex < outputDevicesCount; ++outputDeviceIndex)
{ {
var outputDeviceInfo = audioInterface.GetAudioOutputDeviceByIndex(
new GetAudioOutputDeviceByIndexOptions { DeviceInfoIndex = outputDeviceIndex });
var getDeviceOptions = new GetAudioOutputDeviceByIndexOptions { DeviceInfoIndex = outputDeviceIndex };
var outputDeviceInfo = audioInterface.GetAudioOutputDeviceByIndex(ref getDeviceOptions);
sb.AppendLine($"Output device {outputDeviceIndex}: ID = {outputDeviceInfo.DeviceId}, Name = {outputDeviceInfo.DeviceName}, Default = {outputDeviceInfo.DefaultDevice}");
sb.AppendLine($"Output device {outputDeviceIndex}: ID = {outputDeviceInfo?.DeviceId}, Name = {outputDeviceInfo?.DeviceName}, Default = {outputDeviceInfo?.DefaultDevice}");
} }
Debug.Log(sb); Debug.Log(sb);
@ -369,13 +391,10 @@ public class EOSVoiceChat: IDisposable
if (!onConnectionChangedCallbackId.HasValue) if (!onConnectionChangedCallbackId.HasValue)
{ {
var addNotifyOptions = new AddNotifyRTCRoomConnectionChangedOptions();
onConnectionChangedCallbackId = lobbyInterface.AddNotifyRTCRoomConnectionChanged onConnectionChangedCallbackId = lobbyInterface.AddNotifyRTCRoomConnectionChanged
( (
new AddNotifyRTCRoomConnectionChangedOptions
{
LocalUserId = localUserId,
LobbyId = connectedLobbyId,
},
ref addNotifyOptions,
null, null,
HandleConnectionChanged HandleConnectionChanged
); );
@ -383,13 +402,14 @@ public class EOSVoiceChat: IDisposable
if (!onParticipantStatusChangedCallbackId.HasValue) if (!onParticipantStatusChangedCallbackId.HasValue)
{ {
var addNotifyOptions = new AddNotifyParticipantStatusChangedOptions
{
LocalUserId = localUserId,
RoomName = rtcRoomName,
};
onParticipantStatusChangedCallbackId = rtcInterface.AddNotifyParticipantStatusChanged onParticipantStatusChangedCallbackId = rtcInterface.AddNotifyParticipantStatusChanged
( (
new AddNotifyParticipantStatusChangedOptions
{
LocalUserId = localUserId,
RoomName = rtcRoomName,
},
ref addNotifyOptions,
null, null,
HandleParticipantStatusChanged HandleParticipantStatusChanged
); );
@ -397,13 +417,14 @@ public class EOSVoiceChat: IDisposable
if (!onParticipantUpdatedCallbackId.HasValue) if (!onParticipantUpdatedCallbackId.HasValue)
{ {
var addNotifyOptions = new AddNotifyParticipantUpdatedOptions
{
LocalUserId = localUserId,
RoomName = rtcRoomName,
};
onParticipantUpdatedCallbackId = audioInterface.AddNotifyParticipantUpdated onParticipantUpdatedCallbackId = audioInterface.AddNotifyParticipantUpdated
( (
new AddNotifyParticipantUpdatedOptions
{
LocalUserId = localUserId,
RoomName = rtcRoomName,
},
ref addNotifyOptions,
null, null,
HandleParticipantUpdated HandleParticipantUpdated
); );
@ -431,8 +452,11 @@ public class EOSVoiceChat: IDisposable
} }
} }
private void HandleConnectionChanged(RTCRoomConnectionChangedCallbackInfo data)
private void HandleConnectionChanged(ref RTCRoomConnectionChangedCallbackInfo data)
{ {
if (data.LobbyId != connectedLobbyId)
return;
// Note: reconnecting is handled automatically by the RTC lobby system // Note: reconnecting is handled automatically by the RTC lobby system
if (!data.IsConnected && if (!data.IsConnected &&
(data.DisconnectReason == Result.UserKicked || data.DisconnectReason == Result.UserBanned)) (data.DisconnectReason == Result.UserKicked || data.DisconnectReason == Result.UserBanned))
@ -442,7 +466,7 @@ public class EOSVoiceChat: IDisposable
} }
} }
private void HandleParticipantStatusChanged(ParticipantStatusChangedCallbackInfo data)
private void HandleParticipantStatusChanged(ref ParticipantStatusChangedCallbackInfo data)
{ {
switch (data.ParticipantStatus) switch (data.ParticipantStatus)
{ {
@ -461,7 +485,7 @@ public class EOSVoiceChat: IDisposable
} }
} }
private void HandleParticipantUpdated(ParticipantUpdatedCallbackInfo data)
private void HandleParticipantUpdated(ref ParticipantUpdatedCallbackInfo data)
{ {
if (chatUsers.TryGetValue(data.ParticipantId, out var chatUser)) if (chatUsers.TryGetValue(data.ParticipantId, out var chatUser))
{ {

160
Assets/Scripts/EpicVoiceChatTest.cs
View File

@ -38,8 +38,7 @@ public class EpicVoiceChatTest : MonoBehaviour
// This also allows multiple clients to connect to the same lobby without having to communicate the ID among each other. // This also allows multiple clients to connect to the same lobby without having to communicate the ID among each other.
private const string DebugLobbyId = "a0f6a51f-6b61-4c95-9ed8-a1d508fe4eb6"; private const string DebugLobbyId = "a0f6a51f-6b61-4c95-9ed8-a1d508fe4eb6";
[SerializeField]
private string devAuthAddress;
[SerializeField] private string devAuthAddress;
private readonly StringBuilder status = new StringBuilder("Status:\n"); private readonly StringBuilder status = new StringBuilder("Status:\n");
@ -126,7 +125,7 @@ public class EpicVoiceChatTest : MonoBehaviour
EOSNativeHelper.GetMemoryFunctions(out var allocFunc, out var reallocFunc, out var releaseFunc); EOSNativeHelper.GetMemoryFunctions(out var allocFunc, out var reallocFunc, out var releaseFunc);
#endif #endif
var result = PlatformInterface.Initialize(new InitializeOptions
var initOptions = new InitializeOptions
{ {
ProductName = "WW1Test", ProductName = "WW1Test",
ProductVersion = "1.0.0.0", ProductVersion = "1.0.0.0",
@ -136,7 +135,8 @@ public class EpicVoiceChatTest : MonoBehaviour
ReallocateMemoryFunction = reallocFunc, ReallocateMemoryFunction = reallocFunc,
ReleaseMemoryFunction = releaseFunc, ReleaseMemoryFunction = releaseFunc,
#endif #endif
});
};
var result = PlatformInterface.Initialize(ref initOptions);
if (result != Result.Success) if (result != Result.Success)
{ {
@ -202,7 +202,7 @@ public class EpicVoiceChatTest : MonoBehaviour
}; };
#endif #endif
platformInterface = PlatformInterface.Create(options);
platformInterface = PlatformInterface.Create(ref options);
if (platformInterface == null) if (platformInterface == null)
{ {
@ -223,7 +223,7 @@ public class EpicVoiceChatTest : MonoBehaviour
lobbyInterface = platformInterface.GetLobbyInterface(); lobbyInterface = platformInterface.GetLobbyInterface();
status.AppendLine("Lobby interface: " + lobbyInterface); status.AppendLine("Lobby interface: " + lobbyInterface);
rtcInterface = platformInterface.GetRTCInterface(); // Real-time communication, needed for audio
rtcInterface = platformInterface.GetRTCInterface(); // Real-time communication, needed for audio
status.AppendLine("RTC interface: " + rtcInterface); status.AppendLine("RTC interface: " + rtcInterface);
audioInterface = rtcInterface.GetAudioInterface(); audioInterface = rtcInterface.GetAudioInterface();
@ -233,7 +233,11 @@ public class EpicVoiceChatTest : MonoBehaviour
voiceChat.OnChatConnected += () => status.AppendLine("Chat lobby successfully connected!"); voiceChat.OnChatConnected += () => status.AppendLine("Chat lobby successfully connected!");
voiceChat.OnChatConnectionFailed += () => status.AppendLine("Chat lobby connection failed..."); voiceChat.OnChatConnectionFailed += () => status.AppendLine("Chat lobby connection failed...");
voiceChat.OnChatDisconnected += () => status.AppendLine("Chat lobby disconnected"); voiceChat.OnChatDisconnected += () => status.AppendLine("Chat lobby disconnected");
voiceChat.OnChatUserJoined += userId => status.AppendLine($"Chat user {userId} joined");
voiceChat.OnChatUserJoined += userId =>
{
status.AppendLine($"Chat user {userId} joined");
HandleChatUserJoined(userId);
};
voiceChat.OnChatUserLeft += userId => status.AppendLine($"Chat user {userId} left"); voiceChat.OnChatUserLeft += userId => status.AppendLine($"Chat user {userId} left");
#if UNITY_GAMECORE #if UNITY_GAMECORE
@ -246,21 +250,25 @@ public class EpicVoiceChatTest : MonoBehaviour
return; return;
} }
status.AppendLine("Xbox user added");
SDK.XUserGetId(userHandle, out ulong xuid);
Debug.Log($"Xbox user added with XUID: {xuid}");
status.AppendLine($"Xbox user added");
SDK.XUserGetTokenAndSignatureUtf16Async(userHandle, XUserGetTokenAndSignatureOptions.None, SDK.XUserGetTokenAndSignatureUtf16Async(userHandle, XUserGetTokenAndSignatureOptions.None,
"GET", "https://api.epicgames.dev/", null, null, HandleTokenAndSignature); "GET", "https://api.epicgames.dev/", null, null, HandleTokenAndSignature);
}); });
yield return new WaitUntil(() => !string.IsNullOrEmpty(xstsToken)); yield return new WaitUntil(() => !string.IsNullOrEmpty(xstsToken));
connectInterface.Login(new Epic.OnlineServices.Connect.LoginOptions
var loginOptions = new Epic.OnlineServices.Connect.LoginOptions
{ {
Credentials = new Epic.OnlineServices.Connect.Credentials Credentials = new Epic.OnlineServices.Connect.Credentials
{ {
Type = ExternalCredentialType.XblXstsToken, Type = ExternalCredentialType.XblXstsToken,
Token = xstsToken, Token = xstsToken,
}, },
}, null, HandleConnectResult);
};
connectInterface.Login(ref loginOptions, null, HandleConnectResult);
#elif UNITY_PS4 || UNITY_PS5 #elif UNITY_PS4 || UNITY_PS5
var loggedInUser = PSInput.RefreshUsersDetails(0); var loggedInUser = PSInput.RefreshUsersDetails(0);
@ -292,20 +300,22 @@ public class EpicVoiceChatTest : MonoBehaviour
yield return new WaitUntil(() => !string.IsNullOrEmpty(psnIdToken)); yield return new WaitUntil(() => !string.IsNullOrEmpty(psnIdToken));
connectInterface.Login(new Epic.OnlineServices.Connect.LoginOptions
var loginOptions = new Epic.OnlineServices.Connect.LoginOptions
{ {
Credentials = new Epic.OnlineServices.Connect.Credentials Credentials = new Epic.OnlineServices.Connect.Credentials
{ {
Type = ExternalCredentialType.PsnIdToken, Type = ExternalCredentialType.PsnIdToken,
Token = psnIdToken, Token = psnIdToken,
}, },
}, null, HandleConnectResult);
};
connectInterface.Login(ref loginOptions, null, HandleConnectResult);
#else #else
authInterface.Login(new LoginOptions
var loginOptions = new LoginOptions
{ {
Credentials = GetEpicCredentials(), Credentials = GetEpicCredentials(),
ScopeFlags = AuthScopeFlags.BasicProfile, ScopeFlags = AuthScopeFlags.BasicProfile,
}, null, HandleLoginResult);
};
authInterface.Login(ref loginOptions, null, HandleLoginResult);
#endif #endif
} }
@ -344,7 +354,7 @@ public class EpicVoiceChatTest : MonoBehaviour
}; };
} }
private void HandleLoginResult(LoginCallbackInfo data)
private void HandleLoginResult(ref LoginCallbackInfo data)
{ {
switch (data.ResultCode) switch (data.ResultCode)
{ {
@ -353,17 +363,26 @@ public class EpicVoiceChatTest : MonoBehaviour
Debug.Log("EOS login successful: " + localEpicAccountId); Debug.Log("EOS login successful: " + localEpicAccountId);
status.AppendLine("EOS login successful: " + localEpicAccountId); status.AppendLine("EOS login successful: " + localEpicAccountId);
authInterface.CopyUserAuthToken(new CopyUserAuthTokenOptions(), localEpicAccountId, out Token token);
Debug.Log($"User auth access token: {token.AccessToken}");
var copyTokenOptions = new CopyUserAuthTokenOptions();
authInterface.CopyUserAuthToken(ref copyTokenOptions, localEpicAccountId, out Token? token);
if (!token.HasValue)
{
Debug.Log("EOS login failed, invalid token!");
status.AppendLine("EOS login failed, invalid token!");
break;
}
Debug.Log($"User auth access token: {token.Value.AccessToken}");
connectInterface.Login(new Epic.OnlineServices.Connect.LoginOptions
var loginOptions = new Epic.OnlineServices.Connect.LoginOptions
{ {
Credentials = new Epic.OnlineServices.Connect.Credentials Credentials = new Epic.OnlineServices.Connect.Credentials
{ {
Type = ExternalCredentialType.Epic, // Can be XSTS or PSN ID as well, platform-specific Type = ExternalCredentialType.Epic, // Can be XSTS or PSN ID as well, platform-specific
Token = token.AccessToken,
Token = token.Value.AccessToken,
}, },
}, null, HandleConnectResult);
};
connectInterface.Login(ref loginOptions, null, HandleConnectResult);
break; break;
default: default:
Debug.Log("EOS login failed, result code = " + data.ResultCode); Debug.Log("EOS login failed, result code = " + data.ResultCode);
@ -373,7 +392,7 @@ public class EpicVoiceChatTest : MonoBehaviour
} }
#endif #endif
private void HandleConnectResult(Epic.OnlineServices.Connect.LoginCallbackInfo data)
private void HandleConnectResult(ref Epic.OnlineServices.Connect.LoginCallbackInfo data)
{ {
switch (data.ResultCode) switch (data.ResultCode)
{ {
@ -388,10 +407,8 @@ public class EpicVoiceChatTest : MonoBehaviour
Debug.Log("Invalid user, creating user..."); Debug.Log("Invalid user, creating user...");
status.AppendLine("Invalid user, creating user..."); status.AppendLine("Invalid user, creating user...");
connectInterface.CreateUser(new CreateUserOptions
{
ContinuanceToken = data.ContinuanceToken,
}, null, HandleUserCreated);
var createUserOptions = new CreateUserOptions { ContinuanceToken = data.ContinuanceToken };
connectInterface.CreateUser(ref createUserOptions, null, HandleUserCreated);
break; break;
default: default:
@ -401,7 +418,7 @@ public class EpicVoiceChatTest : MonoBehaviour
} }
} }
private void HandleUserCreated(CreateUserCallbackInfo data)
private void HandleUserCreated(ref CreateUserCallbackInfo data)
{ {
switch (data.ResultCode) switch (data.ResultCode)
{ {
@ -464,7 +481,8 @@ public class EpicVoiceChatTest : MonoBehaviour
{ {
// EOS SDK 1.13+ uses dynamic library binding in the Editor but does not provide any system functions to actually load dynamic libraries, // EOS SDK 1.13+ uses dynamic library binding in the Editor but does not provide any system functions to actually load dynamic libraries,
// so we need to provide those ourselves. // so we need to provide those ourselves.
eosLbraryHandle = EOSNativeHelper.LoadLibrary($@"Assets\Plugins\EpicOnlineServices\Bin\{Config.LibraryName}.dll");
eosLbraryHandle =
EOSNativeHelper.LoadLibrary($@"Assets\Plugins\EpicOnlineServices\Bin\{Config.LibraryName}.dll");
if (eosLbraryHandle == IntPtr.Zero) if (eosLbraryHandle == IntPtr.Zero)
{ {
throw new Exception("Could not load EOS library!"); throw new Exception("Could not load EOS library!");
@ -490,7 +508,7 @@ public class EpicVoiceChatTest : MonoBehaviour
} }
#endif #endif
private void OnEOSLogMessage(LogMessage message)
private void OnEOSLogMessage(ref LogMessage message)
{ {
switch (message.Level) switch (message.Level)
{ {
@ -518,4 +536,90 @@ public class EpicVoiceChatTest : MonoBehaviour
GUILayout.Label(status.ToString()); GUILayout.Label(status.ToString());
} }
private void HandleChatUserJoined(ProductUserId productUserId)
{
if (connectInterface == null || localProductUserId == null)
return;
Debug.Log($"Chat product user ID {productUserId} joined, querying account mapping...");
// We need to know how to map from remote account GUIDs to Epic's ProductUserId so we can query other players' chat status
var queryMappingsOptions = new QueryProductUserIdMappingsOptions
{
LocalUserId = localProductUserId,
ProductUserIds = new[] { productUserId },
};
connectInterface.QueryProductUserIdMappings(ref queryMappingsOptions, productUserId, HandleProductUserIdMappings);
var queryExternalOptions = new QueryExternalAccountMappingsOptions
{
LocalUserId = localProductUserId,
AccountIdType = ExternalAccountType.Xbl,
ExternalAccountIds = new Utf8String[] { "2814644373145756", "2814654765419620" },
};
connectInterface.QueryExternalAccountMappings(ref queryExternalOptions, null, HandleExternalAccountMappings);
}
private void HandleExternalAccountMappings(ref QueryExternalAccountMappingsCallbackInfo data)
{
switch (data.ResultCode)
{
case Result.Success:
foreach (var accountId in
new[] {"2814644373145756", "2814654765419620"})
{
var getMappingOptions = new GetExternalAccountMappingsOptions
{
AccountIdType = ExternalAccountType.Xbl,
LocalUserId = localProductUserId,
TargetExternalUserId = accountId
};
var productUserId = connectInterface.GetExternalAccountMapping(ref getMappingOptions);
if (productUserId != null)
{
Debug.Log($"Mapped XBL account ID {accountId} to product user ID: {productUserId}");
}
else
{
Debug.Log($"Failed to map XBL account ID {accountId} to any product user ID");
}
}
break;
default:
Debug.LogError($"External account mapping query failed with result code: {data.ResultCode}");
break;
}
}
private readonly Dictionary<string, ProductUserId> steamAccountMappings = new Dictionary<string, ProductUserId>();
private readonly Dictionary<string, ProductUserId> epicAccountMappings = new Dictionary<string, ProductUserId>();
private readonly Dictionary<string, ProductUserId> xblAccountMappings = new Dictionary<string, ProductUserId>();
private readonly Dictionary<string, ProductUserId> psnAccountMappings = new Dictionary<string, ProductUserId>();
private void HandleProductUserIdMappings(ref QueryProductUserIdMappingsCallbackInfo data)
{
switch (data.ResultCode)
{
case Result.Success:
var productUserId = (ProductUserId)data.ClientData;
var copyOptions = new CopyProductUserInfoOptions { TargetUserId = productUserId };
var result = connectInterface.CopyProductUserInfo(ref copyOptions, out var externalAccountInfo);
if (result == Result.Success)
{
Debug.Log($"External account info for product user {productUserId}: type = {externalAccountInfo?.AccountIdType}, account id = {externalAccountInfo?.AccountId}, display name = {externalAccountInfo?.DisplayName}");
}
else
{
Debug.LogError($"Failed to query external account info for product user {productUserId}");
}
break;
default:
Debug.LogError($"Product user ID mapping query failed with result code: {data.ResultCode}");
break;
}
}
} }
Write Preview
Loading…
Cancel
Save