diff --git a/Assets/VRM10.Samples/Runtime/ViewerUI.cs b/Assets/VRM10.Samples/Runtime/ViewerUI.cs index 419073ea7..fed5b523d 100644 --- a/Assets/VRM10.Samples/Runtime/ViewerUI.cs +++ b/Assets/VRM10.Samples/Runtime/ViewerUI.cs @@ -390,7 +390,7 @@ namespace UniVRM10.Samples m_lipSync = go.AddComponent(); m_blink = go.AddComponent(); - m_controller.LookAtTargetType = VRM10ControllerLookAt.LookAtTargetTypes.CalcYawPitchToGaze; + m_controller.LookAtTargetType = VRM10ObjectLookAt.LookAtTargetTypes.CalcYawPitchToGaze; m_controller.Gaze = m_target.transform; } } diff --git a/Assets/VRM10/Runtime/Components/VRM10Controller.cs b/Assets/VRM10/Runtime/Components/VRM10Controller.cs index efa58f163..23f1da47a 100644 --- a/Assets/VRM10/Runtime/Components/VRM10Controller.cs +++ b/Assets/VRM10/Runtime/Components/VRM10Controller.cs @@ -38,7 +38,7 @@ namespace UniVRM10 public Transform Gaze; [SerializeField] - public VRM10ControllerLookAt.LookAtTargetTypes LookAtTargetType; + public VRM10ObjectLookAt.LookAtTargetTypes LookAtTargetType; [SerializeField, Header("VRM1")] public VRM10Object Vrm; diff --git a/Assets/VRM10/Runtime/Components/VRM10Object/VRM10Object.cs b/Assets/VRM10/Runtime/Components/VRM10Object/VRM10Object.cs index d0b6f3949..e5b88fbf9 100644 --- a/Assets/VRM10/Runtime/Components/VRM10Object/VRM10Object.cs +++ b/Assets/VRM10/Runtime/Components/VRM10Object/VRM10Object.cs @@ -34,7 +34,7 @@ namespace UniVRM10 public VRM10ObjectExpression Expression = new VRM10ObjectExpression(); [SerializeField] - public VRM10ControllerLookAt LookAt = new VRM10ControllerLookAt(); + public VRM10ObjectLookAt LookAt = new VRM10ObjectLookAt(); [SerializeField] public VRM10ObjectFirstPerson FirstPerson = new VRM10ObjectFirstPerson(); diff --git a/Assets/VRM10/Runtime/Components/VRM10Object/VRM10ControllerLookAt.cs b/Assets/VRM10/Runtime/Components/VRM10Object/VRM10ObjectLookAt.cs similarity index 99% rename from Assets/VRM10/Runtime/Components/VRM10Object/VRM10ControllerLookAt.cs rename to Assets/VRM10/Runtime/Components/VRM10Object/VRM10ObjectLookAt.cs index ec904f2a1..f65649afa 100644 --- a/Assets/VRM10/Runtime/Components/VRM10Object/VRM10ControllerLookAt.cs +++ b/Assets/VRM10/Runtime/Components/VRM10Object/VRM10ObjectLookAt.cs @@ -8,7 +8,7 @@ using UnityEditor; namespace UniVRM10 { [Serializable] - public class VRM10ControllerLookAt : ILookAtEyeDirectionProvider + public class VRM10ObjectLookAt : ILookAtEyeDirectionProvider { public enum LookAtTargetTypes { diff --git a/Assets/VRM10/Runtime/Components/VRM10Object/VRM10ControllerLookAt.cs.meta b/Assets/VRM10/Runtime/Components/VRM10Object/VRM10ObjectLookAt.cs.meta similarity index 83% rename from Assets/VRM10/Runtime/Components/VRM10Object/VRM10ControllerLookAt.cs.meta rename to Assets/VRM10/Runtime/Components/VRM10Object/VRM10ObjectLookAt.cs.meta index 4da8dd984..afd2a63c1 100644 --- a/Assets/VRM10/Runtime/Components/VRM10Object/VRM10ControllerLookAt.cs.meta +++ b/Assets/VRM10/Runtime/Components/VRM10Object/VRM10ObjectLookAt.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9ad6ed008a4d416468f3eb04b83b1bb0 +guid: 98a194fb86eea8f49a97003a1038f31e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs b/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs index 3eb24527e..cdfc3b1d7 100644 --- a/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs +++ b/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs @@ -500,7 +500,7 @@ namespace UniVRM10 void ExportLookAt(UniGLTF.Extensions.VRMC_vrm.VRMC_vrm vrm, VRM10Controller vrmController) { - if (!(vrmController?.Vrm?.LookAt is VRM10ControllerLookAt lookAt)) + if (!(vrmController?.Vrm?.LookAt is VRM10ObjectLookAt lookAt)) { return; }