カメラ起動時にクラッシュする問題の対処とモジュールアップデート (#12)

README.md

@@ -11,10 +11,11 @@
 * 旧バージョンから大幅に動作が変わっています。旧バージョンは[こちら](OLD_VERSION.md)
 
 # Requirement
-以下の環境で動作確認済みです。
+以下の環境で動作確認済みです。M1では動きません。  
 * Mac OS Mojave(10.14)
 * Mac OS Catalina(10.15)
 
+
 仮想カメラにCamTwistを利用するためダウンロードしてください。
 * [CamTwist 3.4.3](http://camtwiststudio.com/download/)
 

src/EasyVTuberNew/.gitignore

@@ -84,11 +84,5 @@ FinalIK
 FinalIK.meta
 UniRx/
 UniRx.meta
-Zenject/
-Zenject.meta
-UnityNativeWindow
-UnityNativeWindow.meta
-TransformControl
-TransformControl.meta
 
 

src/EasyVTuberNew/Assets/App/Scripts/FaceControl/BlendShapeKeyFactory.cs

@@ -35,7 +35,7 @@ static BlendShapeKeyFactory()
         /// </remarks>
         public static BlendShapeKey CreateFrom(string name) 
             => _presets.ContainsKey(name)
-                ? new BlendShapeKey(_presets[name]) 
-                : new BlendShapeKey(name);
+                ? BlendShapeKey.CreateFromPreset(_presets[name]) 
+                : BlendShapeKey.CreateUnknown(name);
     }
 }

src/EasyVTuberNew/Assets/App/Scripts/FaceControl/DefaultFunBlendShapeModifier.cs

@@ -7,7 +7,7 @@ namespace App.Main.Scripts.FaceControl
     /// </summary>
     public class DefaultFunBlendShapeModifier
     {
-        private BlendShapeKey FunKey { get; } = new BlendShapeKey(BlendShapePreset.Fun);
+        private BlendShapeKey FunKey { get; } = BlendShapeKey.CreateFromPreset(BlendShapePreset.Fun);
 
         public float FaceDefaultFunValue { get; set; } = 0.0f;
 

src/EasyVTuberNew/Assets/App/Scripts/FaceControl/EyeDownBlendShapeController.cs

@@ -12,8 +12,8 @@ namespace App.Main.Scripts.FaceControl
     /// <summary> 瞬きに対して目と眉を下げる処理をするやつ </summary>
     public class EyeDownBlendShapeController : MonoBehaviour
     {
-        private static readonly BlendShapeKey BlinkLKey = new BlendShapeKey(BlendShapePreset.Blink_L);
-        private static readonly BlendShapeKey BlinkRKey = new BlendShapeKey(BlendShapePreset.Blink_R);
+        private static readonly BlendShapeKey BlinkLKey = BlendShapeKey.CreateFromPreset(BlendShapePreset.Blink_L);
+        private static readonly BlendShapeKey BlinkRKey = BlendShapeKey.CreateFromPreset(BlendShapePreset.Blink_R);
 
         [SerializeField] private FaceControlManager faceControlManager = null;
 

src/EasyVTuberNew/Assets/App/Scripts/FaceControl/ImageBasedBlinkController.cs

@@ -13,8 +13,8 @@ public class ImageBasedBlinkController : MonoBehaviour
     {
         private const float EyeCloseHeight = 0.02f;
 
-        private static readonly BlendShapeKey BlinkLKey = new BlendShapeKey(BlendShapePreset.Blink_L);
-        private static readonly BlendShapeKey BlinkRKey = new BlendShapeKey(BlendShapePreset.Blink_R);
+        private static readonly BlendShapeKey BlinkLKey = BlendShapeKey.CreateFromPreset(BlendShapePreset.Blink_L);
+        private static readonly BlendShapeKey BlinkRKey = BlendShapeKey.CreateFromPreset(BlendShapePreset.Blink_R);
 
         [Inject] private FaceTracker _faceTracker = null;
 

src/EasyVTuberNew/Assets/App/Scripts/FaceControl/VRMAutoBlink.cs

@@ -7,8 +7,8 @@ namespace App.Main.Scripts.FaceControl
     /// <summary> 自動まばたき用の値計算と、指示があれば実際に値を適用するやつ </summary>
     public class VRMAutoBlink : MonoBehaviour
     {
-        private static readonly BlendShapeKey BlinkLKey = new BlendShapeKey(BlendShapePreset.Blink_L);
-        private static readonly BlendShapeKey BlinkRKey = new BlendShapeKey(BlendShapePreset.Blink_R);
+        private static readonly BlendShapeKey BlinkLKey = BlendShapeKey.CreateFromPreset(BlendShapePreset.Blink_L);
+        private static readonly BlendShapeKey BlinkRKey = BlendShapeKey.CreateFromPreset(BlendShapePreset.Blink_R);
 
         [SerializeField]
         private float closeDuration = 0.05f;

src/EasyVTuberNew/Assets/App/Scripts/LipSync/AnimMorphEasedTarget.cs

@@ -39,20 +39,20 @@ public class AnimMorphEasedTarget : MonoBehaviour
 
         private readonly Dictionary<BlendShapeKey, float> _blendShapeWeights = new Dictionary<BlendShapeKey, float>
         {
-            [new BlendShapeKey(BlendShapePreset.A)] = 0.0f,
-            [new BlendShapeKey(BlendShapePreset.E)] = 0.0f,
-            [new BlendShapeKey(BlendShapePreset.I)] = 0.0f,
-            [new BlendShapeKey(BlendShapePreset.O)] = 0.0f,
-            [new BlendShapeKey(BlendShapePreset.U)] = 0.0f,
+            [BlendShapeKey.CreateFromPreset(BlendShapePreset.A)] = 0.0f,
+            [BlendShapeKey.CreateFromPreset(BlendShapePreset.E)] = 0.0f,
+            [BlendShapeKey.CreateFromPreset(BlendShapePreset.I)] = 0.0f,
+            [BlendShapeKey.CreateFromPreset(BlendShapePreset.O)] = 0.0f,
+            [BlendShapeKey.CreateFromPreset(BlendShapePreset.U)] = 0.0f,
         };
 
         private readonly BlendShapeKey[] _keys = new[]
         {
-            new BlendShapeKey(BlendShapePreset.A),
-            new BlendShapeKey(BlendShapePreset.E),
-            new BlendShapeKey(BlendShapePreset.I),
-            new BlendShapeKey(BlendShapePreset.O),
-            new BlendShapeKey(BlendShapePreset.U),
+            BlendShapeKey.CreateFromPreset(BlendShapePreset.A),
+            BlendShapeKey.CreateFromPreset(BlendShapePreset.E),
+            BlendShapeKey.CreateFromPreset(BlendShapePreset.I),
+            BlendShapeKey.CreateFromPreset(BlendShapePreset.O),
+            BlendShapeKey.CreateFromPreset(BlendShapePreset.U),
         };
 
         private OVRLipSyncContextBase _context;

src/EasyVTuberNew/Assets/Packages/TransformControl/Demo/Demo.mat

@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Demo
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0.317
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.8602941, g: 0.8602941, b: 0.8602941, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}