From 0255f17ca5b577727716059fa474d02b638aecda Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Thu, 3 Nov 2022 17:40:58 +0900 Subject: [PATCH] Remove warning code & suppress file size in Resources --- .../Runtime/UniHumanoid/HumanPoseClip.cs | 2 +- .../Runtime/{ => UniHumanoid}/Resources.meta | 4 +- .../UniHumanoid/Resources/UniHumanoid.meta | 8 + .../Resources/UniHumanoid}/T-Pose.pose.asset | 0 .../UniHumanoid}/T-Pose.pose.asset.meta | 0 Assets/VRM10_Samples/VRM10Viewer/Motions.meta | 8 + .../Motions/vrm10viewer_test_motion.txt} | 0 .../Motions/vrm10viewer_test_motion.txt.meta | 8 + .../VRM10Viewer/VRM10Viewer.unity | 3 +- .../VRM10Viewer/VRM10ViewerUI.cs | 3 - Assets/VRM_Samples/SimpleViewer/Motions.meta | 8 + .../Motions/vrm_simpleviewer_test_motion.txt | 4136 +++++++++++++++++ .../vrm_simpleviewer_test_motion.txt.meta} | 0 13 files changed, 4171 insertions(+), 9 deletions(-) rename Assets/UniGLTF/Runtime/{ => UniHumanoid}/Resources.meta (62%) create mode 100644 Assets/UniGLTF/Runtime/UniHumanoid/Resources/UniHumanoid.meta rename Assets/UniGLTF/Runtime/{Resources => UniHumanoid/Resources/UniHumanoid}/T-Pose.pose.asset (100%) rename Assets/UniGLTF/Runtime/{Resources => UniHumanoid/Resources/UniHumanoid}/T-Pose.pose.asset.meta (100%) create mode 100644 Assets/VRM10_Samples/VRM10Viewer/Motions.meta rename Assets/{UniGLTF/Runtime/Resources/test_motion.txt => VRM10_Samples/VRM10Viewer/Motions/vrm10viewer_test_motion.txt} (100%) create mode 100644 Assets/VRM10_Samples/VRM10Viewer/Motions/vrm10viewer_test_motion.txt.meta create mode 100644 Assets/VRM_Samples/SimpleViewer/Motions.meta create mode 100644 Assets/VRM_Samples/SimpleViewer/Motions/vrm_simpleviewer_test_motion.txt rename Assets/{UniGLTF/Runtime/Resources/test_motion.txt.meta => VRM_Samples/SimpleViewer/Motions/vrm_simpleviewer_test_motion.txt.meta} (100%) diff --git a/Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseClip.cs b/Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseClip.cs index bed317955..4d9e63659 100644 --- a/Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseClip.cs +++ b/Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseClip.cs @@ -5,7 +5,7 @@ namespace UniHumanoid { public class HumanPoseClip : ScriptableObject { - public const string TPoseResourcePath = "T-Pose.pose"; + public const string TPoseResourcePath = "UniHumanoid/T-Pose.pose"; public Vector3 bodyPosition; diff --git a/Assets/UniGLTF/Runtime/Resources.meta b/Assets/UniGLTF/Runtime/UniHumanoid/Resources.meta similarity index 62% rename from Assets/UniGLTF/Runtime/Resources.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/Resources.meta index 2285cdc60..6d2ba34e2 100644 --- a/Assets/UniGLTF/Runtime/Resources.meta +++ b/Assets/UniGLTF/Runtime/UniHumanoid/Resources.meta @@ -1,8 +1,6 @@ fileFormatVersion: 2 -guid: c61106d290c827b49b7a6e3f6497bd3f +guid: b4f2ed33f96cfdd4ab1057fccbe1d9e1 folderAsset: yes -timeCreated: 1519379142 -licenseType: Free DefaultImporter: externalObjects: {} userData: diff --git a/Assets/UniGLTF/Runtime/UniHumanoid/Resources/UniHumanoid.meta b/Assets/UniGLTF/Runtime/UniHumanoid/Resources/UniHumanoid.meta new file mode 100644 index 000000000..4e4b44155 --- /dev/null +++ b/Assets/UniGLTF/Runtime/UniHumanoid/Resources/UniHumanoid.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3c8d7024b7589844a9bbd3d632b5853e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UniGLTF/Runtime/Resources/T-Pose.pose.asset b/Assets/UniGLTF/Runtime/UniHumanoid/Resources/UniHumanoid/T-Pose.pose.asset similarity index 100% rename from Assets/UniGLTF/Runtime/Resources/T-Pose.pose.asset rename to Assets/UniGLTF/Runtime/UniHumanoid/Resources/UniHumanoid/T-Pose.pose.asset diff --git a/Assets/UniGLTF/Runtime/Resources/T-Pose.pose.asset.meta b/Assets/UniGLTF/Runtime/UniHumanoid/Resources/UniHumanoid/T-Pose.pose.asset.meta similarity index 100% rename from Assets/UniGLTF/Runtime/Resources/T-Pose.pose.asset.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/Resources/UniHumanoid/T-Pose.pose.asset.meta diff --git a/Assets/VRM10_Samples/VRM10Viewer/Motions.meta b/Assets/VRM10_Samples/VRM10Viewer/Motions.meta new file mode 100644 index 000000000..5d616db2f --- /dev/null +++ b/Assets/VRM10_Samples/VRM10Viewer/Motions.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b092f2ba86c6ec247afd37d38108bf03 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UniGLTF/Runtime/Resources/test_motion.txt b/Assets/VRM10_Samples/VRM10Viewer/Motions/vrm10viewer_test_motion.txt similarity index 100% rename from Assets/UniGLTF/Runtime/Resources/test_motion.txt rename to Assets/VRM10_Samples/VRM10Viewer/Motions/vrm10viewer_test_motion.txt diff --git a/Assets/VRM10_Samples/VRM10Viewer/Motions/vrm10viewer_test_motion.txt.meta b/Assets/VRM10_Samples/VRM10Viewer/Motions/vrm10viewer_test_motion.txt.meta new file mode 100644 index 000000000..fe3a37d2e --- /dev/null +++ b/Assets/VRM10_Samples/VRM10Viewer/Motions/vrm10viewer_test_motion.txt.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 08df5151e71aed748b13547492fb8b9a +timeCreated: 1546851178 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRM10_Samples/VRM10Viewer/VRM10Viewer.unity b/Assets/VRM10_Samples/VRM10Viewer/VRM10Viewer.unity index b26cea286..15284a929 100644 --- a/Assets/VRM10_Samples/VRM10Viewer/VRM10Viewer.unity +++ b/Assets/VRM10_Samples/VRM10Viewer/VRM10Viewer.unity @@ -5572,7 +5572,7 @@ MonoBehaviour: m_src: {fileID: 0} m_target: {fileID: 802105000} Root: {fileID: 0} - m_motion: {fileID: 4900000, guid: 7d2617171adc40b41ac50228f101e178, type: 3} + m_motion: {fileID: 4900000, guid: 08df5151e71aed748b13547492fb8b9a, type: 3} m_texts: m_textModelTitle: {fileID: 1111491925} m_textModelVersion: {fileID: 1045380263} @@ -5591,7 +5591,6 @@ MonoBehaviour: ToggleMotionTPose: {fileID: 1791103380} ToggleMotionBVH: {fileID: 1311520910} ToggleMotion: {fileID: 224350194} - m_pose: {fileID: 11400000, guid: 879e332f84a378c4da3b87af13da3e85, type: 2} --- !u!1 &1791103378 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs b/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs index 6bc7142c1..b9ab35159 100644 --- a/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs +++ b/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs @@ -168,9 +168,6 @@ namespace UniVRM10.VRM10Viewer [SerializeField] UIFields m_ui = default; - [SerializeField] - HumanPoseClip m_pose = default; - private void Reset() { var buttons = GameObject.FindObjectsOfType