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

Jump to bottom

fix: combined avatar mesh leak #1230

Merged
merged 3 commits into from Sep 21, 2021
Merged

fix: combined avatar mesh leak #1230

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8e83d0
fix: combined avatar mesh leak
Sep 21, 2021
4868e67
fix: unhandled issue when the face wearables fail to fetch
Sep 21, 2021
be25c06
fix empty if
Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 8 additions & 5 deletions .../Scripts/MainScripts/DCL/Components/Avatar/AvatarMeshCombiner/AvatarMeshCombinerHelper.cs
View file
Open in desktop
Expand Up @@ -21,6 +21,8 @@ public class AvatarMeshCombinerHelper : IDisposable
public GameObject container { get; private set; }
public SkinnedMeshRenderer renderer { get; private set; }

private AvatarMeshCombiner.Output? lastOutput;

public AvatarMeshCombinerHelper (GameObject container = null) { this.container = container; }

/// <summary>
Expand Down Expand Up @@ -92,6 +94,7 @@ private bool CombineInternal(SkinnedMeshRenderer bonesContainer, SkinnedMeshRend
renderer = container.AddComponent<SkinnedMeshRenderer>();

UnloadAssets();
lastOutput = output;

container.layer = bonesContainer.gameObject.layer;
renderer.sharedMesh = output.mesh;
Expand All @@ -109,15 +112,15 @@ private bool CombineInternal(SkinnedMeshRenderer bonesContainer, SkinnedMeshRend

private void UnloadAssets()
{
if (renderer == null)
if (!lastOutput.HasValue)
return;

if (renderer.sharedMesh != null)
Object.Destroy(renderer.sharedMesh);
if (lastOutput.Value.mesh != null)
Object.Destroy(lastOutput.Value.mesh);

if ( renderer.sharedMaterials != null)
if (lastOutput.Value.materials != null)
{
foreach ( var material in renderer.sharedMaterials )
foreach ( var material in lastOutput.Value.materials )
{
Object.Destroy(material);
}
Expand Down
15 changes: 14 additions & 1 deletion unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/AvatarRenderer.cs
View file
Open in desktop
Expand Up @@ -381,6 +381,15 @@ private IEnumerator LoadAvatar()
}
}

if ( eyesController == null && !unusedCategories.Contains(Categories.EYES))
unusedCategories.Add(Categories.EYES);

if ( mouthController == null && !unusedCategories.Contains(Categories.MOUTH))
unusedCategories.Add(Categories.MOUTH);

if ( eyebrowsController == null && !unusedCategories.Contains(Categories.EYEBROWS))
unusedCategories.Add(Categories.EYEBROWS);

foreach (var category in unusedCategories)
{
switch (category)
Expand Down Expand Up @@ -415,6 +424,10 @@ private IEnumerator LoadAvatar()
// TODO(Brian): Evaluate using UniTask<T> instead of this way.
yield return new WaitUntil(() => bodyShapeController.isReady && wearableControllers.Values.All(x => x.isReady));

if ( eyesController == null || eyebrowsController == null || mouthController == null )
{
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You might want to delete this


eyesController.Load(bodyShapeController, model.eyeColor);
eyebrowsController.Load(bodyShapeController, model.hairColor);
mouthController.Load(bodyShapeController, model.skinColor);
Expand Down Expand Up @@ -600,7 +613,7 @@ public void SetRendererEnabled(bool newVisibility)

mainMeshRenderer.enabled = newVisibility;
}

public void SetImpostorVisibility(bool impostorVisibility) { lodRenderer.gameObject.SetActive(impostorVisibility); }

public void SetImpostorForward(Vector3 newForward) { lodRenderer.transform.forward = newForward; }
Expand Down