diff --git a/Assets/UniGLTF/Editor/MeshUtility/HumanoidEditor.cs b/Assets/UniGLTF/UniHumanoid/Editor/HumanoidEditor.cs similarity index 99% rename from Assets/UniGLTF/Editor/MeshUtility/HumanoidEditor.cs rename to Assets/UniGLTF/UniHumanoid/Editor/HumanoidEditor.cs index a7f9a72c5..2870a989c 100644 --- a/Assets/UniGLTF/Editor/MeshUtility/HumanoidEditor.cs +++ b/Assets/UniGLTF/UniHumanoid/Editor/HumanoidEditor.cs @@ -6,7 +6,7 @@ using UnityEditor; using UnityEngine; using System; -namespace UniGLTF.MeshUtility +namespace UniHumanoid { [CustomEditor(typeof(Humanoid))] public class HumanoidEditor : Editor diff --git a/Assets/UniGLTF/Editor/MeshUtility/HumanoidEditor.cs.meta b/Assets/UniGLTF/UniHumanoid/Editor/HumanoidEditor.cs.meta similarity index 83% rename from Assets/UniGLTF/Editor/MeshUtility/HumanoidEditor.cs.meta rename to Assets/UniGLTF/UniHumanoid/Editor/HumanoidEditor.cs.meta index dffaaa186..4e871db08 100644 --- a/Assets/UniGLTF/Editor/MeshUtility/HumanoidEditor.cs.meta +++ b/Assets/UniGLTF/UniHumanoid/Editor/HumanoidEditor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 57cc7b16eb4146c4ab5631f538e2489f +guid: ee7ea50401b78f64a950f59564838270 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/UniGLTF/Runtime/MeshUtility/Humanoid.cs b/Assets/UniGLTF/UniHumanoid/Scripts/Humanoid.cs similarity index 99% rename from Assets/UniGLTF/Runtime/MeshUtility/Humanoid.cs rename to Assets/UniGLTF/UniHumanoid/Scripts/Humanoid.cs index abb9511a2..3e70358be 100644 --- a/Assets/UniGLTF/Runtime/MeshUtility/Humanoid.cs +++ b/Assets/UniGLTF/UniHumanoid/Scripts/Humanoid.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -namespace UniGLTF.MeshUtility +namespace UniHumanoid { /// /// Bone割り当てを保持する。 diff --git a/Assets/UniGLTF/Runtime/MeshUtility/Humanoid.cs.meta b/Assets/UniGLTF/UniHumanoid/Scripts/Humanoid.cs.meta similarity index 83% rename from Assets/UniGLTF/Runtime/MeshUtility/Humanoid.cs.meta rename to Assets/UniGLTF/UniHumanoid/Scripts/Humanoid.cs.meta index 53fc0f6d8..7ee846f25 100644 --- a/Assets/UniGLTF/Runtime/MeshUtility/Humanoid.cs.meta +++ b/Assets/UniGLTF/UniHumanoid/Scripts/Humanoid.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 889d98e41c0e8ff48bae50d1a729c2df +guid: 97a39af5b64ede64e86b92b5bf94a0e7 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/UniGLTF/Runtime/MeshUtility/HumanoidLoader.cs b/Assets/UniGLTF/UniHumanoid/Scripts/HumanoidLoader.cs similarity index 83% rename from Assets/UniGLTF/Runtime/MeshUtility/HumanoidLoader.cs rename to Assets/UniGLTF/UniHumanoid/Scripts/HumanoidLoader.cs index 37b492d05..0254e9943 100644 --- a/Assets/UniGLTF/Runtime/MeshUtility/HumanoidLoader.cs +++ b/Assets/UniGLTF/UniHumanoid/Scripts/HumanoidLoader.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -namespace UniGLTF.MeshUtility +namespace UniHumanoid { public static class HumanoidLoader { @@ -37,16 +37,6 @@ namespace UniGLTF.MeshUtility return AvatarBuilder.BuildHumanAvatar(root.gameObject, description); } - static SkeletonBone ToSkeletonBone(this Transform t) - { - var sb = new SkeletonBone(); - sb.name = t.name; - sb.position = t.localPosition; - sb.rotation = t.localRotation; - sb.scale = t.localScale; - return sb; - } - static HumanBodyBones TraitToHumanBone(string x) { return (HumanBodyBones)Enum.Parse(typeof(HumanBodyBones), x.Replace(" ", ""), true); diff --git a/Assets/UniGLTF/Runtime/MeshUtility/HumanoidLoader.cs.meta b/Assets/UniGLTF/UniHumanoid/Scripts/HumanoidLoader.cs.meta similarity index 83% rename from Assets/UniGLTF/Runtime/MeshUtility/HumanoidLoader.cs.meta rename to Assets/UniGLTF/UniHumanoid/Scripts/HumanoidLoader.cs.meta index 029655567..9c7733565 100644 --- a/Assets/UniGLTF/Runtime/MeshUtility/HumanoidLoader.cs.meta +++ b/Assets/UniGLTF/UniHumanoid/Scripts/HumanoidLoader.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 12453a111483e4145852e3b057e065d9 +guid: 7b88d4c3436f9894ebc69f162d804cd4 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/VRM10/Runtime/IO/Model/ModelExporter.cs b/Assets/VRM10/Runtime/IO/Model/ModelExporter.cs index 7787a22c7..603de0b15 100644 --- a/Assets/VRM10/Runtime/IO/Model/ModelExporter.cs +++ b/Assets/VRM10/Runtime/IO/Model/ModelExporter.cs @@ -30,10 +30,10 @@ namespace UniVRM10 // humanoid { - var humanoid = root.GetComponent(); + var humanoid = root.GetComponent(); if (humanoid is null) { - humanoid = root.AddComponent(); + humanoid = root.AddComponent(); humanoid.AssignBonesFromAnimator(); } diff --git a/Assets/VRM10/Runtime/IO/Vrm10Importer.cs b/Assets/VRM10/Runtime/IO/Vrm10Importer.cs index 3eabde8a2..2e860ddde 100644 --- a/Assets/VRM10/Runtime/IO/Vrm10Importer.cs +++ b/Assets/VRM10/Runtime/IO/Vrm10Importer.cs @@ -215,7 +215,7 @@ namespace UniVRM10 Root.name = "VRM1"; // humanoid - var humanoid = Root.AddComponent(); + var humanoid = Root.AddComponent(); humanoid.AssignBones(m_map.Nodes.Select(x => (ToUnity(x.Key.HumanoidBone.GetValueOrDefault()), x.Value.transform))); m_humanoid = humanoid.CreateAvatar(); m_humanoid.name = "humanoid"; diff --git a/Assets/VRM10/Runtime/VRM10.asmdef b/Assets/VRM10/Runtime/VRM10.asmdef index 05f8e8642..845518186 100644 --- a/Assets/VRM10/Runtime/VRM10.asmdef +++ b/Assets/VRM10/Runtime/VRM10.asmdef @@ -5,15 +5,15 @@ "MToon", "UniGLTF", "VRMShaders.GLTF.IO.Runtime", - "VRMShaders.VRM10.Format.Runtime" + "VRMShaders.VRM10.Format.Runtime", + "UniHumanoid" ], + "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": false, "precompiledReferences": [], "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false + "defineConstraints": [] } \ No newline at end of file