From 2e11704708242785c47aa78823f81b8a3cd41d64 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Sat, 4 Dec 2021 00:09:27 +0900 Subject: [PATCH 01/10] =?UTF-8?q?Editor=20Import=20=E6=99=82=E3=81=AB?= =?UTF-8?q?=E3=80=812048=20=E3=82=92=E8=B6=85=E3=81=88=E3=82=8B=20Texture?= =?UTF-8?q?=20=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AB=E5=AF=BE?= =?UTF-8?q?=E3=81=99=E3=82=8B=20MaxSize=20=E6=8C=87=E5=AE=9A=E3=81=8C?= =?UTF-8?q?=E3=81=86=E3=81=BE=E3=81=8F=E3=81=84=E3=81=A3=E3=81=A6=E3=81=AA?= =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IO/Editor/Texture/EditorTextureUtility.cs | 50 ++++++++++ .../Texture/EditorTextureUtility.cs.meta | 3 + .../Exporter/EditorTextureSerializer.cs | 43 ++------- .../Importer/TextureImporterConfigurator.cs | 95 +++++-------------- 4 files changed, 86 insertions(+), 105 deletions(-) create mode 100644 Assets/VRMShaders/GLTF/IO/Editor/Texture/EditorTextureUtility.cs create mode 100644 Assets/VRMShaders/GLTF/IO/Editor/Texture/EditorTextureUtility.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Editor/Texture/EditorTextureUtility.cs b/Assets/VRMShaders/GLTF/IO/Editor/Texture/EditorTextureUtility.cs new file mode 100644 index 000000000..45d088afd --- /dev/null +++ b/Assets/VRMShaders/GLTF/IO/Editor/Texture/EditorTextureUtility.cs @@ -0,0 +1,50 @@ +using System; +using System.Reflection; +using UnityEditor; +using UnityEngine; + +namespace VRMShaders +{ + internal static class EditorTextureUtility + { + public static bool TryGetAsEditorTexture2DAsset(Texture texture, out Texture2D texture2D, out TextureImporter assetImporter) + { + texture2D = texture as Texture2D; + if (texture2D != null) + { + var path = AssetDatabase.GetAssetPath(texture2D); + if (!string.IsNullOrEmpty(path)) + { + assetImporter = AssetImporter.GetAtPath(path) as TextureImporter; + if (assetImporter != null) + { + return true; + } + } + } + + texture2D = null; + assetImporter = null; + return false; + } + + public static bool TryGetOriginalTexturePixelSize(TextureImporter textureImporter, out Vector2Int size) + { + // private メソッド TextureImporter.GetWidthAndHeight を無理やり呼ぶ + var getSizeMethod = typeof(TextureImporter).GetMethod("GetWidthAndHeight", BindingFlags.NonPublic | BindingFlags.Instance); + if (textureImporter != null && getSizeMethod != null) + { + var args = new object[2] { 0, 0 }; + getSizeMethod.Invoke(textureImporter, args); + var originalWidth = (int)args[0]; + var originalHeight = (int)args[1]; + + size = new Vector2Int(originalWidth, originalHeight); + return true; + } + + size = default; + return false; + } + } +} \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Editor/Texture/EditorTextureUtility.cs.meta b/Assets/VRMShaders/GLTF/IO/Editor/Texture/EditorTextureUtility.cs.meta new file mode 100644 index 000000000..79ab25f71 --- /dev/null +++ b/Assets/VRMShaders/GLTF/IO/Editor/Texture/EditorTextureUtility.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 20719e2944224be681a607b6db951720 +timeCreated: 1638542710 \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Editor/Texture/Exporter/EditorTextureSerializer.cs b/Assets/VRMShaders/GLTF/IO/Editor/Texture/Exporter/EditorTextureSerializer.cs index 3def724cc..f2ea7b9ff 100644 --- a/Assets/VRMShaders/GLTF/IO/Editor/Texture/Exporter/EditorTextureSerializer.cs +++ b/Assets/VRMShaders/GLTF/IO/Editor/Texture/Exporter/EditorTextureSerializer.cs @@ -24,13 +24,13 @@ namespace VRMShaders public bool CanExportAsEditorAssetFile(Texture texture, ColorSpace exportColorSpace) { // Exists as UnityEditor Texture2D Assets ? - if (!TryGetAsEditorTexture2DAsset(texture, out var texture2D, out var textureImporter)) return false; + if (!EditorTextureUtility.TryGetAsEditorTexture2DAsset(texture, out var texture2D, out var textureImporter)) return false; // Maintain original width/height ? - if (!IsTextureSizeMaintained(texture2D, textureImporter)) return false; + if (!IsTextureSizeMaintained(textureImporter)) return false; // Equals color space ? - if (!IsFileColorSpaceSameWithExportColorSpace(texture2D, textureImporter, exportColorSpace)) return false; + if (!IsFileColorSpaceSameWithExportColorSpace(textureImporter, exportColorSpace)) return false; // Each Texture Importer Type Validation switch (textureImporter.textureType) @@ -94,44 +94,17 @@ namespace VRMShaders return false; } - private bool TryGetAsEditorTexture2DAsset(Texture texture, out Texture2D texture2D, out TextureImporter assetImporter) - { - texture2D = texture as Texture2D; - if (texture2D != null) - { - var path = AssetDatabase.GetAssetPath(texture2D); - if (!string.IsNullOrEmpty(path)) - { - assetImporter = AssetImporter.GetAtPath(path) as TextureImporter; - if (assetImporter != null) - { - return true; - } - } - } - - texture2D = null; - assetImporter = null; - return false; - } - /// /// Texture2D の画像サイズが、オリジナルの画像サイズを維持しているかどうか /// /// TextureImporter の MaxTextureSize 設定によっては、Texture2D の画像サイズはオリジナルも小さくなりうる。 /// - private bool IsTextureSizeMaintained(Texture2D texture, TextureImporter textureImporter) + private bool IsTextureSizeMaintained(TextureImporter textureImporter) { - // private メソッド TextureImporter.GetWidthAndHeight を無理やり呼ぶ - var getSizeMethod = typeof(TextureImporter).GetMethod("GetWidthAndHeight", BindingFlags.NonPublic | BindingFlags.Instance); - if (textureImporter != null && getSizeMethod != null) + if (EditorTextureUtility.TryGetOriginalTexturePixelSize(textureImporter, out var originalSize)) { - var args = new object[2] { 0, 0 }; - getSizeMethod.Invoke(textureImporter, args); - var originalWidth = (int)args[0]; - var originalHeight = (int)args[1]; - var originalSize = Mathf.Max(originalWidth, originalHeight); - if (textureImporter.maxTextureSize >= originalSize) + var originalMaxSize = Mathf.Max(originalSize.x, originalSize.y); + if (textureImporter.maxTextureSize >= originalMaxSize) { return true; } @@ -140,7 +113,7 @@ namespace VRMShaders return false; } - private bool IsFileColorSpaceSameWithExportColorSpace(Texture2D texture, TextureImporter textureImporter, ColorSpace colorSpace) + private bool IsFileColorSpaceSameWithExportColorSpace(TextureImporter textureImporter, ColorSpace colorSpace) { switch (colorSpace) { diff --git a/Assets/VRMShaders/GLTF/IO/Editor/Texture/Importer/TextureImporterConfigurator.cs b/Assets/VRMShaders/GLTF/IO/Editor/Texture/Importer/TextureImporterConfigurator.cs index c6266f698..601e529d9 100644 --- a/Assets/VRMShaders/GLTF/IO/Editor/Texture/Importer/TextureImporterConfigurator.cs +++ b/Assets/VRMShaders/GLTF/IO/Editor/Texture/Importer/TextureImporterConfigurator.cs @@ -8,31 +8,29 @@ namespace VRMShaders { public static class TextureImporterConfigurator { - public static void ConfigureSize(Texture texture, TextureImporter textureImporter) + private static void ConfigureSize(Texture2D texture, TextureImporter textureImporter) { - var maxSize = Mathf.Max(texture.width, texture.height); - textureImporter.maxTextureSize - = maxSize > 4096 ? 8192 : - maxSize > 2048 ? 4096 : - maxSize > 1024 ? 2048 : - maxSize > 512 ? 1024 : + if (!EditorTextureUtility.TryGetOriginalTexturePixelSize(textureImporter, out var originalSize)) return; + + var originalMaxSize = Mathf.Max(originalSize.x, originalSize.y); + textureImporter.maxTextureSize = originalMaxSize > 4096 ? 8192 : + originalMaxSize > 2048 ? 4096 : + originalMaxSize > 1024 ? 2048 : + originalMaxSize > 512 ? 1024 : 512; - textureImporter.SaveAndReimport(); } - public static void ConfigureNormalMap(Texture texture, TextureImporter textureImporter) + private static void ConfigureNormalMap(TextureImporter textureImporter) { textureImporter.textureType = TextureImporterType.NormalMap; - textureImporter.SaveAndReimport(); } - public static void ConfigureLinear(Texture texture, TextureImporter textureImporter) + private static void ConfigureLinear(TextureImporter textureImporter) { textureImporter.sRGBTexture = false; - textureImporter.SaveAndReimport(); } - public static void ConfigureSampler(TextureDescriptor texDesc, TextureImporter textureImporter) + private static void ConfigureSampler(TextureDescriptor texDesc, TextureImporter textureImporter) { textureImporter.mipmapEnabled = texDesc.Sampler.EnableMipMap; textureImporter.filterMode = texDesc.Sampler.FilterMode; @@ -40,72 +38,34 @@ namespace VRMShaders textureImporter.wrapModeV = texDesc.Sampler.WrapModesV; } - class ImporterGetter : IDisposable - { - public TextureImporter Importer; - - ImporterGetter(TextureImporter importer) - { - Importer = importer; - } - - public void Dispose() - { - Importer.SaveAndReimport(); - } - - public static bool TryGetImporter(Texture texture, out ImporterGetter getter) - { - var path = AssetDatabase.GetAssetPath(texture); - if (String.IsNullOrEmpty(path)) - { - Debug.LogWarning($"{path} is not asset"); - } - else - { - if (AssetImporter.GetAtPath(path) is TextureImporter importer) - { - getter = new ImporterGetter(importer); - return true; - } - else - { - Debug.LogWarning($"{path}: fail to get TextureImporter"); - } - } - getter = default; - return false; - } - } - - static void Configure(TextureDescriptor texDesc, Texture external, TextureImporter importer) + private static void Configure(TextureDescriptor texDesc, Texture2D texture, TextureImporter importer) { switch (texDesc.TextureType) { case TextureImportTypes.NormalMap: { - ConfigureSize(external, importer); - ConfigureNormalMap(external, importer); + ConfigureSize(texture, importer); + ConfigureNormalMap(importer); } break; case TextureImportTypes.StandardMap: { - ConfigureSize(external, importer); - ConfigureLinear(external, importer); + ConfigureSize(texture, importer); + ConfigureLinear(importer); } break; case TextureImportTypes.sRGB: { - ConfigureSize(external, importer); + ConfigureSize(texture, importer); } break; case TextureImportTypes.Linear: { - ConfigureSize(external, importer); - ConfigureLinear(external, importer); + ConfigureSize(texture, importer); + ConfigureLinear(importer); } break; @@ -116,18 +76,13 @@ namespace VRMShaders ConfigureSampler(texDesc, importer); } - public static void Configure(TextureDescriptor texDesc, IReadOnlyDictionary ExternalMap) + public static void Configure(TextureDescriptor texDesc, IReadOnlyDictionary externalMap) { - if (ExternalMap.TryGetValue(texDesc.SubAssetKey, out Texture external)) - { - if (ImporterGetter.TryGetImporter(external, out ImporterGetter getter)) - { - using (getter) - { - Configure(texDesc, external, getter.Importer); - } - } - } + if (!externalMap.TryGetValue(texDesc.SubAssetKey, out var externalTexture)) return; + if (!EditorTextureUtility.TryGetAsEditorTexture2DAsset(externalTexture, out var texture2D, out var importer)) return; + + Configure(texDesc, texture2D, importer); + importer.SaveAndReimport(); } } } From c51cf3a7beda766a1141b2cbda56694a0951ea66 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Sat, 4 Dec 2021 00:13:03 +0900 Subject: [PATCH 02/10] =?UTF-8?q?=E8=A6=81=E3=82=89=E3=81=AA=E3=81=84?= =?UTF-8?q?=E5=BC=95=E6=95=B0=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Importer/TextureImporterConfigurator.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/VRMShaders/GLTF/IO/Editor/Texture/Importer/TextureImporterConfigurator.cs b/Assets/VRMShaders/GLTF/IO/Editor/Texture/Importer/TextureImporterConfigurator.cs index 601e529d9..e59fc340b 100644 --- a/Assets/VRMShaders/GLTF/IO/Editor/Texture/Importer/TextureImporterConfigurator.cs +++ b/Assets/VRMShaders/GLTF/IO/Editor/Texture/Importer/TextureImporterConfigurator.cs @@ -8,7 +8,7 @@ namespace VRMShaders { public static class TextureImporterConfigurator { - private static void ConfigureSize(Texture2D texture, TextureImporter textureImporter) + private static void ConfigureSize(TextureImporter textureImporter) { if (!EditorTextureUtility.TryGetOriginalTexturePixelSize(textureImporter, out var originalSize)) return; @@ -38,33 +38,33 @@ namespace VRMShaders textureImporter.wrapModeV = texDesc.Sampler.WrapModesV; } - private static void Configure(TextureDescriptor texDesc, Texture2D texture, TextureImporter importer) + private static void Configure(TextureDescriptor texDesc, TextureImporter importer) { switch (texDesc.TextureType) { case TextureImportTypes.NormalMap: { - ConfigureSize(texture, importer); + ConfigureSize(importer); ConfigureNormalMap(importer); } break; case TextureImportTypes.StandardMap: { - ConfigureSize(texture, importer); + ConfigureSize(importer); ConfigureLinear(importer); } break; case TextureImportTypes.sRGB: { - ConfigureSize(texture, importer); + ConfigureSize(importer); } break; case TextureImportTypes.Linear: { - ConfigureSize(texture, importer); + ConfigureSize(importer); ConfigureLinear(importer); } break; @@ -81,7 +81,7 @@ namespace VRMShaders if (!externalMap.TryGetValue(texDesc.SubAssetKey, out var externalTexture)) return; if (!EditorTextureUtility.TryGetAsEditorTexture2DAsset(externalTexture, out var texture2D, out var importer)) return; - Configure(texDesc, texture2D, importer); + Configure(texDesc, importer); importer.SaveAndReimport(); } } From 6fed2d0f2a725f167329acd7b9ba1aff05270329 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Sat, 4 Dec 2021 02:00:04 +0900 Subject: [PATCH 03/10] =?UTF-8?q?ITextureSerializer=20=E3=81=AB=E3=80=81?= =?UTF-8?q?=E5=87=BA=E5=8A=9B=E4=BA=88=E5=AE=9A=E3=82=A2=E3=82=BB=E3=83=83?= =?UTF-8?q?=E3=83=88=E3=81=AB=E5=AF=BE=E3=81=99=E3=82=8B=E4=BA=8B=E5=89=8D?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=AE=E5=AE=9A=E7=BE=A9=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Exporter/EditorTextureSerializer.cs | 17 ++++++++++--- .../Texture/Exporter/ITextureSerializer.cs | 7 ++++++ .../Exporter/RuntimeTextureSerializer.cs | 6 ++++- .../Texture/Exporter/TextureExporter.cs | 25 ++++++++++++++----- 4 files changed, 45 insertions(+), 10 deletions(-) diff --git a/Assets/VRMShaders/GLTF/IO/Editor/Texture/Exporter/EditorTextureSerializer.cs b/Assets/VRMShaders/GLTF/IO/Editor/Texture/Exporter/EditorTextureSerializer.cs index f2ea7b9ff..ee0932873 100644 --- a/Assets/VRMShaders/GLTF/IO/Editor/Texture/Exporter/EditorTextureSerializer.cs +++ b/Assets/VRMShaders/GLTF/IO/Editor/Texture/Exporter/EditorTextureSerializer.cs @@ -1,6 +1,5 @@ using System; using System.IO; -using System.Reflection; using UnityEditor; using UnityEngine; @@ -8,7 +7,7 @@ namespace VRMShaders { public sealed class EditorTextureSerializer : ITextureSerializer { - private readonly RuntimeTextureSerializer m_runtimeSerializer = new RuntimeTextureSerializer(); + private readonly RuntimeTextureSerializer _runtimeSerializer = new RuntimeTextureSerializer(); /// /// Texture をオリジナルのテクスチャアセット(png/jpg)ファイルのバイト列そのまま出力してよいかどうか判断する。 @@ -56,7 +55,19 @@ namespace VRMShaders return (bytes, mime); } - return m_runtimeSerializer.ExportBytesWithMime(texture, exportColorSpace); + return _runtimeSerializer.ExportBytesWithMime(texture, exportColorSpace); + } + + /// + /// 出力に使用したいテクスチャに対して、Unity のエディタアセットとしての圧縮設定を OFF にする。 + /// + public void ModifyTextureAssetBeforeExporting(Texture texture) + { + if (EditorTextureUtility.TryGetAsEditorTexture2DAsset(texture, out var texture2D, out var assetImporter)) + { + assetImporter.textureCompression = TextureImporterCompression.Uncompressed; + assetImporter.SaveAndReimport(); + } } /// diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureSerializer.cs b/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureSerializer.cs index 8da1bf82b..c14118b8c 100644 --- a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureSerializer.cs +++ b/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureSerializer.cs @@ -22,5 +22,12 @@ namespace VRMShaders /// 具体的には Texture2D をコピーする際に、コピー先の Texture2D の色空間を決定するために使用する。 /// (byte[] bytes, string mime) ExportBytesWithMime(Texture2D texture, ColorSpace exportColorSpace); + + /// + /// エクスポートに使用したい Texture に対して、事前準備を行う。 + /// + /// たとえば UnityEditor においては、Texture Asset の圧縮設定を OFF にしたりしたい。 + /// + void ModifyTextureAssetBeforeExporting(Texture texture); } } diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/RuntimeTextureSerializer.cs b/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/RuntimeTextureSerializer.cs index 9bbd12e3f..c5894a8c4 100644 --- a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/RuntimeTextureSerializer.cs +++ b/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/RuntimeTextureSerializer.cs @@ -1,6 +1,5 @@ using System; using UnityEngine; -using VRMShaders; namespace VRMShaders { @@ -39,6 +38,11 @@ namespace VRMShaders } } + public void ModifyTextureAssetBeforeExporting(Texture texture) + { + // NOTE: Do nothing. + } + private static (byte[] bytes, string mime) CopyTextureAndGetBytesWithMime(Texture2D texture, ColorSpace colorSpace) { var needsAlpha = texture.format != TextureFormat.RGB24; diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExporter.cs b/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExporter.cs index 058bd8d14..3b4229dc6 100644 --- a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExporter.cs +++ b/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExporter.cs @@ -10,12 +10,12 @@ namespace VRMShaders /// public sealed class TextureExporter : IDisposable, ITextureExporter { - private readonly ITextureSerializer m_textureSerializer; + private readonly ITextureSerializer _textureSerializer; private readonly List _exportingList = new List(); public TextureExporter(ITextureSerializer textureSerializer) { - m_textureSerializer = textureSerializer; + _textureSerializer = textureSerializer; } public void Dispose() @@ -94,7 +94,13 @@ namespace VRMShaders var param = new TextureExportParam(TextureExportTypes.OcclusionMetallicRoughness, ColorSpace.Linear, metallicSmoothTexture, occlusionTexture, smoothness, false, - () => OcclusionMetallicRoughnessConverter.Export(metallicSmoothTexture, smoothness, occlusionTexture)); + () => + { + _textureSerializer.ModifyTextureAssetBeforeExporting(metallicSmoothTexture); + _textureSerializer.ModifyTextureAssetBeforeExporting(occlusionTexture); + return OcclusionMetallicRoughnessConverter.Export(metallicSmoothTexture, smoothness, + occlusionTexture); + }); if (TryGetExistsParam(param, out var existsIdx)) { // Return cacehd @@ -116,7 +122,11 @@ namespace VRMShaders } var param = new TextureExportParam(TextureExportTypes.Normal, ColorSpace.Linear, src, default, default, - false, () => NormalConverter.Export(src)); + false, () => + { + _textureSerializer.ModifyTextureAssetBeforeExporting(src); + return NormalConverter.Export(src); + }); if (TryGetExistsParam(param, out var existsIdx)) { // Return cached; @@ -136,12 +146,15 @@ namespace VRMShaders { // get Texture2D var texture2D = src as Texture2D; - if (m_textureSerializer.CanExportAsEditorAssetFile(texture2D, exportColorSpace)) + if (_textureSerializer.CanExportAsEditorAssetFile(texture2D, exportColorSpace)) { - // do nothing + // NOTE: 生のファイルとして出力可能な場合、何もせずそのまま Texture2D を渡す。 + // ただし、この場合のみ圧縮設定をオフにしなかった場合、挙動としてバグっぽく見えるので、これもオフにする。 + _textureSerializer.ModifyTextureAssetBeforeExporting(src); } else { + _textureSerializer.ModifyTextureAssetBeforeExporting(src); texture2D = TextureConverter.CopyTexture(src, exportColorSpace, needsAlpha, null); } return texture2D; From e095052c8c9b08a0d8b0a88dc88c3ecc753d7689 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Sat, 4 Dec 2021 02:23:47 +0900 Subject: [PATCH 04/10] comment --- .../Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs index 09ed4ad2b..603a94c2c 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs @@ -17,10 +17,10 @@ namespace UniGLTF /// /// を更新し、textures の index を返す /// + /// もっとも根本の Exporter クラスのみが呼び出すべきである。 + /// 他の拡張機能などが呼び出すべきではない。 + /// /// - /// - /// - /// /// gltf texture index public static int PushGltfTexture(ExportingGltfData data, Texture2D texture, ColorSpace textureColorSpace, ITextureSerializer textureSerializer) { From 46c6d94e57b2768dd9425245fd6268a1be377298 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Sat, 4 Dec 2021 02:24:07 +0900 Subject: [PATCH 05/10] =?UTF-8?q?=E6=98=94=E3=81=AE=E3=82=B3=E3=83=BC?= =?UTF-8?q?=E3=83=89=E3=81=8C=E5=8F=A4=E3=81=84=E5=91=BC=E3=81=B3=E5=87=BA?= =?UTF-8?q?=E3=81=97=E6=96=B9=E3=82=92=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F?= =?UTF-8?q?=E3=81=AE=E3=81=A7=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/VRM/Runtime/IO/VRMExporter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/VRM/Runtime/IO/VRMExporter.cs b/Assets/VRM/Runtime/IO/VRMExporter.cs index 741d31ad9..47178ed03 100644 --- a/Assets/VRM/Runtime/IO/VRMExporter.cs +++ b/Assets/VRM/Runtime/IO/VRMExporter.cs @@ -118,7 +118,7 @@ namespace VRM VRM.meta.title = meta.Title; if (meta.Thumbnail != null) { - VRM.meta.texture = GltfTextureExporter.PushGltfTexture(_data, meta.Thumbnail, ColorSpace.sRGB, textureSerializer); + VRM.meta.texture = TextureExporter.RegisterExportingAsSRgb(meta.Thumbnail, needsAlpha: true); } VRM.meta.licenseType = meta.LicenseType; From ad0b043c905531cfa8004cef5a47e2cc163ff81d Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Sat, 4 Dec 2021 02:43:18 +0900 Subject: [PATCH 06/10] =?UTF-8?q?=E3=82=A2=E3=82=AF=E3=82=BB=E3=82=B9?= =?UTF-8?q?=E6=A8=A9=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs index 11552c84a..dcb9c439d 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs @@ -46,8 +46,6 @@ namespace UniGLTF private set; } - public ITextureExporter TextureExporter => m_textureExporter; - protected virtual IMaterialExporter CreateMaterialExporter() { return new MaterialExporter(); @@ -65,7 +63,7 @@ namespace UniGLTF } } - TextureExporter m_textureExporter; + protected TextureExporter TextureExporter { get; private set; } GltfExportSettings m_settings; @@ -236,7 +234,7 @@ namespace UniGLTF #region Materials and Textures Materials = uniqueUnityMeshes.GetUniqueMaterials().ToList(); - m_textureExporter = new TextureExporter(textureSerializer); + TextureExporter = new TextureExporter(textureSerializer); var materialExporter = CreateMaterialExporter(); _gltf.materials = Materials.Select(x => materialExporter.ExportMaterial(x, TextureExporter, m_settings)).ToList(); From 04254d857406050bc4ca2d258782dd64815dadc9 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Sat, 4 Dec 2021 02:43:47 +0900 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=BC=8F=E3=82=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs index dcb9c439d..8cc415d32 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs @@ -376,7 +376,7 @@ namespace UniGLTF ExportExtensions(textureSerializer); // Extension で Texture が増える場合があるので最後に呼ぶ - var exported = m_textureExporter.Export(); + var exported = TextureExporter.Export(); for (var exportedTextureIdx = 0; exportedTextureIdx < exported.Count; ++exportedTextureIdx) { var (unityTexture, colorSpace) = exported[exportedTextureIdx]; From 8b484ac86e08504fa1897bacf3ed5ea736dc4c72 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Sat, 4 Dec 2021 02:46:21 +0900 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs index 8cc415d32..4f8707b7b 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs @@ -63,7 +63,8 @@ namespace UniGLTF } } - protected TextureExporter TextureExporter { get; private set; } + protected ITextureExporter TextureExporter => _textureExporter; + private TextureExporter _textureExporter; GltfExportSettings m_settings; @@ -234,7 +235,7 @@ namespace UniGLTF #region Materials and Textures Materials = uniqueUnityMeshes.GetUniqueMaterials().ToList(); - TextureExporter = new TextureExporter(textureSerializer); + _textureExporter = new TextureExporter(textureSerializer); var materialExporter = CreateMaterialExporter(); _gltf.materials = Materials.Select(x => materialExporter.ExportMaterial(x, TextureExporter, m_settings)).ToList(); @@ -376,7 +377,7 @@ namespace UniGLTF ExportExtensions(textureSerializer); // Extension で Texture が増える場合があるので最後に呼ぶ - var exported = TextureExporter.Export(); + var exported = _textureExporter.Export(); for (var exportedTextureIdx = 0; exportedTextureIdx < exported.Count; ++exportedTextureIdx) { var (unityTexture, colorSpace) = exported[exportedTextureIdx]; From 29545202d31627aae2e46e859d2f994fdbe0b666 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 6 Dec 2021 16:03:55 +0900 Subject: [PATCH 09/10] =?UTF-8?q?UniHumanoid=20=E3=81=AE=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=AB=E3=83=80=E6=A7=8B=E6=88=90=E3=82=92=E6=95=B4=E7=90=86?= =?UTF-8?q?=E3=81=97=E3=80=81=E4=B8=8D=E8=A6=81=E3=81=AB=E3=81=AA=E3=81=A3?= =?UTF-8?q?=E3=81=9F=20asmdef=20=E3=82=92=E5=89=8A=E9=99=A4=E3=81=97?= =?UTF-8?q?=E3=81=9F=E3=80=82Resource/test=5Fmotion.txt=20=E3=81=AE?= =?UTF-8?q?=E5=A0=B4=E6=89=80=E3=81=8C=E5=A4=89=E6=9B=B4=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=82=8B=E3=81=AE=E3=81=AB=E6=B3=A8=E6=84=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Assets/UniHumanoid/Scripts => Assets/UniGLTF/Runtime/Humanoid * Assets/UniHumanoid/Editor => Assets/UniGLTF/Editor/Humanoid * Assets/UniHumanoid/Editor/Tests => Assets/UniGLTF/Tests/Humanoid * => docs/unihumanoid/index.md --- .gitignore | 3 +- .../doc.meta => Editor/UniHumanoid.meta} | 4 +- .../UniHumanoid}/BoneMappingEditor.cs | 0 .../UniHumanoid}/BoneMappingEditor.cs.meta | 0 .../UniHumanoid}/HumanPoseTransferEditor.cs | 0 .../HumanPoseTransferEditor.cs.meta | 0 .../UniHumanoid}/HumanoidEditor.cs | 0 .../UniHumanoid}/HumanoidEditor.cs.meta | 0 .../UniHumanoid}/MuscleInspectorEditor.cs | 0 .../MuscleInspectorEditor.cs.meta | 0 .../UniHumanoid}/UniHumanoid.Editor.asmdef | 0 .../UniHumanoid.Editor.asmdef.meta | 0 .../UniHumanoid}/bvhAssetPostprocessor.cs | 0 .../bvhAssetPostprocessor.cs.meta | 0 .../{UniHumanoid => Runtime}/Resources.meta | 0 .../Resources/T-Pose.pose.asset | 0 .../Resources/T-Pose.pose.asset.meta | 0 .../Resources/test_motion.txt | 0 .../Resources/test_motion.txt.meta | 0 Assets/UniGLTF/{ => Runtime}/UniHumanoid.meta | 5 +- .../UniHumanoid}/AnimationClipUtility.cs | 0 .../UniHumanoid}/AnimationClipUtility.cs.meta | 0 .../UniHumanoid}/AvatarDescription.cs | 0 .../UniHumanoid}/AvatarDescription.cs.meta | 0 .../UniHumanoid}/BoneGizmoDrawer.cs | 0 .../UniHumanoid}/BoneGizmoDrawer.cs.meta | 0 .../UniHumanoid}/BoneMapping.cs | 0 .../UniHumanoid}/BoneMapping.cs.meta | 0 .../UniHumanoid}/BvhBone.cs | 0 .../UniHumanoid}/BvhBone.cs.meta | 0 .../UniHumanoid}/Extensions.meta | 0 .../UniHumanoid}/Extensions/EnumExtensions.cs | 0 .../Extensions/EnumExtensions.cs.meta | 0 .../UniHumanoid}/Format.meta | 0 .../UniHumanoid}/Format/Bvh.cs | 0 .../UniHumanoid}/Format/Bvh.cs.meta | 0 .../UniHumanoid}/HumanPoseClip.cs | 0 .../UniHumanoid}/HumanPoseClip.cs.meta | 0 .../UniHumanoid}/HumanPoseTransfer.cs | 0 .../UniHumanoid}/HumanPoseTransfer.cs.meta | 0 .../UniHumanoid}/Humanoid.cs | 0 .../UniHumanoid}/Humanoid.cs.meta | 0 .../UniHumanoid}/HumanoidLoader.cs | 0 .../UniHumanoid}/HumanoidLoader.cs.meta | 0 .../Scripts => Runtime/UniHumanoid}/IBone.cs | 0 .../UniHumanoid}/IBone.cs.meta | 0 .../Scripts => Runtime/UniHumanoid}/IO.meta | 0 .../UniHumanoid}/IO/BvhAnimationClip.cs | 0 .../UniHumanoid}/IO/BvhAnimationClip.cs.meta | 0 .../UniHumanoid}/IO/BvhImporter.cs | 0 .../UniHumanoid}/IO/BvhImporter.cs.meta | 0 .../UniHumanoid}/IO/BvhImporterContext.cs | 0 .../IO/BvhImporterContext.cs.meta | 0 .../UniHumanoid}/IO/Extensions.meta | 0 .../IO/Extensions/BvhExtensions.cs | 0 .../IO/Extensions/BvhExtensions.cs.meta | 0 .../IO/Extensions/UnityExtensions.cs | 0 .../IO/Extensions/UnityExtensions.cs.meta | 0 .../UniHumanoid}/MuscleDebug.cs | 0 .../UniHumanoid}/MuscleDebug.cs.meta | 0 .../UniHumanoid}/MuscleInspector.cs | 0 .../UniHumanoid}/MuscleInspector.cs.meta | 0 .../UniHumanoid/PoseModifier.meta | 0 .../UniHumanoid/PoseModifier/HandPose.cs | 0 .../UniHumanoid/PoseModifier/HandPose.cs.meta | 0 .../UniHumanoid/PoseModifier/HandRig.cs | 0 .../UniHumanoid/PoseModifier/HandRig.cs.meta | 0 .../UniHumanoid/PoseModifier/IPoseModifier.cs | 0 .../PoseModifier/IPoseModifier.cs.meta | 0 .../UniHumanoid}/Skeleton.cs | 0 .../UniHumanoid}/Skeleton.cs.meta | 0 .../UniHumanoid}/SkeletonEstimator.cs | 0 .../UniHumanoid}/SkeletonEstimator.cs.meta | 0 .../UniHumanoid}/SkeletonMeshUtility.cs | 0 .../UniHumanoid}/SkeletonMeshUtility.cs.meta | 0 .../UniHumanoid/UniHumanoid.asmdef | 0 .../UniHumanoid/UniHumanoid.asmdef.meta | 0 .../Scenes.meta => Samples/UniHumanoid.meta} | 0 .../UniHumanoid}/HumanBuilderTest.cs | 0 .../UniHumanoid}/HumanBuilderTest.cs.meta | 0 .../UniHumanoid}/PoseTransfer.unity | 0 .../UniHumanoid}/PoseTransfer.unity.meta | 0 .../UniHumanoid}/RuntimeBvhLoader.cs | 0 .../UniHumanoid}/RuntimeBvhLoader.cs.meta | 0 .../UniHumanoid}/RuntimeBvhLoader.unity | 0 .../UniHumanoid}/RuntimeBvhLoader.unity.meta | 0 .../Scenes => Samples/UniHumanoid}/target.mat | 0 .../UniHumanoid}/target.mat.meta | 0 .../Tests.meta => Tests/UniHumanoid.meta} | 5 +- .../UniHumanoid}/BvhLoaderTests.cs | 0 .../UniHumanoid}/BvhLoaderTests.cs.meta | 0 .../UniHumanoid.Editor.Tests.asmdef | 0 .../UniHumanoid.Editor.Tests.asmdef.meta | 0 Assets/UniGLTF/UniHumanoid/Editor.meta | 9 -- Assets/UniGLTF/UniHumanoid/LICENSE.md | 21 ----- Assets/UniGLTF/UniHumanoid/LICENSE.md.meta | 8 -- Assets/UniGLTF/UniHumanoid/README.md.meta | 8 -- Assets/UniGLTF/UniHumanoid/Scripts.meta | 9 -- .../UniHumanoid/doc/BoneMappingGizmo.png.meta | 77 ------------------ .../doc/BoneMappingInspector.png.meta | 77 ------------------ .../UniGLTF/UniHumanoid/doc/assets.png.meta | 68 ---------------- .../UniHumanoid/doc/bvh_bonemapping.png.meta | 77 ------------------ .../UniHumanoid/doc/bvh_gameobject.png.meta | 77 ------------------ .../UniHumanoid/doc/bvh_prefab.png.meta | 77 ------------------ .../UniGLTF/UniHumanoid/doc/humanoid.gif.meta | 77 ------------------ .../doc/humanpose_transfer.png.meta | 77 ------------------ .../doc/humanpose_transfer_inspector.png.meta | 77 ------------------ Assets/UniGLTF/UniHumanoid/doc/mesh.png.meta | 68 ---------------- docs/index.md | 1 + .../unihumanoid}/BoneMappingGizmo.png | Bin .../unihumanoid}/BoneMappingInspector.png | Bin .../doc => docs/unihumanoid}/assets.png | Bin .../unihumanoid}/bvh_bonemapping.png | Bin .../unihumanoid}/bvh_gameobject.png | Bin .../doc => docs/unihumanoid}/bvh_prefab.png | Bin .../doc => docs/unihumanoid}/humanoid.gif | Bin .../unihumanoid}/humanpose_transfer.png | Bin .../humanpose_transfer_inspector.png | Bin .../README.md => docs/unihumanoid/index.md | 29 +++---- .../doc => docs/unihumanoid}/mesh.png | Bin 120 files changed, 20 insertions(+), 834 deletions(-) rename Assets/UniGLTF/{UniHumanoid/doc.meta => Editor/UniHumanoid.meta} (62%) rename Assets/UniGLTF/{UniHumanoid/Editor => Editor/UniHumanoid}/BoneMappingEditor.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Editor => Editor/UniHumanoid}/BoneMappingEditor.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Editor => Editor/UniHumanoid}/HumanPoseTransferEditor.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Editor => Editor/UniHumanoid}/HumanPoseTransferEditor.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Editor => Editor/UniHumanoid}/HumanoidEditor.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Editor => Editor/UniHumanoid}/HumanoidEditor.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Editor => Editor/UniHumanoid}/MuscleInspectorEditor.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Editor => Editor/UniHumanoid}/MuscleInspectorEditor.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Editor => Editor/UniHumanoid}/UniHumanoid.Editor.asmdef (100%) rename Assets/UniGLTF/{UniHumanoid/Editor => Editor/UniHumanoid}/UniHumanoid.Editor.asmdef.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Editor => Editor/UniHumanoid}/bvhAssetPostprocessor.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Editor => Editor/UniHumanoid}/bvhAssetPostprocessor.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid => Runtime}/Resources.meta (100%) rename Assets/UniGLTF/{UniHumanoid => Runtime}/Resources/T-Pose.pose.asset (100%) rename Assets/UniGLTF/{UniHumanoid => Runtime}/Resources/T-Pose.pose.asset.meta (100%) rename Assets/UniGLTF/{UniHumanoid => Runtime}/Resources/test_motion.txt (100%) rename Assets/UniGLTF/{UniHumanoid => Runtime}/Resources/test_motion.txt.meta (100%) rename Assets/UniGLTF/{ => Runtime}/UniHumanoid.meta (58%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/AnimationClipUtility.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/AnimationClipUtility.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/AvatarDescription.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/AvatarDescription.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/BoneGizmoDrawer.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/BoneGizmoDrawer.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/BoneMapping.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/BoneMapping.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/BvhBone.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/BvhBone.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/Extensions.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/Extensions/EnumExtensions.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/Extensions/EnumExtensions.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/Format.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/Format/Bvh.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/Format/Bvh.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/HumanPoseClip.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/HumanPoseClip.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/HumanPoseTransfer.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/HumanPoseTransfer.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/Humanoid.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/Humanoid.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/HumanoidLoader.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/HumanoidLoader.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/IBone.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/IBone.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/IO.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/IO/BvhAnimationClip.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/IO/BvhAnimationClip.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/IO/BvhImporter.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/IO/BvhImporter.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/IO/BvhImporterContext.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/IO/BvhImporterContext.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/IO/Extensions.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/IO/Extensions/BvhExtensions.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/IO/Extensions/BvhExtensions.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/IO/Extensions/UnityExtensions.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/IO/Extensions/UnityExtensions.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/MuscleDebug.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/MuscleDebug.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/MuscleInspector.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/MuscleInspector.cs.meta (100%) rename Assets/UniGLTF/{ => Runtime}/UniHumanoid/PoseModifier.meta (100%) rename Assets/UniGLTF/{ => Runtime}/UniHumanoid/PoseModifier/HandPose.cs (100%) rename Assets/UniGLTF/{ => Runtime}/UniHumanoid/PoseModifier/HandPose.cs.meta (100%) rename Assets/UniGLTF/{ => Runtime}/UniHumanoid/PoseModifier/HandRig.cs (100%) rename Assets/UniGLTF/{ => Runtime}/UniHumanoid/PoseModifier/HandRig.cs.meta (100%) rename Assets/UniGLTF/{ => Runtime}/UniHumanoid/PoseModifier/IPoseModifier.cs (100%) rename Assets/UniGLTF/{ => Runtime}/UniHumanoid/PoseModifier/IPoseModifier.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/Skeleton.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/Skeleton.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/SkeletonEstimator.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/SkeletonEstimator.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/SkeletonMeshUtility.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scripts => Runtime/UniHumanoid}/SkeletonMeshUtility.cs.meta (100%) rename Assets/UniGLTF/{ => Runtime}/UniHumanoid/UniHumanoid.asmdef (100%) rename Assets/UniGLTF/{ => Runtime}/UniHumanoid/UniHumanoid.asmdef.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scenes.meta => Samples/UniHumanoid.meta} (100%) rename Assets/UniGLTF/{UniHumanoid/Scenes => Samples/UniHumanoid}/HumanBuilderTest.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scenes => Samples/UniHumanoid}/HumanBuilderTest.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scenes => Samples/UniHumanoid}/PoseTransfer.unity (100%) rename Assets/UniGLTF/{UniHumanoid/Scenes => Samples/UniHumanoid}/PoseTransfer.unity.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scenes => Samples/UniHumanoid}/RuntimeBvhLoader.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Scenes => Samples/UniHumanoid}/RuntimeBvhLoader.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scenes => Samples/UniHumanoid}/RuntimeBvhLoader.unity (100%) rename Assets/UniGLTF/{UniHumanoid/Scenes => Samples/UniHumanoid}/RuntimeBvhLoader.unity.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Scenes => Samples/UniHumanoid}/target.mat (100%) rename Assets/UniGLTF/{UniHumanoid/Scenes => Samples/UniHumanoid}/target.mat.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Editor/Tests.meta => Tests/UniHumanoid.meta} (57%) rename Assets/UniGLTF/{UniHumanoid/Editor/Tests => Tests/UniHumanoid}/BvhLoaderTests.cs (100%) rename Assets/UniGLTF/{UniHumanoid/Editor/Tests => Tests/UniHumanoid}/BvhLoaderTests.cs.meta (100%) rename Assets/UniGLTF/{UniHumanoid/Editor/Tests => Tests/UniHumanoid}/UniHumanoid.Editor.Tests.asmdef (100%) rename Assets/UniGLTF/{UniHumanoid/Editor/Tests => Tests/UniHumanoid}/UniHumanoid.Editor.Tests.asmdef.meta (100%) delete mode 100644 Assets/UniGLTF/UniHumanoid/Editor.meta delete mode 100644 Assets/UniGLTF/UniHumanoid/LICENSE.md delete mode 100644 Assets/UniGLTF/UniHumanoid/LICENSE.md.meta delete mode 100644 Assets/UniGLTF/UniHumanoid/README.md.meta delete mode 100644 Assets/UniGLTF/UniHumanoid/Scripts.meta delete mode 100644 Assets/UniGLTF/UniHumanoid/doc/BoneMappingGizmo.png.meta delete mode 100644 Assets/UniGLTF/UniHumanoid/doc/BoneMappingInspector.png.meta delete mode 100644 Assets/UniGLTF/UniHumanoid/doc/assets.png.meta delete mode 100644 Assets/UniGLTF/UniHumanoid/doc/bvh_bonemapping.png.meta delete mode 100644 Assets/UniGLTF/UniHumanoid/doc/bvh_gameobject.png.meta delete mode 100644 Assets/UniGLTF/UniHumanoid/doc/bvh_prefab.png.meta delete mode 100644 Assets/UniGLTF/UniHumanoid/doc/humanoid.gif.meta delete mode 100644 Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer.png.meta delete mode 100644 Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer_inspector.png.meta delete mode 100644 Assets/UniGLTF/UniHumanoid/doc/mesh.png.meta rename {Assets/UniGLTF/UniHumanoid/doc => docs/unihumanoid}/BoneMappingGizmo.png (100%) rename {Assets/UniGLTF/UniHumanoid/doc => docs/unihumanoid}/BoneMappingInspector.png (100%) rename {Assets/UniGLTF/UniHumanoid/doc => docs/unihumanoid}/assets.png (100%) rename {Assets/UniGLTF/UniHumanoid/doc => docs/unihumanoid}/bvh_bonemapping.png (100%) rename {Assets/UniGLTF/UniHumanoid/doc => docs/unihumanoid}/bvh_gameobject.png (100%) rename {Assets/UniGLTF/UniHumanoid/doc => docs/unihumanoid}/bvh_prefab.png (100%) rename {Assets/UniGLTF/UniHumanoid/doc => docs/unihumanoid}/humanoid.gif (100%) rename {Assets/UniGLTF/UniHumanoid/doc => docs/unihumanoid}/humanpose_transfer.png (100%) rename {Assets/UniGLTF/UniHumanoid/doc => docs/unihumanoid}/humanpose_transfer_inspector.png (100%) rename Assets/UniGLTF/UniHumanoid/README.md => docs/unihumanoid/index.md (74%) rename {Assets/UniGLTF/UniHumanoid/doc => docs/unihumanoid}/mesh.png (100%) diff --git a/.gitignore b/.gitignore index 85ec28ccf..678bfa122 100644 --- a/.gitignore +++ b/.gitignore @@ -55,4 +55,5 @@ Assets/Private.meta # sphinx build public -*.pyc \ No newline at end of file +*.pyc +/ProjectSettings/BurstAotSettings_StandaloneWindows.json diff --git a/Assets/UniGLTF/UniHumanoid/doc.meta b/Assets/UniGLTF/Editor/UniHumanoid.meta similarity index 62% rename from Assets/UniGLTF/UniHumanoid/doc.meta rename to Assets/UniGLTF/Editor/UniHumanoid.meta index 50c76b7f7..aa7f73e46 100644 --- a/Assets/UniGLTF/UniHumanoid/doc.meta +++ b/Assets/UniGLTF/Editor/UniHumanoid.meta @@ -1,8 +1,6 @@ fileFormatVersion: 2 -guid: bd16aca6bf957944396bb28ff3678f05 +guid: 87fb37c3af5e8f941b873faeabf6a5f8 folderAsset: yes -timeCreated: 1517663952 -licenseType: Free DefaultImporter: externalObjects: {} userData: diff --git a/Assets/UniGLTF/UniHumanoid/Editor/BoneMappingEditor.cs b/Assets/UniGLTF/Editor/UniHumanoid/BoneMappingEditor.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Editor/BoneMappingEditor.cs rename to Assets/UniGLTF/Editor/UniHumanoid/BoneMappingEditor.cs diff --git a/Assets/UniGLTF/UniHumanoid/Editor/BoneMappingEditor.cs.meta b/Assets/UniGLTF/Editor/UniHumanoid/BoneMappingEditor.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Editor/BoneMappingEditor.cs.meta rename to Assets/UniGLTF/Editor/UniHumanoid/BoneMappingEditor.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Editor/HumanPoseTransferEditor.cs b/Assets/UniGLTF/Editor/UniHumanoid/HumanPoseTransferEditor.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Editor/HumanPoseTransferEditor.cs rename to Assets/UniGLTF/Editor/UniHumanoid/HumanPoseTransferEditor.cs diff --git a/Assets/UniGLTF/UniHumanoid/Editor/HumanPoseTransferEditor.cs.meta b/Assets/UniGLTF/Editor/UniHumanoid/HumanPoseTransferEditor.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Editor/HumanPoseTransferEditor.cs.meta rename to Assets/UniGLTF/Editor/UniHumanoid/HumanPoseTransferEditor.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Editor/HumanoidEditor.cs b/Assets/UniGLTF/Editor/UniHumanoid/HumanoidEditor.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Editor/HumanoidEditor.cs rename to Assets/UniGLTF/Editor/UniHumanoid/HumanoidEditor.cs diff --git a/Assets/UniGLTF/UniHumanoid/Editor/HumanoidEditor.cs.meta b/Assets/UniGLTF/Editor/UniHumanoid/HumanoidEditor.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Editor/HumanoidEditor.cs.meta rename to Assets/UniGLTF/Editor/UniHumanoid/HumanoidEditor.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Editor/MuscleInspectorEditor.cs b/Assets/UniGLTF/Editor/UniHumanoid/MuscleInspectorEditor.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Editor/MuscleInspectorEditor.cs rename to Assets/UniGLTF/Editor/UniHumanoid/MuscleInspectorEditor.cs diff --git a/Assets/UniGLTF/UniHumanoid/Editor/MuscleInspectorEditor.cs.meta b/Assets/UniGLTF/Editor/UniHumanoid/MuscleInspectorEditor.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Editor/MuscleInspectorEditor.cs.meta rename to Assets/UniGLTF/Editor/UniHumanoid/MuscleInspectorEditor.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Editor/UniHumanoid.Editor.asmdef b/Assets/UniGLTF/Editor/UniHumanoid/UniHumanoid.Editor.asmdef similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Editor/UniHumanoid.Editor.asmdef rename to Assets/UniGLTF/Editor/UniHumanoid/UniHumanoid.Editor.asmdef diff --git a/Assets/UniGLTF/UniHumanoid/Editor/UniHumanoid.Editor.asmdef.meta b/Assets/UniGLTF/Editor/UniHumanoid/UniHumanoid.Editor.asmdef.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Editor/UniHumanoid.Editor.asmdef.meta rename to Assets/UniGLTF/Editor/UniHumanoid/UniHumanoid.Editor.asmdef.meta diff --git a/Assets/UniGLTF/UniHumanoid/Editor/bvhAssetPostprocessor.cs b/Assets/UniGLTF/Editor/UniHumanoid/bvhAssetPostprocessor.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Editor/bvhAssetPostprocessor.cs rename to Assets/UniGLTF/Editor/UniHumanoid/bvhAssetPostprocessor.cs diff --git a/Assets/UniGLTF/UniHumanoid/Editor/bvhAssetPostprocessor.cs.meta b/Assets/UniGLTF/Editor/UniHumanoid/bvhAssetPostprocessor.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Editor/bvhAssetPostprocessor.cs.meta rename to Assets/UniGLTF/Editor/UniHumanoid/bvhAssetPostprocessor.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Resources.meta b/Assets/UniGLTF/Runtime/Resources.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Resources.meta rename to Assets/UniGLTF/Runtime/Resources.meta diff --git a/Assets/UniGLTF/UniHumanoid/Resources/T-Pose.pose.asset b/Assets/UniGLTF/Runtime/Resources/T-Pose.pose.asset similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Resources/T-Pose.pose.asset rename to Assets/UniGLTF/Runtime/Resources/T-Pose.pose.asset diff --git a/Assets/UniGLTF/UniHumanoid/Resources/T-Pose.pose.asset.meta b/Assets/UniGLTF/Runtime/Resources/T-Pose.pose.asset.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Resources/T-Pose.pose.asset.meta rename to Assets/UniGLTF/Runtime/Resources/T-Pose.pose.asset.meta diff --git a/Assets/UniGLTF/UniHumanoid/Resources/test_motion.txt b/Assets/UniGLTF/Runtime/Resources/test_motion.txt similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Resources/test_motion.txt rename to Assets/UniGLTF/Runtime/Resources/test_motion.txt diff --git a/Assets/UniGLTF/UniHumanoid/Resources/test_motion.txt.meta b/Assets/UniGLTF/Runtime/Resources/test_motion.txt.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Resources/test_motion.txt.meta rename to Assets/UniGLTF/Runtime/Resources/test_motion.txt.meta diff --git a/Assets/UniGLTF/UniHumanoid.meta b/Assets/UniGLTF/Runtime/UniHumanoid.meta similarity index 58% rename from Assets/UniGLTF/UniHumanoid.meta rename to Assets/UniGLTF/Runtime/UniHumanoid.meta index 67270dc2c..b06bf81e4 100644 --- a/Assets/UniGLTF/UniHumanoid.meta +++ b/Assets/UniGLTF/Runtime/UniHumanoid.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: 42aed961be744fc4b9d423ac4c29f3c9 +guid: b1162898a107f7f43aec5979932edd38 folderAsset: yes -timeCreated: 1545999482 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/AnimationClipUtility.cs b/Assets/UniGLTF/Runtime/UniHumanoid/AnimationClipUtility.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/AnimationClipUtility.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/AnimationClipUtility.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/AnimationClipUtility.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/AnimationClipUtility.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/AnimationClipUtility.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/AnimationClipUtility.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/AvatarDescription.cs b/Assets/UniGLTF/Runtime/UniHumanoid/AvatarDescription.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/AvatarDescription.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/AvatarDescription.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/AvatarDescription.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/AvatarDescription.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/AvatarDescription.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/AvatarDescription.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/BoneGizmoDrawer.cs b/Assets/UniGLTF/Runtime/UniHumanoid/BoneGizmoDrawer.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/BoneGizmoDrawer.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/BoneGizmoDrawer.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/BoneGizmoDrawer.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/BoneGizmoDrawer.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/BoneGizmoDrawer.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/BoneGizmoDrawer.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/BoneMapping.cs b/Assets/UniGLTF/Runtime/UniHumanoid/BoneMapping.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/BoneMapping.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/BoneMapping.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/BoneMapping.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/BoneMapping.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/BoneMapping.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/BoneMapping.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/BvhBone.cs b/Assets/UniGLTF/Runtime/UniHumanoid/BvhBone.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/BvhBone.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/BvhBone.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/BvhBone.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/BvhBone.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/BvhBone.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/BvhBone.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Extensions.meta b/Assets/UniGLTF/Runtime/UniHumanoid/Extensions.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/Extensions.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/Extensions.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Extensions/EnumExtensions.cs b/Assets/UniGLTF/Runtime/UniHumanoid/Extensions/EnumExtensions.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/Extensions/EnumExtensions.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/Extensions/EnumExtensions.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Extensions/EnumExtensions.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/Extensions/EnumExtensions.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/Extensions/EnumExtensions.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/Extensions/EnumExtensions.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Format.meta b/Assets/UniGLTF/Runtime/UniHumanoid/Format.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/Format.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/Format.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Format/Bvh.cs b/Assets/UniGLTF/Runtime/UniHumanoid/Format/Bvh.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/Format/Bvh.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/Format/Bvh.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Format/Bvh.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/Format/Bvh.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/Format/Bvh.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/Format/Bvh.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/HumanPoseClip.cs b/Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseClip.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/HumanPoseClip.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseClip.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/HumanPoseClip.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseClip.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/HumanPoseClip.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseClip.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/HumanPoseTransfer.cs b/Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseTransfer.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/HumanPoseTransfer.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseTransfer.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/HumanPoseTransfer.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseTransfer.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/HumanPoseTransfer.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseTransfer.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Humanoid.cs b/Assets/UniGLTF/Runtime/UniHumanoid/Humanoid.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/Humanoid.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/Humanoid.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Humanoid.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/Humanoid.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/Humanoid.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/Humanoid.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/HumanoidLoader.cs b/Assets/UniGLTF/Runtime/UniHumanoid/HumanoidLoader.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/HumanoidLoader.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/HumanoidLoader.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/HumanoidLoader.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/HumanoidLoader.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/HumanoidLoader.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/HumanoidLoader.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IBone.cs b/Assets/UniGLTF/Runtime/UniHumanoid/IBone.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/IBone.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/IBone.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IBone.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/IBone.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/IBone.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/IBone.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO.meta b/Assets/UniGLTF/Runtime/UniHumanoid/IO.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/IO.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/IO.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhAnimationClip.cs b/Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhAnimationClip.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhAnimationClip.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhAnimationClip.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhAnimationClip.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhAnimationClip.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhAnimationClip.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhAnimationClip.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporter.cs b/Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhImporter.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporter.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhImporter.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporter.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhImporter.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporter.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhImporter.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporterContext.cs b/Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhImporterContext.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporterContext.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhImporterContext.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporterContext.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhImporterContext.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporterContext.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhImporterContext.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions.meta b/Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions/BvhExtensions.cs b/Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions/BvhExtensions.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions/BvhExtensions.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions/BvhExtensions.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions/BvhExtensions.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions/BvhExtensions.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions/BvhExtensions.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions/BvhExtensions.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions/UnityExtensions.cs b/Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions/UnityExtensions.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions/UnityExtensions.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions/UnityExtensions.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions/UnityExtensions.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions/UnityExtensions.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions/UnityExtensions.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions/UnityExtensions.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/MuscleDebug.cs b/Assets/UniGLTF/Runtime/UniHumanoid/MuscleDebug.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/MuscleDebug.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/MuscleDebug.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/MuscleDebug.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/MuscleDebug.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/MuscleDebug.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/MuscleDebug.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/MuscleInspector.cs b/Assets/UniGLTF/Runtime/UniHumanoid/MuscleInspector.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/MuscleInspector.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/MuscleInspector.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/MuscleInspector.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/MuscleInspector.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/MuscleInspector.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/MuscleInspector.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/PoseModifier.meta b/Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/PoseModifier.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier.meta diff --git a/Assets/UniGLTF/UniHumanoid/PoseModifier/HandPose.cs b/Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/HandPose.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/PoseModifier/HandPose.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/HandPose.cs diff --git a/Assets/UniGLTF/UniHumanoid/PoseModifier/HandPose.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/HandPose.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/PoseModifier/HandPose.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/HandPose.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/PoseModifier/HandRig.cs b/Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/HandRig.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/PoseModifier/HandRig.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/HandRig.cs diff --git a/Assets/UniGLTF/UniHumanoid/PoseModifier/HandRig.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/HandRig.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/PoseModifier/HandRig.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/HandRig.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/PoseModifier/IPoseModifier.cs b/Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/IPoseModifier.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/PoseModifier/IPoseModifier.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/IPoseModifier.cs diff --git a/Assets/UniGLTF/UniHumanoid/PoseModifier/IPoseModifier.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/IPoseModifier.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/PoseModifier/IPoseModifier.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/IPoseModifier.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Skeleton.cs b/Assets/UniGLTF/Runtime/UniHumanoid/Skeleton.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/Skeleton.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/Skeleton.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Skeleton.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/Skeleton.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/Skeleton.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/Skeleton.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/SkeletonEstimator.cs b/Assets/UniGLTF/Runtime/UniHumanoid/SkeletonEstimator.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/SkeletonEstimator.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/SkeletonEstimator.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/SkeletonEstimator.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/SkeletonEstimator.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/SkeletonEstimator.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/SkeletonEstimator.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/SkeletonMeshUtility.cs b/Assets/UniGLTF/Runtime/UniHumanoid/SkeletonMeshUtility.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/SkeletonMeshUtility.cs rename to Assets/UniGLTF/Runtime/UniHumanoid/SkeletonMeshUtility.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/SkeletonMeshUtility.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/SkeletonMeshUtility.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scripts/SkeletonMeshUtility.cs.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/SkeletonMeshUtility.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/UniHumanoid.asmdef b/Assets/UniGLTF/Runtime/UniHumanoid/UniHumanoid.asmdef similarity index 100% rename from Assets/UniGLTF/UniHumanoid/UniHumanoid.asmdef rename to Assets/UniGLTF/Runtime/UniHumanoid/UniHumanoid.asmdef diff --git a/Assets/UniGLTF/UniHumanoid/UniHumanoid.asmdef.meta b/Assets/UniGLTF/Runtime/UniHumanoid/UniHumanoid.asmdef.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/UniHumanoid.asmdef.meta rename to Assets/UniGLTF/Runtime/UniHumanoid/UniHumanoid.asmdef.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scenes.meta b/Assets/UniGLTF/Samples/UniHumanoid.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scenes.meta rename to Assets/UniGLTF/Samples/UniHumanoid.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/HumanBuilderTest.cs b/Assets/UniGLTF/Samples/UniHumanoid/HumanBuilderTest.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scenes/HumanBuilderTest.cs rename to Assets/UniGLTF/Samples/UniHumanoid/HumanBuilderTest.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/HumanBuilderTest.cs.meta b/Assets/UniGLTF/Samples/UniHumanoid/HumanBuilderTest.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scenes/HumanBuilderTest.cs.meta rename to Assets/UniGLTF/Samples/UniHumanoid/HumanBuilderTest.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/PoseTransfer.unity b/Assets/UniGLTF/Samples/UniHumanoid/PoseTransfer.unity similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scenes/PoseTransfer.unity rename to Assets/UniGLTF/Samples/UniHumanoid/PoseTransfer.unity diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/PoseTransfer.unity.meta b/Assets/UniGLTF/Samples/UniHumanoid/PoseTransfer.unity.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scenes/PoseTransfer.unity.meta rename to Assets/UniGLTF/Samples/UniHumanoid/PoseTransfer.unity.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/RuntimeBvhLoader.cs b/Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scenes/RuntimeBvhLoader.cs rename to Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.cs diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/RuntimeBvhLoader.cs.meta b/Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scenes/RuntimeBvhLoader.cs.meta rename to Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/RuntimeBvhLoader.unity b/Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.unity similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scenes/RuntimeBvhLoader.unity rename to Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.unity diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/RuntimeBvhLoader.unity.meta b/Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.unity.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scenes/RuntimeBvhLoader.unity.meta rename to Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.unity.meta diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/target.mat b/Assets/UniGLTF/Samples/UniHumanoid/target.mat similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scenes/target.mat rename to Assets/UniGLTF/Samples/UniHumanoid/target.mat diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/target.mat.meta b/Assets/UniGLTF/Samples/UniHumanoid/target.mat.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Scenes/target.mat.meta rename to Assets/UniGLTF/Samples/UniHumanoid/target.mat.meta diff --git a/Assets/UniGLTF/UniHumanoid/Editor/Tests.meta b/Assets/UniGLTF/Tests/UniHumanoid.meta similarity index 57% rename from Assets/UniGLTF/UniHumanoid/Editor/Tests.meta rename to Assets/UniGLTF/Tests/UniHumanoid.meta index 3b8730642..9ff4681ea 100644 --- a/Assets/UniGLTF/UniHumanoid/Editor/Tests.meta +++ b/Assets/UniGLTF/Tests/UniHumanoid.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: fcdf450ca966f85428c238046e51c2ca +guid: 8e2610f02b10eed49b1862c9bb5c5633 folderAsset: yes -timeCreated: 1534750149 -licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/UniGLTF/UniHumanoid/Editor/Tests/BvhLoaderTests.cs b/Assets/UniGLTF/Tests/UniHumanoid/BvhLoaderTests.cs similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Editor/Tests/BvhLoaderTests.cs rename to Assets/UniGLTF/Tests/UniHumanoid/BvhLoaderTests.cs diff --git a/Assets/UniGLTF/UniHumanoid/Editor/Tests/BvhLoaderTests.cs.meta b/Assets/UniGLTF/Tests/UniHumanoid/BvhLoaderTests.cs.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Editor/Tests/BvhLoaderTests.cs.meta rename to Assets/UniGLTF/Tests/UniHumanoid/BvhLoaderTests.cs.meta diff --git a/Assets/UniGLTF/UniHumanoid/Editor/Tests/UniHumanoid.Editor.Tests.asmdef b/Assets/UniGLTF/Tests/UniHumanoid/UniHumanoid.Editor.Tests.asmdef similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Editor/Tests/UniHumanoid.Editor.Tests.asmdef rename to Assets/UniGLTF/Tests/UniHumanoid/UniHumanoid.Editor.Tests.asmdef diff --git a/Assets/UniGLTF/UniHumanoid/Editor/Tests/UniHumanoid.Editor.Tests.asmdef.meta b/Assets/UniGLTF/Tests/UniHumanoid/UniHumanoid.Editor.Tests.asmdef.meta similarity index 100% rename from Assets/UniGLTF/UniHumanoid/Editor/Tests/UniHumanoid.Editor.Tests.asmdef.meta rename to Assets/UniGLTF/Tests/UniHumanoid/UniHumanoid.Editor.Tests.asmdef.meta diff --git a/Assets/UniGLTF/UniHumanoid/Editor.meta b/Assets/UniGLTF/UniHumanoid/Editor.meta deleted file mode 100644 index 700ef71e6..000000000 --- a/Assets/UniGLTF/UniHumanoid/Editor.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 6dfa46c173ff021418df4bada32ddfe9 -folderAsset: yes -timeCreated: 1517655448 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/UniHumanoid/LICENSE.md b/Assets/UniGLTF/UniHumanoid/LICENSE.md deleted file mode 100644 index 3299d454f..000000000 --- a/Assets/UniGLTF/UniHumanoid/LICENSE.md +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2018 ousttrue - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/Assets/UniGLTF/UniHumanoid/LICENSE.md.meta b/Assets/UniGLTF/UniHumanoid/LICENSE.md.meta deleted file mode 100644 index 24df7cd34..000000000 --- a/Assets/UniGLTF/UniHumanoid/LICENSE.md.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3ea85fd858590174f98cc2cd4c3e083f -timeCreated: 1522228320 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/UniHumanoid/README.md.meta b/Assets/UniGLTF/UniHumanoid/README.md.meta deleted file mode 100644 index 832294e89..000000000 --- a/Assets/UniGLTF/UniHumanoid/README.md.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: be513cfaa8530114d85f1e8e0f29708a -timeCreated: 1517370218 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/UniHumanoid/Scripts.meta b/Assets/UniGLTF/UniHumanoid/Scripts.meta deleted file mode 100644 index a7876e5ea..000000000 --- a/Assets/UniGLTF/UniHumanoid/Scripts.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 64819743741f38e43b64a7d6add8cea9 -folderAsset: yes -timeCreated: 1517166088 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/UniHumanoid/doc/BoneMappingGizmo.png.meta b/Assets/UniGLTF/UniHumanoid/doc/BoneMappingGizmo.png.meta deleted file mode 100644 index d3f0a79c8..000000000 --- a/Assets/UniGLTF/UniHumanoid/doc/BoneMappingGizmo.png.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: f4993bbf703729441869ce8186574f2b -timeCreated: 1517138583 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/UniHumanoid/doc/BoneMappingInspector.png.meta b/Assets/UniGLTF/UniHumanoid/doc/BoneMappingInspector.png.meta deleted file mode 100644 index da2e5c7d2..000000000 --- a/Assets/UniGLTF/UniHumanoid/doc/BoneMappingInspector.png.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: 1e5ed0d1eaae21c46b59beeeb761a357 -timeCreated: 1517138581 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/UniHumanoid/doc/assets.png.meta b/Assets/UniGLTF/UniHumanoid/doc/assets.png.meta deleted file mode 100644 index 232c0dde7..000000000 --- a/Assets/UniGLTF/UniHumanoid/doc/assets.png.meta +++ /dev/null @@ -1,68 +0,0 @@ -fileFormatVersion: 2 -guid: f998ebae6d907c94b87d25d0d24939d6 -timeCreated: 1535601388 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/UniHumanoid/doc/bvh_bonemapping.png.meta b/Assets/UniGLTF/UniHumanoid/doc/bvh_bonemapping.png.meta deleted file mode 100644 index 78605cee5..000000000 --- a/Assets/UniGLTF/UniHumanoid/doc/bvh_bonemapping.png.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: 06577ef88ae5dea4189cb3022681fa9f -timeCreated: 1518017275 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/UniHumanoid/doc/bvh_gameobject.png.meta b/Assets/UniGLTF/UniHumanoid/doc/bvh_gameobject.png.meta deleted file mode 100644 index 87746bc3e..000000000 --- a/Assets/UniGLTF/UniHumanoid/doc/bvh_gameobject.png.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: 65ce8e194a35af1449cbc70c76e385ad -timeCreated: 1518016999 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/UniHumanoid/doc/bvh_prefab.png.meta b/Assets/UniGLTF/UniHumanoid/doc/bvh_prefab.png.meta deleted file mode 100644 index 41830c182..000000000 --- a/Assets/UniGLTF/UniHumanoid/doc/bvh_prefab.png.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: 0f274a7a8cb1663479e10b9b1820156d -timeCreated: 1518016802 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/UniHumanoid/doc/humanoid.gif.meta b/Assets/UniGLTF/UniHumanoid/doc/humanoid.gif.meta deleted file mode 100644 index 15ffc1163..000000000 --- a/Assets/UniGLTF/UniHumanoid/doc/humanoid.gif.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: 81969f93770cf844eab1f4137fefe07e -timeCreated: 1517138582 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer.png.meta b/Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer.png.meta deleted file mode 100644 index 141eaaa97..000000000 --- a/Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer.png.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: 8dd213e4a507dac4585f174f27fcd677 -timeCreated: 1518018122 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer_inspector.png.meta b/Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer_inspector.png.meta deleted file mode 100644 index ccfeb446e..000000000 --- a/Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer_inspector.png.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: 0091e5f38ae478b47ba5b2aec91e1598 -timeCreated: 1519110272 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/UniHumanoid/doc/mesh.png.meta b/Assets/UniGLTF/UniHumanoid/doc/mesh.png.meta deleted file mode 100644 index 0a350c611..000000000 --- a/Assets/UniGLTF/UniHumanoid/doc/mesh.png.meta +++ /dev/null @@ -1,68 +0,0 @@ -fileFormatVersion: 2 -guid: 7e153a45f4c3fab428c47e3d6509252d -timeCreated: 1535601388 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/docs/index.md b/docs/index.md index d3f52a83c..3c2358c84 100644 --- a/docs/index.md +++ b/docs/index.md @@ -9,6 +9,7 @@ UnityでVRMをエクスポートする方法などについては [manual](https build implementation/index gltf/index +unihumanoid/index vrm0/index vrm1/index release/index diff --git a/Assets/UniGLTF/UniHumanoid/doc/BoneMappingGizmo.png b/docs/unihumanoid/BoneMappingGizmo.png similarity index 100% rename from Assets/UniGLTF/UniHumanoid/doc/BoneMappingGizmo.png rename to docs/unihumanoid/BoneMappingGizmo.png diff --git a/Assets/UniGLTF/UniHumanoid/doc/BoneMappingInspector.png b/docs/unihumanoid/BoneMappingInspector.png similarity index 100% rename from Assets/UniGLTF/UniHumanoid/doc/BoneMappingInspector.png rename to docs/unihumanoid/BoneMappingInspector.png diff --git a/Assets/UniGLTF/UniHumanoid/doc/assets.png b/docs/unihumanoid/assets.png similarity index 100% rename from Assets/UniGLTF/UniHumanoid/doc/assets.png rename to docs/unihumanoid/assets.png diff --git a/Assets/UniGLTF/UniHumanoid/doc/bvh_bonemapping.png b/docs/unihumanoid/bvh_bonemapping.png similarity index 100% rename from Assets/UniGLTF/UniHumanoid/doc/bvh_bonemapping.png rename to docs/unihumanoid/bvh_bonemapping.png diff --git a/Assets/UniGLTF/UniHumanoid/doc/bvh_gameobject.png b/docs/unihumanoid/bvh_gameobject.png similarity index 100% rename from Assets/UniGLTF/UniHumanoid/doc/bvh_gameobject.png rename to docs/unihumanoid/bvh_gameobject.png diff --git a/Assets/UniGLTF/UniHumanoid/doc/bvh_prefab.png b/docs/unihumanoid/bvh_prefab.png similarity index 100% rename from Assets/UniGLTF/UniHumanoid/doc/bvh_prefab.png rename to docs/unihumanoid/bvh_prefab.png diff --git a/Assets/UniGLTF/UniHumanoid/doc/humanoid.gif b/docs/unihumanoid/humanoid.gif similarity index 100% rename from Assets/UniGLTF/UniHumanoid/doc/humanoid.gif rename to docs/unihumanoid/humanoid.gif diff --git a/Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer.png b/docs/unihumanoid/humanpose_transfer.png similarity index 100% rename from Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer.png rename to docs/unihumanoid/humanpose_transfer.png diff --git a/Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer_inspector.png b/docs/unihumanoid/humanpose_transfer_inspector.png similarity index 100% rename from Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer_inspector.png rename to docs/unihumanoid/humanpose_transfer_inspector.png diff --git a/Assets/UniGLTF/UniHumanoid/README.md b/docs/unihumanoid/index.md similarity index 74% rename from Assets/UniGLTF/UniHumanoid/README.md rename to docs/unihumanoid/index.md index 2b1559526..a7137e73d 100644 --- a/Assets/UniGLTF/UniHumanoid/README.md +++ b/docs/unihumanoid/index.md @@ -2,11 +2,7 @@ Unity humanoid utility with bvh importer. -# License - -* [MIT](./LICENSE.md) - -# BVH runtime loader +## BVH runtime loader ```cs var context = new BvhImporterContext(); @@ -15,19 +11,19 @@ context.Load(); // create Skeleton hierarchy and mesh for visualize GameObject root = context.Root; ``` -## RuntimeLoader +### RuntimeLoader * Scenes/RuntimeBvhLoader.unity -## RuntimeLoader and PoseTransfer +### RuntimeLoader and PoseTransfer Load BVH and transfer pose to any model with humanoid avatar. * Scenes/PoseTransfer.unity -![humanpose transfer target](doc/humanpose_transfer_inspector.png) +![humanpose transfer target](humanpose_transfer_inspector.png) -![humanpose transfer](doc/humanpose_transfer.png) +![humanpose transfer](humanpose_transfer.png) -# Load bvh and create prefab with AnimationClip +## Load bvh and create prefab with AnimationClip Drop bvh file to Assets folder. Then, AssetPostprocessor import bvh file. @@ -37,15 +33,15 @@ Then, AssetPostprocessor import bvh file. * create a legacy mode AnimationClip * create a skinned mesh for preview -![bvh prefab](doc/assets.png) +![bvh prefab](assets.png) Instanciate prefab to scene. -![bvh gameobject](doc/mesh.png) +![bvh gameobject](mesh.png) That object can play. -# BoneMapping +## BoneMapping This script help create human avatar from exist GameObject hierarchy. First, attach this script to root GameObject that has Animator. @@ -63,15 +59,14 @@ If fail to guess bone mapping, you can set bones manually. Optional, press Ensure T-Pose. Create avatar. -![bvh bone mapping](doc/bvh_bonemapping.png) +![bvh bone mapping](bvh_bonemapping.png) These humanoids imported by [UniGLTF](https://github.com/ousttrue/UniGLTF) and created human avatar by BoneMapping. -![humanoid](doc/humanoid.gif) +![humanoid](humanoid.gif) -# Download BVH files +## Download BVH files * https://sites.google.com/a/cgspeed.com/cgspeed/motion-capture * http://mocapdata.com/ * http://www.thetrailerspark.com/download/Mocap/Packed/EYES-JAPAN/BVH/ - diff --git a/Assets/UniGLTF/UniHumanoid/doc/mesh.png b/docs/unihumanoid/mesh.png similarity index 100% rename from Assets/UniGLTF/UniHumanoid/doc/mesh.png rename to docs/unihumanoid/mesh.png From 3414b3b7d1cd8668e8d45d54de2cce672e4f8e43 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 6 Dec 2021 17:13:02 +0900 Subject: [PATCH 10/10] =?UTF-8?q?skin=20=E3=81=8C=E3=81=82=E3=82=8B?= =?UTF-8?q?=E3=81=8C=20mesh=20=E3=81=8C=E7=84=A1=E3=81=84=E3=80=82?= =?UTF-8?q?=E4=BB=95=E6=A7=98=E3=81=AF=E3=81=A8=E3=82=82=E3=81=8B=E3=81=8F?= =?UTF-8?q?=E5=AE=9F=E9=9A=9B=E3=81=AB=E9=81=AD=E9=81=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/VRM10/Runtime/Migration/MeshUpdater.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/VRM10/Runtime/Migration/MeshUpdater.cs b/Assets/VRM10/Runtime/Migration/MeshUpdater.cs index 24e3dda1f..fe57e83ee 100644 --- a/Assets/VRM10/Runtime/Migration/MeshUpdater.cs +++ b/Assets/VRM10/Runtime/Migration/MeshUpdater.cs @@ -157,7 +157,7 @@ namespace UniVRM10 gltfNode.translation = node.LocalTranslation.ToFloat3(); gltfNode.rotation = node.LocalRotation.ToFloat4(); gltfNode.scale = node.LocalScaling.ToFloat3(); - if (gltfNode.skin >= 0) + if (gltfNode.mesh >= 0 && gltfNode.skin >= 0) { var gltfSkin = gltf.skins[gltfNode.skin]; gltfSkin.inverseBindMatrices = AddAccessor(node.MeshGroup.Skin.InverseMatrices.GetSpan());