Skip to content

Commit 7ce683c

Browse files
committed
removed old api calls
1 parent 07c3243 commit 7ce683c

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

Runtime/AvatarCreator/Scripts/Managers/AvatarManager.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ namespace ReadyPlayerMe.AvatarCreator
1010
{
1111
public class AvatarCreationResponse
1212
{
13-
public GameObject Avatar { get; set; }
14-
public AvatarProperties Properties { get; set; }
13+
public GameObject AvatarObject { get; private set; }
14+
public AvatarProperties Properties { get; private set; }
1515

16-
public AvatarCreationResponse(GameObject avatar, AvatarProperties properties)
16+
public AvatarCreationResponse(GameObject avatarObject, AvatarProperties properties)
1717
{
18-
Avatar = avatar;
18+
AvatarObject = avatarObject;
1919
Properties = properties;
2020
}
2121
}

Runtime/AvatarCreator/Scripts/WebRequests/AuthAPIRequests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ namespace ReadyPlayerMe.AvatarCreator
99
{
1010
public struct RefreshTokenResponse
1111
{
12-
public string Token;
13-
public string RefreshToken;
12+
public string Token { get; private set; }
13+
public string RefreshToken { get; private set; }
1414

1515
public RefreshTokenResponse(JToken data)
1616
{

Samples~/AvatarCreatorSamples/AvatarCreatorElements/Scripts/SimpleAvatarCreator.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,25 +85,25 @@ public void LoadAvatarFromTemplate(IAssetData template)
8585
public async Task<AvatarProperties> LoadAvatarFromTemplate(string templateId)
8686
{
8787
loading.SetActive(true);
88-
var templateAvatarProps = await avatarManager.CreateAvatarFromTemplate(templateId, bodyType);
88+
var templateAvatarResponse = await avatarManager.CreateAvatarFromTemplateAsync(templateId, bodyType);
8989

9090
// Destroy the old avatar and replace it with the new one.
9191
if (avatar != null)
9292
{
9393
Destroy(avatar);
9494
}
9595
var previousGender = gender;
96-
avatar = templateAvatarProps.Item1;
97-
gender = templateAvatarProps.Item2.Gender;
96+
avatar = templateAvatarResponse.AvatarObject;
97+
gender = templateAvatarResponse.Properties.Gender;
9898
if (gender != previousGender)
9999
{
100100
LoadAssets();
101101
}
102102
SetupAvatar();
103103

104-
onAvatarCreated?.Invoke(templateAvatarProps.Item2);
104+
onAvatarCreated?.Invoke(templateAvatarResponse.Properties);
105105
loading.SetActive(false);
106-
return templateAvatarProps.Item2;
106+
return templateAvatarResponse.Properties;
107107
}
108108

109109
/// <summary>

Samples~/AvatarCreatorSamples/AvatarCreatorWizard/Scripts/UI/SelectionScreens/AvatarCreatorSelection.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,15 +162,19 @@ private async Task<GameObject> LoadAvatar()
162162
if (string.IsNullOrEmpty(AvatarCreatorData.AvatarProperties.Id))
163163
{
164164
AvatarCreatorData.AvatarProperties.Assets ??= GetDefaultAssets();
165-
(avatar, _) = await avatarManager.CreateAvatar(AvatarCreatorData.AvatarProperties);
165+
var avatarResponse = await avatarManager.CreateAvatarAsync(AvatarCreatorData.AvatarProperties);
166+
avatar = avatarResponse.AvatarObject;
167+
AvatarCreatorData.AvatarProperties = avatarResponse.Properties;
166168
}
167169
else
168170
{
169171
var id = AvatarCreatorData.AvatarProperties.Id;
170172
var bodyType = AvatarCreatorData.AvatarProperties.BodyType;
171173
if (!AvatarCreatorData.IsExistingAvatar)
172174
{
173-
(avatar, AvatarCreatorData.AvatarProperties) = await avatarManager.CreateAvatarFromTemplate(id, bodyType);
175+
var avatarTemplateResponse = await avatarManager.CreateAvatarFromTemplateAsync(id, bodyType);
176+
avatar = avatarTemplateResponse.AvatarObject;
177+
AvatarCreatorData.AvatarProperties = avatarTemplateResponse.Properties;
174178
}
175179
else
176180
{
@@ -289,8 +293,6 @@ private async void UpdateAvatar(object assetId, AssetType category)
289293
Assets = new Dictionary<AssetType, object>()
290294
};
291295

292-
293-
294296
payload.Assets.Add(category, assetId);
295297
lastRotation = currentAvatar.transform.rotation;
296298
LoadingManager.EnableLoading(UPDATING_YOUR_AVATAR_LOADING_TEXT, LoadingManager.LoadingType.Popup);

0 commit comments

Comments
 (0)