Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/dont replace existing avatar on load #138

Merged
merged 16 commits into from
Oct 26, 2023
Merged

Feature/dont replace existing avatar on load #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
64dfce0
feat: add avatar creator
rYuuk Oct 19, 2023
4ffe500
feat: add avatar creator sample
rYuuk Oct 19, 2023
8c1132d
feat: add avatar creator documentation
rYuuk Oct 19, 2023
9457aa3
feat: add auth test for auth api
rYuuk Oct 19, 2023
5715925
feat: add sample creator in package
rYuuk Oct 19, 2023
ac47b28
fix: lighting in avatar creator sample
rYuuk Oct 19, 2023
b06a97c
chore: adjust avatar config for sample creator
rYuuk Oct 19, 2023
95fd220
chore: adjust asmdef for sample creator
rYuuk Oct 20, 2023
047a975
chore: adjust spot light
rYuuk Oct 20, 2023
6f37cc3
feat: add analytics event for sample imported
rYuuk Oct 20, 2023
ead64e8
feat: don't destory avatar, when another avatar with same id is loaded
Oct 25, 2023
90fe3b8
chore: merge develop
Oct 25, 2023
ef7b2f3
chore: remove added sample
Oct 25, 2023
6879e21
chore: remove meta files
Oct 25, 2023
b00335a
feat: remove old avatar, if new avatar with updates is created
Oct 25, 2023
1ab5b37
chore: fix styling
Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions Runtime/Operations/AvatarProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@ public Task<AvatarContext> Execute(AvatarContext context, CancellationToken toke
/// <returns>The <see cref="AvatarContext" />.</returns>
private AvatarContext ProcessAvatarGameObject(AvatarContext context)
{
GameObject oldInstance = GameObject.Find(context.AvatarUri.Guid);
if (oldInstance)
{
Object.DestroyImmediate(oldInstance);
}

((Object) context.Data).name = context.AvatarUri.Guid;

Expand Down
1 change: 1 addition & 0 deletions Samples~/AvatarCreatorSamples/Scripts/UI/SelectionScreens/AvatarCreatorSelection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ private async void UpdateAvatar(object assetId, Category category)
}

ProcessAvatar(avatar);
Destroy(currentAvatar);
currentAvatar = avatar;
LoadingManager.DisableLoading();
SDKLogger.Log(TAG, $"Avatar updated in {Time.time - startTime:F2}s");
Expand Down
33 changes: 3 additions & 30 deletions Tests/Editor/AvatarLoaderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,33 +93,6 @@ public IEnumerator AvatarLoader_Fail_Load()
Assert.AreNotEqual(FailureType.None, failureType);
}

[UnityTest]
public IEnumerator AvatarLoader_Replace_Old_Avatar_Instance()
{
GameObject avatarA = null;
GameObject avatarB = null;
var failureType = FailureType.None;

var loaderA = new AvatarObjectLoader();
loaderA.OnCompleted += (_, args) => avatarA = args.Avatar;
loaderA.OnFailed += (_, args) => failureType = args.Type;
loaderA.LoadAvatar(TestAvatarData.DefaultAvatarUri.ModelUrl);

yield return new WaitUntil(() => avatarA != null || failureType != FailureType.None);

var loaderB = new AvatarObjectLoader();
loaderB.OnCompleted += (_, args) => avatarB = args.Avatar;
loaderB.OnFailed += (_, args) => failureType = args.Type;
loaderB.LoadAvatar(TestAvatarData.DefaultAvatarUri.ModelUrl);

yield return new WaitUntil(() => avatarB != null || failureType != FailureType.None);

Animator[] objects = Object.FindObjectsOfType<Animator>();

Assert.AreEqual(1, objects.Length);
Assert.AreEqual(FailureType.None, failureType);
}

[UnityTest]
public IEnumerator AvatarLoader_Clears_Persistent_Cache()
{
Expand Down Expand Up @@ -179,12 +152,12 @@ public IEnumerator AvatarLoader_Cancel_Loading()
public IEnumerator AvatarLoader_Low_LOD_Smaller_than_High_LOD()
{
var failureType = FailureType.None;

var avatarConfig = ScriptableObject.CreateInstance<AvatarConfig>();
avatarConfig.Lod = Lod.Low;
avatarConfig.TextureAtlas = TextureAtlas.Low;
avatarConfig.TextureChannel = Array.Empty<TextureChannel>();

var loader = new AvatarObjectLoader();
loader.OnCompleted += (sender, args) =>
{
Expand All @@ -201,7 +174,7 @@ public IEnumerator AvatarLoader_Low_LOD_Smaller_than_High_LOD()
loader = new AvatarObjectLoader();
avatarConfig.Lod = Lod.High;
loader.AvatarConfig = avatarConfig;

loader.OnCompleted += (sender, args) =>
{
avatar = args.Avatar;
Expand Down