diff --git a/Assets/@Eden_Tools/Eden_AutoMorpher/Script/BoneMatchUtil.cs b/Assets/@Eden_Tools/Eden_AutoMorpher/Script/BoneMatchUtil.cs index 4272bb1..33b97b9 100644 --- a/Assets/@Eden_Tools/Eden_AutoMorpher/Script/BoneMatchUtil.cs +++ b/Assets/@Eden_Tools/Eden_AutoMorpher/Script/BoneMatchUtil.cs @@ -262,8 +262,7 @@ public class BoneMatchUtil } } Dictionary dictionary = new Dictionary(); - foreach (IGrouping item in from x in list - group x by x.body) + foreach (IGrouping item in from x in list group x by x.Item2) { if (item.Key == null) { diff --git a/Assets/@Eden_Tools/Eden_AutoMorpher/Script/EdenAutoMorpher.cs b/Assets/@Eden_Tools/Eden_AutoMorpher/Script/EdenAutoMorpher.cs index 38b5e6f..51e0660 100644 --- a/Assets/@Eden_Tools/Eden_AutoMorpher/Script/EdenAutoMorpher.cs +++ b/Assets/@Eden_Tools/Eden_AutoMorpher/Script/EdenAutoMorpher.cs @@ -263,10 +263,10 @@ public class EdenAutoMorpher : MonoBehaviour IEnumerator eamFitting = eamManager.WeightingEnumerator(config); while (eamFitting.MoveNext() && this.doProcess) { - ref string title = ref this.processInfo.title; - ref string text = ref this.processInfo.text; - ref float progress = ref this.processInfo.progress; - (title, text, progress) = eamManager.GetProgressInfo(); + var (title, text, progress) = eamManager.GetProgressInfo(); + this.processInfo.title = title; + this.processInfo.text = text; + this.processInfo.progress = progress; yield return eamFitting.Current; } } @@ -280,12 +280,10 @@ public class EdenAutoMorpher : MonoBehaviour public IEnumerator FittingEnumerator(MorpherMode morpherMode) { this.doProcess = true; - ref string title = ref this.processInfo.title; - ref string text = ref this.processInfo.text; - ref float progress = ref this.processInfo.progress; - title = "Setup Avatar Pose"; - text = "Calculating avatar shape and skeletal data."; - progress = 0f; + this.processInfo.title = "Setup Avatar Pose"; + this.processInfo.text = "Calculating avatar shape and skeletal data."; + this.processInfo.progress = 0f; + yield return null; this.ProcessInfoDebug(morpherMode, "Fitting"); yield return null; @@ -331,10 +329,10 @@ public class EdenAutoMorpher : MonoBehaviour IEnumerator eamFitting = eamManager.WeightingEnumerator(config); while (eamFitting.MoveNext() && this.doProcess) { - ref string title = ref this.processInfo.title; - ref string text = ref this.processInfo.text; - ref float progress = ref this.processInfo.progress; - (title, text, progress) = eamManager.GetProgressInfo(); + var (title, text, progress) = eamManager.GetProgressInfo(); + this.processInfo.title = title; + this.processInfo.text = text; + this.processInfo.progress = progress; yield return eamFitting.Current; } } @@ -372,10 +370,10 @@ public class EdenAutoMorpher : MonoBehaviour IEnumerator eamFitting = eamManager.FittingIteration(configData, morpherMode); while (eamFitting.MoveNext() && this.doProcess) { - ref string title = ref this.processInfo.title; - ref string text = ref this.processInfo.text; - ref float progress = ref this.processInfo.progress; - (title, text, progress) = eamManager.GetProgressInfo(); + var (title, text, progress) = eamManager.GetProgressInfo(); + this.processInfo.title = title; + this.processInfo.text = text; + this.processInfo.progress = progress; yield return eamFitting.Current; } } @@ -412,10 +410,10 @@ public class EdenAutoMorpher : MonoBehaviour IEnumerator eamFitting = eamManager.FittingIteration(configData, morpherMode); while (eamFitting.MoveNext() && this.doProcess) { - ref string title = ref this.processInfo.title; - ref string text = ref this.processInfo.text; - ref float progress = ref this.processInfo.progress; - (title, text, progress) = eamManager.GetProgressInfo(); + var (title, text, progress) = eamManager.GetProgressInfo(); + this.processInfo.title = title; + this.processInfo.text = text; + this.processInfo.progress = progress; yield return eamFitting.Current; } } @@ -458,10 +456,10 @@ public class EdenAutoMorpher : MonoBehaviour IEnumerator eamFitting = eamManager.FittingIteration(configData, morpherMode); while (eamFitting.MoveNext() && this.doProcess) { - ref string title = ref this.processInfo.title; - ref string text = ref this.processInfo.text; - ref float progress = ref this.processInfo.progress; - (title, text, progress) = eamManager.GetProgressInfo(); + var (title, text, progress) = eamManager.GetProgressInfo(); + this.processInfo.title = title; + this.processInfo.text = text; + this.processInfo.progress = progress; yield return eamFitting.Current; } }