Added material toggling
This commit is contained in:
@@ -63,6 +63,7 @@ public class UmaUIContainer : MonoBehaviour
|
||||
public Text Text;
|
||||
public Button Button;
|
||||
public Slider Slider;
|
||||
public Toggle Toggle;
|
||||
public Image Image;
|
||||
public Image ToggleImage;
|
||||
}
|
||||
|
||||
@@ -75,6 +75,7 @@ public class UmaContainer : MonoBehaviour
|
||||
|
||||
[Header("Other")]
|
||||
public CharaShaderEffectData ShaderEffectData;
|
||||
private List<MaterialHelper> Materials = new List<MaterialHelper>();
|
||||
|
||||
public void Initialize()
|
||||
{
|
||||
@@ -142,6 +143,38 @@ public class UmaContainer : MonoBehaviour
|
||||
UmaAnimator.avatar = AvatarBuilder.BuildGenericAvatar(gameObject, gameObject.name);
|
||||
OverrideController = Instantiate(UmaViewerBuilder.Instance.OverrideController);
|
||||
UmaAnimator.runtimeAnimatorController = OverrideController;
|
||||
|
||||
//Materials
|
||||
foreach (var rend in gameObject.GetComponentsInChildren<Renderer>())
|
||||
{
|
||||
for(int i = 0; i < rend.materials.Length; i++)
|
||||
{
|
||||
Material mat = rend.materials[i];
|
||||
|
||||
var matHlp = Materials.FirstOrDefault(m => m.Mat == mat);
|
||||
if (matHlp == null)
|
||||
{
|
||||
matHlp = new MaterialHelper()
|
||||
{
|
||||
Mat = mat,
|
||||
Renderers = new Dictionary<Renderer, List<int>>(),
|
||||
Toggle = Instantiate(UmaViewerUI.Instance.UmaContainerTogglePrefab, UmaViewerUI.Instance.MaterialsList.content)
|
||||
};
|
||||
matHlp.Toggle.Name = mat.name;
|
||||
matHlp.Toggle.Toggle.onValueChanged.AddListener((value) => { Debug.Log("e"); matHlp.ToggleMaterials(value); });
|
||||
Materials.Add(matHlp);
|
||||
}
|
||||
|
||||
if (!matHlp.Renderers.ContainsKey(rend))
|
||||
{
|
||||
matHlp.Renderers.Add(rend, new List<int> { i });
|
||||
}
|
||||
else
|
||||
{
|
||||
matHlp.Renderers[rend].Add(i);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void MergeHairModel()
|
||||
@@ -305,4 +338,28 @@ public class UmaContainer : MonoBehaviour
|
||||
UpBodyBone.transform.localRotation = UpBodyRotation;
|
||||
}
|
||||
}
|
||||
|
||||
class MaterialHelper
|
||||
{
|
||||
public Material Mat;
|
||||
public UmaUIContainer Toggle;
|
||||
public Dictionary<Renderer, List<int>> Renderers;
|
||||
|
||||
public void ToggleMaterials(bool value)
|
||||
{
|
||||
foreach(var rend in Renderers)
|
||||
{
|
||||
Debug.Log(rend.Key.name);
|
||||
Material[] mat = new Material[rend.Key.materials.Length];
|
||||
for(int i = 0; i < mat.Length; i++)
|
||||
{
|
||||
//if material slot is not in list, keep current material
|
||||
//if material slot in list and toggle is on - assign original
|
||||
//if material slot in list and toggle is off - assign invisible
|
||||
mat[i] = rend.Value.Contains(i) ? (value? Mat : UmaViewerBuilder.Instance.TransMaterialCharas ): rend.Key.materials[i];
|
||||
}
|
||||
rend.Key.materials = mat;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1840,6 +1840,10 @@ public class UmaViewerBuilder : MonoBehaviour
|
||||
UmaViewerUI.Instance.currentFaceDrivenKeyTarget = null;
|
||||
UmaViewerUI.Instance.LoadEmotionPanels(null);
|
||||
UmaViewerUI.Instance.LoadFacialPanels(null);
|
||||
foreach(Transform t in UmaViewerUI.Instance.MaterialsList.content)
|
||||
{
|
||||
Destroy(t.gameObject);
|
||||
}
|
||||
Destroy(CurrentUMAContainer.gameObject);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,6 +40,7 @@ public class UmaViewerUI : MonoBehaviour
|
||||
public ScrollRect PropList;
|
||||
public PageManager PropPageCtrl;
|
||||
public ScrollRect SceneList;
|
||||
public ScrollRect MaterialsList;
|
||||
public PageManager ScenePageCtrl;
|
||||
public ScrollRect MessageScrollRect;
|
||||
public Text MessageText;
|
||||
@@ -118,6 +119,7 @@ public class UmaViewerUI : MonoBehaviour
|
||||
public GameObject UmaContainerLivePrefab;
|
||||
public GameObject UmaContainerSliderPrefab;
|
||||
public GameObject UmaContainerAssetsPrefab;
|
||||
public UmaUIContainer UmaContainerTogglePrefab;
|
||||
|
||||
private int LoadedAssetCount = 0;
|
||||
[SerializeField] private RectTransform LoadedAssetsPanel;
|
||||
|
||||
Reference in New Issue
Block a user