Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-04-24 23:18:04 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rename_VRM10Controller_to_Vrm10Instance

Browse Source
This commit is contained in:
ousttrue 2021-09-28 13:27:28 +09:00
parent 62124a68d8
commit 0934d96228
32 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/VRM10/Editor/Components/Expression/VRM10ControllerEditorExpression.cs → Assets/VRM10/Editor/Components/Expression/Vrm10InstanceEditorExpression.cs
View File

@ -10,13 +10,13 @@ namespace UniVRM10
//
// Runtime に Expression 操作用の Slider を表示する
//
class VRM10ControllerEditorExpression
class Vrm10InstanceEditorExpression
{
VRM10Controller m_target;
Vrm10Instance m_target;
Dictionary<ExpressionKey, float> m_expressionKeyWeights = new Dictionary<ExpressionKey, float>();
List<ExpressionSlider> m_sliders;
public VRM10ControllerEditorExpression(VRM10Controller target)
public Vrm10InstanceEditorExpression(Vrm10Instance target)
{
m_target = target;

2
Assets/VRM10/Runtime/Components/VRM10Controller/VRM10Controller.cs.meta → Assets/VRM10/Editor/Components/Expression/Vrm10InstanceEditorExpression.cs.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 82d8c2da05a1474478651e7a11d98a8f
guid: 531a88b434472bc498231c4b6f9fc217
MonoImporter:
externalObjects: {}
serializedVersion: 2

2
Assets/VRM10/Editor/Components/SpringBone/SelectedGUI.cs
View File

@ -198,7 +198,7 @@ namespace UniVRM10
ReorderableList _springColliderGroupList;
ReorderableList _springJointList;
public SelectedSpringGUI(VRM10Controller target, SerializedObject so, int i) : base(so, i)
public SelectedSpringGUI(Vrm10Instance target, SerializedObject so, int i) : base(so, i)
{
Property = so.FindProperty($"SpringBone.Springs.Array.data[{i}]");

6
Assets/VRM10/Editor/Components/SpringBone/SpringBoneEditor.cs
View File

@ -11,7 +11,7 @@ namespace UniVRM10
public static class SpringBoneEditor
{
static SpringBoneTreeView s_treeView;
static SpringBoneTreeView GetTree(VRM10Controller target, SerializedObject so)
static SpringBoneTreeView GetTree(Vrm10Instance target, SerializedObject so)
{
if (s_treeView == null || s_treeView.Target != target)
{
@ -30,7 +30,7 @@ namespace UniVRM10
/// <summary>
/// 2D の GUI 描画
/// </summary>
public static void Draw2D(VRM10Controller target, SerializedObject so)
public static void Draw2D(Vrm10Instance target, SerializedObject so)
{
var tree = GetTree(target, so);
if (GUILayout.Button("Reload"))
@ -45,7 +45,7 @@ namespace UniVRM10
/// <summary>
/// 3D の Handle 描画
/// </summary>
public static void Draw3D(VRM10Controller target, SerializedObject so)
public static void Draw3D(Vrm10Instance target, SerializedObject so)
{
var tree = GetTree(target, so);
tree.Draw3D();

6
Assets/VRM10/Editor/Components/SpringBone/SpringBoneTreeView.cs
View File

@ -9,7 +9,7 @@ namespace UniVRM10
{
public class SpringBoneTreeView : TreeView
{
public VRM10Controller Target { get; private set; }
public Vrm10Instance Target { get; private set; }
SerializedObject _so;
TreeViewItem _root;
@ -20,7 +20,7 @@ namespace UniVRM10
Dictionary<int, object> _map = new Dictionary<int, object>();
public SpringBoneTreeView(TreeViewState state, VRM10Controller target, SerializedObject so) : base(state)
public SpringBoneTreeView(TreeViewState state, Vrm10Instance target, SerializedObject so) : base(state)
{
Target = target;
_so = so;
@ -75,7 +75,7 @@ namespace UniVRM10
var i = Target.SpringBone.ColliderGroups.IndexOf(colliderGroup);
_selected = new SelectedColliderGroupGUI(_so, i);
}
else if (value is VRM10ControllerSpringBone.Spring spring)
else if (value is Vrm10InstanceSpringBone.Spring spring)
{
var i = Target.SpringBone.Springs.IndexOf(spring);
_selected = new SelectedSpringGUI(Target, _so, i);

10
Assets/VRM10/Editor/Components/VRM10Window.cs
View File

@ -19,7 +19,7 @@ namespace UniVRM10
var window = (VRM10Window)GetWindow(typeof(VRM10Window));
window.titleContent = new GUIContent(WINDOW_TITLE);
window.Show();
window.Root = UnityEditor.Selection.activeTransform?.GetComponent<VRM10Controller>();
window.Root = UnityEditor.Selection.activeTransform?.GetComponent<Vrm10Instance>();
}
void OnEnable()
@ -45,9 +45,9 @@ namespace UniVRM10
SerializedObject m_so;
int? m_root;
VRM10Controller Root
Vrm10Instance Root
{
get => m_root.HasValue ? (EditorUtility.InstanceIDToObject(m_root.Value) as VRM10Controller) : null;
get => m_root.HasValue ? (EditorUtility.InstanceIDToObject(m_root.Value) as Vrm10Instance) : null;
set
{
int? id = value != null ? value.GetInstanceID() : default;
@ -126,7 +126,7 @@ namespace UniVRM10
{
if (UnityEditor.Selection.activeTransform != null)
{
var root = UnityEditor.Selection.activeTransform.Ancestors().Select(x => x.GetComponent<VRM10Controller>()).FirstOrDefault(x => x != null);
var root = UnityEditor.Selection.activeTransform.Ancestors().Select(x => x.GetComponent<Vrm10Instance>()).FirstOrDefault(x => x != null);
if (root != null)
{
Root = root;
@ -134,7 +134,7 @@ namespace UniVRM10
}
}
Root = (VRM10Controller)EditorGUILayout.ObjectField("vrm1", Root, typeof(VRM10Controller), true);
Root = (Vrm10Instance)EditorGUILayout.ObjectField("vrm1", Root, typeof(Vrm10Instance), true);
if (Root == null)
{
return;

4
Assets/VRM10/Editor/EditorTool/VRM10BoneSelectorEditorTool.cs
View File

@ -8,7 +8,7 @@ namespace UniVRM10
/// <summary>
/// Bone Selector
/// </summary>
[EditorTool("vrm-1.0/Humanoid", typeof(UniVRM10.VRM10Controller))]
[EditorTool("vrm-1.0/Humanoid", typeof(UniVRM10.Vrm10Instance))]
public class VRM10BoneSelectorEditorTool : EditorTool
{
static GUIContent s_cachedIcon;
@ -65,7 +65,7 @@ namespace UniVRM10
_impl = new BoneSelector(SceneView.lastActiveSceneView.camera);
}
var root = Selection.activeGameObject?.GetComponent<VRM10Controller>();
var root = Selection.activeGameObject?.GetComponent<Vrm10Instance>();
if (root == null)
{
return;

4
Assets/VRM10/Editor/EditorTool/VRM10ExpressionEditorTool.cs
View File

@ -6,7 +6,7 @@ using UnityEngine;
namespace UniVRM10
{
[EditorTool("vrm-1.0/Expression", typeof(UniVRM10.VRM10Controller))]
[EditorTool("vrm-1.0/Expression", typeof(UniVRM10.Vrm10Instance))]
class VRM10ExpressionEditorTool : EditorTool
{
static GUIContent s_cachedIcon;
@ -42,7 +42,7 @@ namespace UniVRM10
public override void OnToolGUI(EditorWindow window)
{
var root = Selection.activeTransform.GetComponent<VRM10Controller>();
var root = Selection.activeTransform.GetComponent<Vrm10Instance>();
if (root == null)
{
return;

4
Assets/VRM10/Editor/EditorTool/VRM10LookAtEditorTool.cs
View File

@ -5,7 +5,7 @@ using UnityEditor.EditorTools;
namespace UniVRM10
{
[EditorTool("vrm-1.0/LookAt", typeof(UniVRM10.VRM10Controller))]
[EditorTool("vrm-1.0/LookAt", typeof(UniVRM10.Vrm10Instance))]
class VRM10LookAtEditorTool : EditorTool
{
static GUIContent s_cachedIcon;
@ -41,7 +41,7 @@ namespace UniVRM10
public override void OnToolGUI(EditorWindow window)
{
var root = Selection.activeTransform.GetComponent<VRM10Controller>();
var root = Selection.activeTransform.GetComponent<Vrm10Instance>();
if (root == null)
{
return;

2
Assets/VRM10/Editor/Vrm10ExportDialog.cs
View File

@ -86,7 +86,7 @@ namespace UniVRM10
}
else
{
var controller = root.GetComponent<VRM10Controller>();
var controller = root.GetComponent<Vrm10Instance>();
if (controller != null)
{
Vrm = controller.Vrm;

2
Assets/VRM10/Runtime/Components/Constraint/VRM10Constraint.cs
View File

@ -24,7 +24,7 @@ namespace UniVRM10
// root
break;
}
if (current.GetComponent<VRM10Controller>() != null)
if (current.GetComponent<Vrm10Instance>() != null)
{
// model root
break;

2
Assets/VRM10/Runtime/Components/VRM10Object/VRM10ObjectExpression.cs
View File

@ -286,7 +286,7 @@ namespace UniVRM10
int m_debugCount;
internal void Setup(VRM10Controller target, ILookAtEyeDirectionProvider eyeDirectionProvider, ILookAtEyeDirectionApplicable eyeDirectionApplicable)
internal void Setup(Vrm10Instance target, ILookAtEyeDirectionProvider eyeDirectionProvider, ILookAtEyeDirectionApplicable eyeDirectionApplicable)
{
Restore();

2
Assets/VRM10/Runtime/Components/VRM10Controller.meta → Assets/VRM10/Runtime/Components/Vrm10Instance.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6edfaddd4ff9b9f479c5490ed02b7e3c
guid: a4d5df61674fa87489010760a85940e0
folderAsset: yes
DefaultImporter:
externalObjects: {}

12
Assets/VRM10/Runtime/Components/VRM10Controller/VRM10Controller.cs → Assets/VRM10/Runtime/Components/Vrm10Instance/Vrm10Instance.cs
View File

@ -22,13 +22,13 @@ namespace UniVRM10
[AddComponentMenu("VRM10/VRMController")]
[DisallowMultipleComponent]
[DefaultExecutionOrder(11000)]
public class VRM10Controller : MonoBehaviour
public class Vrm10Instance : MonoBehaviour
{
[SerializeField, Header("VRM1")]
public VRM10Object Vrm;
[SerializeField]
public VRM10ControllerSpringBone SpringBone = new VRM10ControllerSpringBone();
public Vrm10InstanceSpringBone SpringBone = new Vrm10InstanceSpringBone();
public enum UpdateTypes
{
@ -55,17 +55,17 @@ namespace UniVRM10
[SerializeField]
public VRM10ObjectLookAt.LookAtTargetTypes LookAtTargetType;
VRM10ControllerRuntime m_runtime;
Vrm10InstanceRuntime m_runtime;
/// <summary>
/// delay new VRM10ControllerRuntime
/// delay new Vrm10InstanceRuntime
/// </summary>
/// <returns></returns>
VRM10ControllerRuntime GetOrCreate()
Vrm10InstanceRuntime GetOrCreate()
{
if (m_runtime == null)
{
m_runtime = new VRM10ControllerRuntime(this);
m_runtime = new Vrm10InstanceRuntime(this);
}
return m_runtime;
}

2
Assets/VRM10/Editor/Components/Expression/VRM10ControllerEditorExpression.cs.meta → Assets/VRM10/Runtime/Components/Vrm10Instance/Vrm10Instance.cs.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3387f1e8cba522b44a78609529674819
guid: bfba4ccd3f854e64f868ce83553071a9
MonoImporter:
externalObjects: {}
serializedVersion: 2

6
Assets/VRM10/Runtime/Components/VRM10Controller/VRM10ControllerRuntime.cs → Assets/VRM10/Runtime/Components/Vrm10Instance/Vrm10InstanceRuntime.cs
View File

@ -6,13 +6,13 @@ namespace UniVRM10
/// <summary>
/// Play時 と Editorからの参照情報置き場
/// </summary>
public class VRM10ControllerRuntime
public class Vrm10InstanceRuntime
{
VRM10Controller m_target;
Vrm10Instance m_target;
VRM10Constraint[] m_constraints;
Transform m_head;
public VRM10ControllerRuntime(VRM10Controller target)
public Vrm10InstanceRuntime(Vrm10Instance target)
{
m_target = target;
var animator = target.GetComponent<Animator>();

2
Assets/VRM10/Runtime/Components/VRM10Controller/VRM10ControllerSpringBone.cs.meta → Assets/VRM10/Runtime/Components/Vrm10Instance/Vrm10InstanceRuntime.cs.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 35bca1258d58b5a4a9f0633d9d4fc322
guid: 56e3778fb3288a54d8f898a458e81a23
MonoImporter:
externalObjects: {}
serializedVersion: 2

2
Assets/VRM10/Runtime/Components/VRM10Controller/VRM10ControllerSpringBone.cs → Assets/VRM10/Runtime/Components/Vrm10Instance/Vrm10InstanceSpringBone.cs
View File

@ -15,7 +15,7 @@ namespace UniVRM10
///
/// </summary>
[Serializable]
public sealed class VRM10ControllerSpringBone
public sealed class Vrm10InstanceSpringBone
{
[SerializeField]
public List<VRM10SpringBoneColliderGroup> ColliderGroups = new List<VRM10SpringBoneColliderGroup>();

2
Assets/VRM10/Runtime/Components/VRM10Controller/VRM10ControllerRuntime.cs.meta → Assets/VRM10/Runtime/Components/Vrm10Instance/Vrm10InstanceSpringBone.cs.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 75e82d601e36f0c4289ddb16757aab20
guid: 59fabd31ab5a08240adb8ac808109022
MonoImporter:
externalObjects: {}
serializedVersion: 2

14
Assets/VRM10/Runtime/IO/Vrm10Exporter.cs
View File

@ -227,7 +227,7 @@ namespace UniVRM10
UniGLTF.Extensions.VRMC_springBone.VRMC_springBone springBone,
int? thumbnailIndex) ExportVrm(GameObject root, Model model, ModelExporter converter, VRM10ObjectMeta vrmMeta)
{
var vrmController = root?.GetComponent<VRM10Controller>();
var vrmController = root?.GetComponent<Vrm10Instance>();
if (vrmMeta == null)
{
@ -321,7 +321,7 @@ namespace UniVRM10
return joint;
}
UniGLTF.Extensions.VRMC_springBone.VRMC_springBone ExportSpringBone(VRM10Controller controller, Model model, ModelExporter converter)
UniGLTF.Extensions.VRMC_springBone.VRMC_springBone ExportSpringBone(Vrm10Instance controller, Model model, ModelExporter converter)
{
var springBone = new UniGLTF.Extensions.VRMC_springBone.VRMC_springBone
{
@ -371,7 +371,7 @@ namespace UniVRM10
return springBone;
}
void ExportConstraints(VRM10Controller vrmController, Model model, ModelExporter converter)
void ExportConstraints(Vrm10Instance vrmController, Model model, ModelExporter converter)
{
var constraints = vrmController.GetComponentsInChildren<VRM10Constraint>();
foreach (var constraint in constraints)
@ -475,7 +475,7 @@ namespace UniVRM10
};
}
void ExportFirstPerson(UniGLTF.Extensions.VRMC_vrm.VRMC_vrm vrm, VRM10Controller vrmController, Model model, ModelExporter converter)
void ExportFirstPerson(UniGLTF.Extensions.VRMC_vrm.VRMC_vrm vrm, Vrm10Instance vrmController, Model model, ModelExporter converter)
{
if (!(vrmController?.Vrm?.FirstPerson is VRM10ObjectFirstPerson firstPerson))
{
@ -506,7 +506,7 @@ namespace UniVRM10
};
}
void ExportLookAt(UniGLTF.Extensions.VRMC_vrm.VRMC_vrm vrm, VRM10Controller vrmController)
void ExportLookAt(UniGLTF.Extensions.VRMC_vrm.VRMC_vrm vrm, Vrm10Instance vrmController)
{
if (!(vrmController?.Vrm?.LookAt is VRM10ObjectLookAt lookAt))
{
@ -559,7 +559,7 @@ namespace UniVRM10
};
}
UniGLTF.Extensions.VRMC_vrm.Expression ExportExpression(VRM10Expression e, VRM10Controller vrmController, Model model, ModelExporter converter)
UniGLTF.Extensions.VRMC_vrm.Expression ExportExpression(VRM10Expression e, Vrm10Instance vrmController, Model model, ModelExporter converter)
{
if (e == null)
{
@ -634,7 +634,7 @@ namespace UniVRM10
return vrmExpression;
}
void ExportExpression(UniGLTF.Extensions.VRMC_vrm.VRMC_vrm vrm, VRM10Controller vrmController, Model model, ModelExporter converter)
void ExportExpression(UniGLTF.Extensions.VRMC_vrm.VRMC_vrm vrm, Vrm10Instance vrmController, Model model, ModelExporter converter)
{
if (vrmController?.Vrm?.Expression?.Clips == null)
{

8
Assets/VRM10/Runtime/IO/Vrm10Importer.cs
View File

@ -226,7 +226,7 @@ namespace UniVRM10
animator.avatar = m_humanoid;
// VrmController
var controller = Root.AddComponent<VRM10Controller>();
var controller = Root.AddComponent<Vrm10Instance>();
// vrm
controller.Vrm = await LoadVrmAsync(awaitCaller, m_vrm.VrmExtension);
@ -452,7 +452,7 @@ namespace UniVRM10
return vrm;
}
async Task LoadSpringBoneAsync(IAwaitCaller awaitCaller, VRM10Controller controller, UniGLTF.Extensions.VRMC_springBone.VRMC_springBone gltfVrmSpringBone)
async Task LoadSpringBoneAsync(IAwaitCaller awaitCaller, Vrm10Instance controller, UniGLTF.Extensions.VRMC_springBone.VRMC_springBone gltfVrmSpringBone)
{
await awaitCaller.NextFrame();
@ -517,7 +517,7 @@ namespace UniVRM10
{
continue;
}
var spring = new VRM10ControllerSpringBone.Spring(gltfSpring.Name);
var spring = new Vrm10InstanceSpringBone.Spring(gltfSpring.Name);
controller.SpringBone.Springs.Add(spring);
if (gltfSpring.ColliderGroups != null)
@ -572,7 +572,7 @@ namespace UniVRM10
return v;
}
async Task LoadConstraintAsync(IAwaitCaller awaitCaller, VRM10Controller controller)
async Task LoadConstraintAsync(IAwaitCaller awaitCaller, Vrm10Instance controller)
{
for (int i = 0; i < Data.GLTF.nodes.Count; ++i)
{

2
Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10RuntimeLoader.cs
View File

@ -98,7 +98,7 @@ namespace UniVRM10.FirstPersonSample
var instance = await loader.LoadAsync();
// VR用 FirstPerson 設定
var controller = instance.GetComponent<VRM10Controller>();
var controller = instance.GetComponent<Vrm10Instance>();
var created = await controller.Vrm.FirstPerson.SetupAsync(controller.gameObject);
instance.AddRenderers(created);

6
Assets/VRM10/Samples/VRM10Viewer/VRM10AIUEO.cs
View File

@ -7,10 +7,10 @@ namespace UniVRM10.VRM10Viewer
public class VRM10AIUEO : MonoBehaviour
{
[SerializeField]
public VRM10Controller Controller;
public Vrm10Instance Controller;
private void Reset()
{
Controller = GetComponent<VRM10Controller>();
Controller = GetComponent<Vrm10Instance>();
}
Coroutine m_coroutine;
@ -22,7 +22,7 @@ namespace UniVRM10.VRM10Viewer
{
if (Controller == null)
{
Controller = GetComponent<VRM10Controller>();
Controller = GetComponent<Vrm10Instance>();
}
}

6
Assets/VRM10/Samples/VRM10Viewer/VRM10AutoExpression.cs
View File

@ -10,10 +10,10 @@ namespace UniVRM10.VRM10Viewer
public class VRM10AutoExpression : MonoBehaviour
{
[SerializeField]
public VRM10Controller Controller;
public Vrm10Instance Controller;
private void Reset()
{
Controller = GetComponent<VRM10Controller>();
Controller = GetComponent<Vrm10Instance>();
}
Coroutine m_coroutine;
@ -25,7 +25,7 @@ namespace UniVRM10.VRM10Viewer
{
if (Controller == null)
{
Controller = GetComponent<VRM10Controller>();
Controller = GetComponent<Vrm10Instance>();
}
}

4
Assets/VRM10/Samples/VRM10Viewer/VRM10Blinker.cs
View File

@ -10,7 +10,7 @@ namespace UniVRM10.VRM10Viewer
/// </summary>
public class VRM10Blinker : MonoBehaviour
{
VRM10Controller m_controller;
Vrm10Instance m_controller;
[FormerlySerializedAs("m_interVal")]
[SerializeField]
@ -100,7 +100,7 @@ namespace UniVRM10.VRM10Viewer
private void OnEnable()
{
m_controller = GetComponent<VRM10Controller>();
m_controller = GetComponent<Vrm10Instance>();
m_coroutine = StartCoroutine(BlinkRoutine());
}

6
Assets/VRM10/Samples/VRM10Viewer/VRM10ViewerUI.cs
View File

@ -210,7 +210,7 @@ namespace UniVRM10.VRM10Viewer
{
RuntimeGltfInstance m_instance;
HumanPoseTransfer m_pose;
VRM10Controller m_controller;
Vrm10Instance m_controller;
VRM10AIUEO m_lipSync;
bool m_enableLipSyncValue;
@ -261,11 +261,11 @@ namespace UniVRM10.VRM10Viewer
{
m_instance = instance;
m_controller = instance.GetComponent<VRM10Controller>();
m_controller = instance.GetComponent<Vrm10Instance>();
if (m_controller != null)
{
// VRM
m_controller.UpdateType = VRM10Controller.UpdateTypes.LateUpdate; // after HumanPoseTransfer's setPose
m_controller.UpdateType = Vrm10Instance.UpdateTypes.LateUpdate; // after HumanPoseTransfer's setPose
{
m_pose = instance.gameObject.AddComponent<HumanPoseTransfer>();
m_pose.Source = src;

4
Assets/VRM10/Tests/ExpressionTests.cs
View File

@ -32,7 +32,7 @@ namespace UniVRM10.Test
controller.Vrm.Expression.Aa.MaterialColorBindings = src.ToArray();
// ok if no exception
var r = new VRM10ControllerRuntime(controller);
var r = new Vrm10InstanceRuntime(controller);
}
[Test]
@ -56,7 +56,7 @@ namespace UniVRM10.Test
controller.Vrm.Expression.Aa.MaterialUVBindings = src.ToArray();
// ok if no exception
var r = new VRM10ControllerRuntime(controller);
var r = new Vrm10InstanceRuntime(controller);
}
}
}

4
Assets/VRM10/Tests/TestAsset.cs
View File

@ -14,7 +14,7 @@ namespace UniVRM10
}
}
public static VRM10Controller LoadAlicia()
public static Vrm10Instance LoadAlicia()
{
Vrm10Data.TryParseOrMigrate(AliciaPath, true, out Vrm10Data vrm);
using (var loader = new Vrm10Importer(vrm))
@ -24,7 +24,7 @@ namespace UniVRM10
var instance = task.Result;
return instance.GetComponent<VRM10Controller>();
return instance.GetComponent<Vrm10Instance>();
}
}
}

2
docs/locale/en/LC_MESSAGES/vrm1/vrm1_expression.po
View File

@ -27,7 +27,7 @@ msgid "表情周りの操作方法。"
msgstr ""
#: ../../vrm1/vrm1_expression.md:5
msgid "VRM-1.0 の `BlendShapeProxy` は、`VRM10Controller.Expression` になります。"
msgid "VRM-1.0 の `BlendShapeProxy` は、`Vrm10Instance.Expression` になります。"
msgstr ""
#: ../../vrm1/vrm1_expression.md:7

4
docs/locale/en/LC_MESSAGES/vrm1/vrm1_firstperson.po
View File

@ -35,8 +35,8 @@ msgid "Load する"
msgstr "Load"
#: ../../vrm1/vrm1_firstperson.md:8
msgid "VRM10Controller を取得する"
msgstr "Get VRM10Controller"
msgid "Vrm10Instance を取得する"
msgstr "Get Vrm10Instance"
#: ../../vrm1/vrm1_firstperson.md:9
msgid "`controller.Vrm.FirstPerson.SetupAsync` を呼び出す"

4
docs/vrm1/vrm1_expression.md
View File

@ -2,7 +2,7 @@
表情周りの操作方法。
> VRM-1.0 の `BlendShapeProxy` は、`VRM10Controller.Expression` になります。
> VRM-1.0 の `BlendShapeProxy` は、`Vrm10Instance.Expression` になります。
VRM-0.X の例
@ -18,6 +18,6 @@ VRM-1.0 の例
```csharp
void SetExpression(GameObject root)
{
var controller = root.GetComponent<VRM10Controller>();
var controller = root.GetComponent<Vrm10Instance>();
}
```

4
docs/vrm1/vrm1_firstperson.md
View File

@ -5,7 +5,7 @@
VR向け FirstPerson 設定の初期化手順です。
1. Load する
2. VRM10Controller を取得する
2. Vrm10Instance を取得する
3. `controller.Vrm.FirstPerson.SetupAsync` を呼び出す
4. `controller.Vrm.FirstPerson.SetupAsync` した結果新規に作成されたモデルを `RuntimeGltfInstance` に渡す
5. ShowMeshes
@ -24,7 +24,7 @@ async Task<RuntimeGltfInstance> LoadAsync(string path)
var instance = await loader.LoadAsync();
// 2.
var controller = instance.GetComponent<VRM10Controller>();
var controller = instance.GetComponent<Vrm10Instance>();
// 3.
var created = await controller.Vrm.FirstPerson.SetupAsync(controller.gameObject);