Skip to content

fix: materials variants component initialization (#47) #48

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

Open
anonymous2585 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: materials variants component initialization (#47) #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Packages/com.unity.cloud.gltfast/Editor/Scripts/MaterialsVariantsComponentInspector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ class MaterialsVariantsComponentInspector : UnityEditor.Editor

public override VisualElement CreateInspectorGUI()
{
var control = (target as MaterialsVariantsComponent)?.Control;
if (m_VariantNames == null)
{
var control = (target as MaterialsVariantsComponent)?.Control;
if (control != null)
{
var count = control.MaterialsVariantsCount;
Expand All @@ -45,7 +45,7 @@ public override VisualElement CreateInspectorGUI()
else
{
m_Dropdown.choices = m_VariantNames;
m_Dropdown.index = 0;
m_Dropdown.index = control != null ? control.CurrentVariantIndex + 1: 0;
m_Dropdown.RegisterValueChangedCallback(OnMaterialsVariantChanged);
myInspector.Add(m_Dropdown);
}
Expand Down
4 changes: 2 additions & 2 deletions ...ges/com.unity.cloud.gltfast/Runtime/Scripts/MaterialsVariants/MaterialsVariantsControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class MaterialsVariantsControl : IMaterialsVariantsProvider
IMaterialProvider m_MaterialProvider;
IReadOnlyCollection<IMaterialsVariantsSlotInstance> m_Slots;

int m_CurrentVariantIndex;
public int CurrentVariantIndex { get; private set; } = -1;

internal MaterialsVariantsControl(IMaterialProvider materialProvider, IReadOnlyCollection<IMaterialsVariantsSlotInstance> slots)
{
Expand All @@ -42,7 +42,7 @@ public async Task ApplyMaterialsVariantAsync(int variantIndex, CancellationToken
}

await Task.WhenAll(tasks);
m_CurrentVariantIndex = variantIndex;
CurrentVariantIndex = variantIndex;
}

/// <inheritdoc cref="IMaterialProvider.MaterialsVariantsCount"/>
Expand Down