diff --git a/Assets/StreamingAssets.meta b/Assets/StreamingAssets.meta deleted file mode 100644 index ec78c56cb..000000000 --- a/Assets/StreamingAssets.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 92d2f8e057b4e3f4cb8448a6e1a4c56c -folderAsset: yes -timeCreated: 1546852824 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/VRM.Samples.meta b/Assets/StreamingAssets/VRM.Samples.meta deleted file mode 100644 index fe59bb00b..000000000 --- a/Assets/StreamingAssets/VRM.Samples.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: e7247936c242c654090a19ff084bcb4d -folderAsset: yes -timeCreated: 1546852824 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/VRM.Samples/Motions.meta b/Assets/StreamingAssets/VRM.Samples/Motions.meta deleted file mode 100644 index de93f9f6e..000000000 --- a/Assets/StreamingAssets/VRM.Samples/Motions.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: f1931c9232fa49b47a158ad718088088 -folderAsset: yes -timeCreated: 1546852824 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs index 60c7ce283..69f4401db 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs @@ -5,7 +5,7 @@ namespace UniGLTF { public const int MAJOR = 2; public const int MINOR = 16; - public const int PATCH = 1; - public const string VERSION = "2.16.1"; + public const int PATCH = 0; + public const string VERSION = "2.16.0"; } } diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporterContext.cs b/Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporterContext.cs index f7acb3a12..371768914 100644 --- a/Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporterContext.cs +++ b/Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporterContext.cs @@ -12,7 +12,7 @@ using UnityEditor; namespace UniHumanoid { [Obsolete("use BvhImporterContext")] - public class ImporterContext: BvhImporterContext + public class ImporterContext : BvhImporterContext { } @@ -51,9 +51,14 @@ namespace UniHumanoid } public void Parse(string path) + { + Parse(path, File.ReadAllText(Path, Encoding.UTF8)); + } + + public void Parse(string path, string source) { Path = path; - Source = File.ReadAllText(Path, Encoding.UTF8); + Source = source; Bvh = Bvh.Parse(Source); } diff --git a/Assets/UniGLTF/package.json b/Assets/UniGLTF/package.json index c173e86cf..54925944d 100644 --- a/Assets/UniGLTF/package.json +++ b/Assets/UniGLTF/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.unigltf", - "version": "2.16.1", + "version": "2.16.0", "displayName": "UniGLTF", "description": "GLTF importer and exporter", "unity": "2019.4", @@ -11,6 +11,6 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.80.1" + "com.vrmc.vrmshaders": "0.80.0" } } \ No newline at end of file diff --git a/Assets/VRM/Editor/Format/VRMVersionMenu.cs b/Assets/VRM/Editor/Format/VRMVersionMenu.cs index aa37254fd..79a98339b 100644 --- a/Assets/VRM/Editor/Format/VRMVersionMenu.cs +++ b/Assets/VRM/Editor/Format/VRMVersionMenu.cs @@ -150,7 +150,14 @@ namespace VRM ""dependencies"": {{ ""com.vrmc.vrmshaders"": ""{1}"", ""com.vrmc.unigltf"": ""{0}"" - }} + }}, + ""samples"": [ + {{ + ""displayName"": ""VRM10Viewer"", + ""description"": ""VRM10 runtime loader sample"", + ""path"": ""Samples/VRM10Viewer"" + }} + ] }} "), diff --git a/Assets/VRM/Runtime/Format/VRMVersion.cs b/Assets/VRM/Runtime/Format/VRMVersion.cs index 138b5f7e9..f7528e407 100644 --- a/Assets/VRM/Runtime/Format/VRMVersion.cs +++ b/Assets/VRM/Runtime/Format/VRMVersion.cs @@ -5,7 +5,7 @@ namespace VRM { public const int MAJOR = 0; public const int MINOR = 80; - public const int PATCH = 1; - public const string VERSION = "0.80.1"; + public const int PATCH = 0; + public const string VERSION = "0.80.0"; } } diff --git a/Assets/VRM/Samples/SimpleViewer/SimpleViewer.unity b/Assets/VRM/Samples/SimpleViewer/SimpleViewer.unity index 025a6e844..b9141b6ba 100644 --- a/Assets/VRM/Samples/SimpleViewer/SimpleViewer.unity +++ b/Assets/VRM/Samples/SimpleViewer/SimpleViewer.unity @@ -4671,6 +4671,7 @@ MonoBehaviour: m_target: {fileID: 802105000} Root: {fileID: 124675793} m_reset: {fileID: 1923377808} + m_motion: {fileID: 4900000, guid: 7d2617171adc40b41ac50228f101e178, type: 3} m_texts: m_textModelTitle: {fileID: 1111491925} m_textModelVersion: {fileID: 1045380263} diff --git a/Assets/VRM/Samples/SimpleViewer/ViewerUI.cs b/Assets/VRM/Samples/SimpleViewer/ViewerUI.cs index 4a6cbf777..cf3249d53 100644 --- a/Assets/VRM/Samples/SimpleViewer/ViewerUI.cs +++ b/Assets/VRM/Samples/SimpleViewer/ViewerUI.cs @@ -41,6 +41,9 @@ namespace VRM.SimpleViewer [SerializeField] Button m_reset = default; + [SerializeField] + TextAsset m_motion; + [Serializable] class TextFields { @@ -219,7 +222,10 @@ namespace VRM.SimpleViewer m_reset.onClick.AddListener(OnResetClicked); // load initial bvh - LoadMotion(Application.streamingAssetsPath + "/VRM.Samples/Motions/test.txt"); + if (m_motion != null) + { + LoadMotion(m_motion.text); + } string[] cmds = System.Environment.GetCommandLineArgs(); if (cmds.Length > 1) @@ -230,10 +236,10 @@ namespace VRM.SimpleViewer m_texts.Start(); } - private void LoadMotion(string path) + private void LoadMotion(string source) { var context = new UniHumanoid.BvhImporterContext(); - context.Parse(path); + context.Parse("tmp.bvh", source); context.Load(); SetMotion(context.Root.GetComponent()); } diff --git a/Assets/StreamingAssets/VRM.Samples/Motions/test.txt b/Assets/VRM/Samples/SimpleViewer/test_motion.txt similarity index 100% rename from Assets/StreamingAssets/VRM.Samples/Motions/test.txt rename to Assets/VRM/Samples/SimpleViewer/test_motion.txt diff --git a/Assets/StreamingAssets/VRM.Samples/Motions/test.txt.meta b/Assets/VRM/Samples/SimpleViewer/test_motion.txt.meta similarity index 100% rename from Assets/StreamingAssets/VRM.Samples/Motions/test.txt.meta rename to Assets/VRM/Samples/SimpleViewer/test_motion.txt.meta diff --git a/Assets/VRM/package.json b/Assets/VRM/package.json index e7a375010..1bcaae1c0 100644 --- a/Assets/VRM/package.json +++ b/Assets/VRM/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.univrm", - "version": "0.80.1", + "version": "0.80.0", "displayName": "VRM", "description": "VRM importer", "unity": "2019.4", @@ -14,8 +14,8 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.80.1", - "com.vrmc.unigltf": "2.16.1" + "com.vrmc.vrmshaders": "0.80.0", + "com.vrmc.unigltf": "2.16.0" }, "samples": [ { diff --git a/Assets/VRM10.Samples/Runtime/VRM10.Samples.Runtime.asmdef b/Assets/VRM10.Samples/Runtime/VRM10.Samples.Runtime.asmdef deleted file mode 100644 index 939d79130..000000000 --- a/Assets/VRM10.Samples/Runtime/VRM10.Samples.Runtime.asmdef +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "VRM10.Samples.Runtime", - "references": [ - "GUID:8d76e605759c3f64a957d63ef96ada7c", - "GUID:da3e51d19d51a544fa14d43fee843098", - "GUID:e47c917724578cc43b5506c17a27e9a0", - "GUID:b7aa47b240b57de44a4b2021c143c9bf" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": false, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/VRM10.Samples/Runtime/VRM10.Samples.Runtime.asmdef.meta b/Assets/VRM10.Samples/Runtime/VRM10.Samples.Runtime.asmdef.meta deleted file mode 100644 index 42227ff25..000000000 --- a/Assets/VRM10.Samples/Runtime/VRM10.Samples.Runtime.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 25cb04f3bb4e1844d871da234c1dcc93 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRM10.Samples/Scenes.meta b/Assets/VRM10.Samples/Scenes.meta deleted file mode 100644 index 29a4bc8eb..000000000 --- a/Assets/VRM10.Samples/Scenes.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 258a141ecf4956744876b6b445c2a498 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRM10.Samples.meta b/Assets/VRM10/Samples.meta similarity index 100% rename from Assets/VRM10.Samples.meta rename to Assets/VRM10/Samples.meta diff --git a/Assets/VRM10.Samples/Runtime.meta b/Assets/VRM10/Samples/VRM10Viewer.meta similarity index 100% rename from Assets/VRM10.Samples/Runtime.meta rename to Assets/VRM10/Samples/VRM10Viewer.meta diff --git a/Assets/VRM10.Samples/Runtime/AIUEO.cs b/Assets/VRM10/Samples/VRM10Viewer/AIUEO.cs similarity index 98% rename from Assets/VRM10.Samples/Runtime/AIUEO.cs rename to Assets/VRM10/Samples/VRM10Viewer/AIUEO.cs index 4cf1ad2be..19591ce08 100644 --- a/Assets/VRM10.Samples/Runtime/AIUEO.cs +++ b/Assets/VRM10/Samples/VRM10Viewer/AIUEO.cs @@ -2,7 +2,7 @@ using UnityEngine; -namespace UniVRM10.Samples +namespace UniVRM10.VRM10Viewer { public class AIUEO : MonoBehaviour { diff --git a/Assets/VRM10.Samples/Runtime/AIUEO.cs.meta b/Assets/VRM10/Samples/VRM10Viewer/AIUEO.cs.meta similarity index 100% rename from Assets/VRM10.Samples/Runtime/AIUEO.cs.meta rename to Assets/VRM10/Samples/VRM10Viewer/AIUEO.cs.meta diff --git a/Assets/VRM10.Samples/Runtime/Blinker.cs b/Assets/VRM10/Samples/VRM10Viewer/Blinker.cs similarity index 99% rename from Assets/VRM10.Samples/Runtime/Blinker.cs rename to Assets/VRM10/Samples/VRM10Viewer/Blinker.cs index 31fee3390..0f72b479c 100644 --- a/Assets/VRM10.Samples/Runtime/Blinker.cs +++ b/Assets/VRM10/Samples/VRM10Viewer/Blinker.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.Serialization; -namespace UniVRM10.Samples +namespace UniVRM10.VRM10Viewer { /// /// VRMBlendShapeProxy によるランダムに瞬きするサンプル。 diff --git a/Assets/VRM10.Samples/Runtime/Blinker.cs.meta b/Assets/VRM10/Samples/VRM10Viewer/Blinker.cs.meta similarity index 100% rename from Assets/VRM10.Samples/Runtime/Blinker.cs.meta rename to Assets/VRM10/Samples/VRM10Viewer/Blinker.cs.meta diff --git a/Assets/VRM10.Samples/Runtime/FileDialogForWindows.cs b/Assets/VRM10/Samples/VRM10Viewer/FileDialogForWindows.cs similarity index 99% rename from Assets/VRM10.Samples/Runtime/FileDialogForWindows.cs rename to Assets/VRM10/Samples/VRM10Viewer/FileDialogForWindows.cs index 62968f62a..bcb10afe1 100644 --- a/Assets/VRM10.Samples/Runtime/FileDialogForWindows.cs +++ b/Assets/VRM10/Samples/VRM10Viewer/FileDialogForWindows.cs @@ -6,7 +6,7 @@ using System.Runtime.InteropServices; #endif -namespace UniVRM10.Samples +namespace UniVRM10.VRM10Viewer { public static class FileDialogForWindows { diff --git a/Assets/VRM10.Samples/Runtime/FileDialogForWindows.cs.meta b/Assets/VRM10/Samples/VRM10Viewer/FileDialogForWindows.cs.meta similarity index 100% rename from Assets/VRM10.Samples/Runtime/FileDialogForWindows.cs.meta rename to Assets/VRM10/Samples/VRM10Viewer/FileDialogForWindows.cs.meta diff --git a/Assets/VRM10.Samples/Runtime/TargetMover.cs b/Assets/VRM10/Samples/VRM10Viewer/TargetMover.cs similarity index 96% rename from Assets/VRM10.Samples/Runtime/TargetMover.cs rename to Assets/VRM10/Samples/VRM10Viewer/TargetMover.cs index 41182c6f4..54b4f9b73 100644 --- a/Assets/VRM10.Samples/Runtime/TargetMover.cs +++ b/Assets/VRM10/Samples/VRM10Viewer/TargetMover.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; -namespace UniVRM10.Samples +namespace UniVRM10.VRM10Viewer { public class TargetMover : MonoBehaviour { diff --git a/Assets/VRM10.Samples/Runtime/TargetMover.cs.meta b/Assets/VRM10/Samples/VRM10Viewer/TargetMover.cs.meta similarity index 100% rename from Assets/VRM10.Samples/Runtime/TargetMover.cs.meta rename to Assets/VRM10/Samples/VRM10Viewer/TargetMover.cs.meta diff --git a/Assets/VRM10.Samples/Scenes/VRM10Viewer.unity b/Assets/VRM10/Samples/VRM10Viewer/VRM10Viewer.unity similarity index 100% rename from Assets/VRM10.Samples/Scenes/VRM10Viewer.unity rename to Assets/VRM10/Samples/VRM10Viewer/VRM10Viewer.unity diff --git a/Assets/VRM10.Samples/Scenes/VRM10Viewer.unity.meta b/Assets/VRM10/Samples/VRM10Viewer/VRM10Viewer.unity.meta similarity index 100% rename from Assets/VRM10.Samples/Scenes/VRM10Viewer.unity.meta rename to Assets/VRM10/Samples/VRM10Viewer/VRM10Viewer.unity.meta diff --git a/Assets/VRM10.Samples/Runtime/ViewerUI.cs b/Assets/VRM10/Samples/VRM10Viewer/ViewerUI.cs similarity index 97% rename from Assets/VRM10.Samples/Runtime/ViewerUI.cs rename to Assets/VRM10/Samples/VRM10Viewer/ViewerUI.cs index 7847b2df6..f6575a53d 100644 --- a/Assets/VRM10.Samples/Runtime/ViewerUI.cs +++ b/Assets/VRM10/Samples/VRM10Viewer/ViewerUI.cs @@ -7,7 +7,7 @@ using UnityEngine; using UnityEngine.UI; -namespace UniVRM10.Samples +namespace UniVRM10.VRM10Viewer { public class ViewerUI : MonoBehaviour { @@ -34,6 +34,9 @@ namespace UniVRM10.Samples [SerializeField] GameObject Root = default; + [SerializeField] + TextAsset m_motion; + [Serializable] class TextFields { @@ -212,7 +215,10 @@ namespace UniVRM10.Samples m_open.onClick.AddListener(OnOpenClicked); // load initial bvh - LoadMotion(Application.streamingAssetsPath + "/VRM.Samples/Motions/test.txt"); + if (m_motion != null) + { + LoadMotion(m_motion.text); + } string[] cmds = System.Environment.GetCommandLineArgs(); if (cmds.Length > 1) @@ -223,10 +229,10 @@ namespace UniVRM10.Samples m_texts.Start(); } - private void LoadMotion(string path) + private void LoadMotion(string source) { var context = new UniHumanoid.BvhImporterContext(); - context.Parse(path); + context.Parse("tmp.bvh", source); context.Load(); SetMotion(context.Root.GetComponent()); } diff --git a/Assets/VRM10.Samples/Runtime/ViewerUI.cs.meta b/Assets/VRM10/Samples/VRM10Viewer/ViewerUI.cs.meta similarity index 100% rename from Assets/VRM10.Samples/Runtime/ViewerUI.cs.meta rename to Assets/VRM10/Samples/VRM10Viewer/ViewerUI.cs.meta diff --git a/Assets/VRM10/package.json b/Assets/VRM10/package.json index cc91d7a6e..3c5d0711f 100644 --- a/Assets/VRM10/package.json +++ b/Assets/VRM10/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.univrm1", - "version": "0.80.1", + "version": "0.80.0", "displayName": "VRM-1.0β", "description": "VRM-1.0β importer", "unity": "2019.4", @@ -14,7 +14,14 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.80.1", - "com.vrmc.unigltf": "2.16.1" - } + "com.vrmc.vrmshaders": "0.80.0", + "com.vrmc.unigltf": "2.16.0" + }, + "samples": [ + { + "displayName": "VRM10Viewer", + "description": "VRM10 runtime loader sample", + "path": "Samples/VRM10Viewer" + } + ] } diff --git a/Assets/VRMShaders/package.json b/Assets/VRMShaders/package.json index fa34f112c..d0120b1aa 100644 --- a/Assets/VRMShaders/package.json +++ b/Assets/VRMShaders/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.vrmshaders", - "version": "0.80.1", + "version": "0.80.0", "displayName": "VRM Shaders", "description": "VRM Shaders", "unity": "2019.4",