Merge pull request #856 from malaybaku/feature/support_vrm10

VRM1.0の読み込みサポート

VMagicMirror/Assets/Baku/VMagicMirror/Prefabs/AvatarControl/FaceController.prefab

@@ -12,7 +12,6 @@ GameObject:
   - component: {fileID: 5395904245375780253}
   - component: {fileID: 3748028266611161169}
   - component: {fileID: 8701057551241780110}
-  - component: {fileID: 7797473119978373343}
   - component: {fileID: 5187863769921554747}
   - component: {fileID: 6241239198292537160}
   - component: {fileID: 6186883453983643772}
@@ -53,7 +52,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 528308ecc8af46647b68473c1f06c11b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  blendShapeInitializer: {fileID: 7797473119978373343}
   lipSyncContext: {fileID: 8501418776315766171}
   lipSyncIntegrator: {fileID: 6125060425342205146}
   autoBlink: {fileID: 2335327280039312852}
@@ -87,18 +85,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d80971aa6a886324db1bfcf2a2c34bd5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &7797473119978373343
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3748028266611161173}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a125f000c2a422b4c88a36e60296385a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &5187863769921554747
 MonoBehaviour:
   m_ObjectHideFlags: 0

VMagicMirror/Assets/Baku/VMagicMirror/Prefabs/Core/CoreLogics.prefab

@@ -30,7 +30,6 @@ Transform:
   m_Children:
   - {fileID: 4403582645890784493}
   - {fileID: 4403582645735969391}
-  - {fileID: 5952249983603830923}
   - {fileID: 7502228934553232097}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -87,46 +86,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 5203461303792189549}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &6280833885169497037
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 914461298883566549}
-    m_Modifications:
-    - target: {fileID: 410006747659649862, guid: 48e4e24e48cf43543ab508e6a42a1591,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 410006747659649862, guid: 48e4e24e48cf43543ab508e6a42a1591,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 410006747659649862, guid: 48e4e24e48cf43543ab508e6a42a1591,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 410006747659649862, guid: 48e4e24e48cf43543ab508e6a42a1591,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 853238483135863806, guid: 48e4e24e48cf43543ab508e6a42a1591,
-        type: 3}
-      propertyPath: m_Name
-      value: ReplacedVRMSpringBoneScheduler
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 48e4e24e48cf43543ab508e6a42a1591, type: 3}
---- !u!4 &5952249983603830923 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 410006747659649862, guid: 48e4e24e48cf43543ab508e6a42a1591,
-    type: 3}
-  m_PrefabInstance: {fileID: 6280833885169497037}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6638005332231117493
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -147,7 +106,7 @@ PrefabInstance:
     - target: {fileID: 3748028266611161172, guid: bc880b587a9f08e498a8c6de1fcf4650,
         type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 3748028266611161172, guid: bc880b587a9f08e498a8c6de1fcf4650,
         type: 3}

VMagicMirror/Assets/Baku/VMagicMirror/Prefabs/Core/LoadController.prefab

@@ -9,8 +9,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6312515010370811259}
-  - component: {fileID: 6312515010370811263}
   - component: {fileID: 5640999407990057317}
+  - component: {fileID: 1131529251366033892}
   m_Layer: 0
   m_Name: LoadController
   m_TagString: Untagged
@@ -32,7 +32,7 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &6312515010370811263
+--- !u!114 &5640999407990057317
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -41,13 +41,15 @@ MonoBehaviour:
   m_GameObject: {fileID: 6312515010370811258}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 91cd6285b69da1e46a0a90d72eab7fc2, type: 3}
+  m_Script: {fileID: 11500000, guid: 8a8c86c789fa99a4d8bda2ca79ddde59, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  animatorController: {fileID: 9100000, guid: 8274142a1807f5848a5dd1166db7d615, type: 2}
-  windowStyleController: {fileID: 0}
-  settingAdjuster: {fileID: 0}
---- !u!114 &5640999407990057317
+  instanceUpdater: {fileID: 1131529251366033892}
+  vrmPreviewCanvasPrefab: {fileID: 4226044117769235611, guid: 4821f596a86990e47ae70722be7ac5ae,
+    type: 3}
+  vrm10MetaViewPrefab: {fileID: 3214800444371663839, guid: 21497207a08420447a1d5a5bd3d44747,
+    type: 3}
+--- !u!114 &1131529251366033892
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -56,11 +58,6 @@ MonoBehaviour:
   m_GameObject: {fileID: 6312515010370811258}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8a8c86c789fa99a4d8bda2ca79ddde59, type: 3}
+  m_Script: {fileID: 11500000, guid: d2e37b3175f700840974083a3e50fd9b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  loadController: {fileID: 6312515010370811263}
-  settingAutoAdjuster: {fileID: 0}
-  vrmPreviewLanguage: {fileID: 0}
-  vrmPreviewCanvasPrefab: {fileID: 4226044117769235611, guid: 4821f596a86990e47ae70722be7ac5ae,
-    type: 3}

VMagicMirror/Assets/Baku/VMagicMirror/Prefabs/Debugger/ControlRigVisualizer.prefab

@@ -0,0 +1,47 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4353405852794295506
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4353405852794295532}
+  - component: {fileID: 4353405852794295533}
+  m_Layer: 0
+  m_Name: ControlRigVisualizer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4353405852794295532
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4353405852794295506}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4353405852794295533
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4353405852794295506}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a78ab5a4bb325864687b571bd9146473, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  bonePrefab: {fileID: 890151008131320554, guid: 743b3f53f6da21145b5107d306df47e5,
+    type: 3}