From aec86eae4c1ac2f09f4c894a3d8d5ce1e5798de6 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Mon, 1 Feb 2021 22:45:50 +0900 Subject: [PATCH] Remove unused classes. --- .../Expression/ExpressionAccumulator.cs | 150 ------------------ .../Expression/ExpressionAccumulator.cs.meta | 11 -- .../Expression/IExpressionAccumulator.cs | 58 ------- .../Expression/IExpressionAccumulator.cs.meta | 11 -- 4 files changed, 230 deletions(-) delete mode 100644 Assets/VRM10/Runtime/Components/Expression/ExpressionAccumulator.cs delete mode 100644 Assets/VRM10/Runtime/Components/Expression/ExpressionAccumulator.cs.meta delete mode 100644 Assets/VRM10/Runtime/Components/Expression/IExpressionAccumulator.cs delete mode 100644 Assets/VRM10/Runtime/Components/Expression/IExpressionAccumulator.cs.meta diff --git a/Assets/VRM10/Runtime/Components/Expression/ExpressionAccumulator.cs b/Assets/VRM10/Runtime/Components/Expression/ExpressionAccumulator.cs deleted file mode 100644 index ac798fd6a..000000000 --- a/Assets/VRM10/Runtime/Components/Expression/ExpressionAccumulator.cs +++ /dev/null @@ -1,150 +0,0 @@ -using System.Collections.Generic; -using System.Linq; - -namespace UniVRM10 -{ - public class DefaultExpressionAccumulator : IExpressionAccumulator - { - Dictionary m_clipMap; - - Dictionary expressionKeyWeights = new Dictionary(); - - public bool IgnoreBlink { get; private set; } - public bool IgnoreLookAt { get; private set; } - public bool IgnoreMouth { get; private set; } - - /// - /// initilaize - /// - /// - public void OnStart(VRM10ExpressionAvatar avatar) - { - m_clipMap = avatar.Clips.ToDictionary(x => ExpressionKey.CreateFromClip(x), x => x); - expressionKeyWeights = m_clipMap.Keys.ToDictionary(x => x, x => 0.0f); - } - - /// - /// each frame - /// - /// - public IEnumerable> FrameExpression() - { - IgnoreBlink = false; - IgnoreLookAt = false; - IgnoreMouth = false; - - // - // except blink, lookat, mouth - // - foreach (var kv in expressionKeyWeights) - { - if (kv.Key.IsProcedual) - { - // 後で - continue; - } - - var expression = m_clipMap[kv.Key]; - - if (expression.OverrideBlink == VrmLib.ExpressionOverrideType.Block && kv.Value > 0) - { - IgnoreBlink = true; - } - if (expression.OverrideLookAt == VrmLib.ExpressionOverrideType.Block && kv.Value > 0) - { - IgnoreLookAt = true; - } - if (expression.OverrideMouth == VrmLib.ExpressionOverrideType.Block && kv.Value > 0) - { - IgnoreMouth = true; - } - - yield return kv; - } - - // - // blink, lookat, mouth - // - foreach (var kv in expressionKeyWeights) - { - if (kv.Key.IsBlink) - { - if (IgnoreBlink) - { - // skip - continue; - } - } - else if (kv.Key.IsLookAt) - { - if (IgnoreLookAt) - { - // skip - continue; - } - } - else if (kv.Key.IsMouth) - { - if (IgnoreMouth) - { - // skip - continue; - } - } - else - { - // already return - continue; - } - - yield return kv; - } - } - - /// - /// Get a expression value - /// - /// - /// - public float GetValue(ExpressionKey key) - { - if (expressionKeyWeights.ContainsKey(key)) - { - return expressionKeyWeights[key]; - } - else - { - return 0.0f; - } - } - - public IEnumerable> GetValues() - { - return expressionKeyWeights.Select(x => new KeyValuePair(x.Key, x.Value)); - } - - /// - /// SetValue - /// - /// - /// - public void SetValue(ExpressionKey key, float value) - { - if (expressionKeyWeights.ContainsKey(key)) - { - expressionKeyWeights[key] = value; - } - } - - public void SetValues(IEnumerable> values) - { - foreach (var keyValue in values) - { - if (expressionKeyWeights.ContainsKey(keyValue.Key)) - { - expressionKeyWeights[keyValue.Key] = keyValue.Value; - } - } - } - } -} diff --git a/Assets/VRM10/Runtime/Components/Expression/ExpressionAccumulator.cs.meta b/Assets/VRM10/Runtime/Components/Expression/ExpressionAccumulator.cs.meta deleted file mode 100644 index ec83f3fab..000000000 --- a/Assets/VRM10/Runtime/Components/Expression/ExpressionAccumulator.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: bcb5bbef7ed54854d8041988a84fa827 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRM10/Runtime/Components/Expression/IExpressionAccumulator.cs b/Assets/VRM10/Runtime/Components/Expression/IExpressionAccumulator.cs deleted file mode 100644 index 49c7301dc..000000000 --- a/Assets/VRM10/Runtime/Components/Expression/IExpressionAccumulator.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System.Collections.Generic; - -namespace UniVRM10 -{ - /// - /// １フレーム分の Expression を蓄える - /// - public interface IExpressionAccumulator - { - /// - /// 開始時に初期化する - /// - /// - void OnStart(VRM10ExpressionAvatar avatar); - - /// - /// 蓄えて処理(ignoreフラグなど)した結果を得る - /// - /// - IEnumerable> FrameExpression(); - - void SetValue(ExpressionKey key, float value); - void SetValues(IEnumerable> values); - float GetValue(ExpressionKey key); - IEnumerable> GetValues(); - - bool IgnoreBlink { get; } - bool IgnoreLookAt { get; } - bool IgnoreMouth { get; } - } - - public static class ExpressionAccumulatorExtensions - { - public static float GetPresetValue(this IExpressionAccumulator self, VrmLib.ExpressionPreset key) - { - var expressionKey = new ExpressionKey(key); - return self.GetValue(expressionKey); - } - - public static float GetCustomValue(this IExpressionAccumulator self, string key) - { - var expressionKey = ExpressionKey.CreateCustom(key); - return self.GetValue(expressionKey); - } - - public static void SetPresetValue(this IExpressionAccumulator self, VrmLib.ExpressionPreset key, float value) - { - var expressionKey = new ExpressionKey(key); - self.SetValue(expressionKey, value); - } - - public static void SetCustomValue(this IExpressionAccumulator self, string key, float value) - { - var expressionKey = ExpressionKey.CreateCustom(key); - self.SetValue(expressionKey, value); - } - } -} diff --git a/Assets/VRM10/Runtime/Components/Expression/IExpressionAccumulator.cs.meta b/Assets/VRM10/Runtime/Components/Expression/IExpressionAccumulator.cs.meta deleted file mode 100644 index c855193a0..000000000 --- a/Assets/VRM10/Runtime/Components/Expression/IExpressionAccumulator.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fdd7cdf6d59574348bb7336272ef5edf -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: