From 8eaceb6c8e0d5188cd626f76ec2cfe68063947e2 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Thu, 8 Apr 2021 20:19:37 +0900 Subject: [PATCH] Refactoring VRMShaders directory & asmdef --- .gitmodules | 6 +- Assets/UniGLTF/Editor/UniGLTF.Editor.asmdef | 9 +-- .../Valildators/MaterialValidator.cs | 65 ------------------- .../Valildators/MaterialValidator.cs.meta | 11 ---- Assets/UniGLTF/Runtime/UniGLTF.asmdef | 10 +-- Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef | 23 ++++--- .../Tests/VRM.Samples.Editor.Tests.asmdef | 23 ++++--- Assets/VRM.Samples/VRM.Samples.asmdef | 7 +- Assets/VRM/Editor/VRM.Editor.asmdef | 11 ++-- .../Shaders/VRMShaders.shadervariants | 33 ---------- Assets/VRM/Runtime/VRM.asmdef | 11 ++-- Assets/VRM/Tests/VRM.Tests.asmdef | 23 ++++--- Assets/VRM10/Editor/VRM10.Editor.asmdef | 8 ++- Assets/VRM10/Runtime/VRM10.asmdef | 7 +- .../VRM10.Tests.PlayMode.asmdef | 19 ++++-- .../{ShaderProperty.meta => GLTF.meta} | 2 +- Assets/VRMShaders/GLTF/IO.meta | 8 +++ Assets/VRMShaders/{ => GLTF/IO}/Editor.meta | 0 .../{ => GLTF/IO}/Editor/AssetTextureUtil.cs | 0 .../IO}/Editor/AssetTextureUtil.cs.meta | 0 .../Editor/VRMShaders.GLTF.IO.Editor.asmdef} | 9 +-- .../VRMShaders.GLTF.IO.Editor.asmdef.meta} | 0 Assets/VRMShaders/{ => GLTF/IO}/Runtime.meta | 0 .../{ => GLTF/IO}/Runtime/MaterialFactory.cs | 0 .../IO}/Runtime/MaterialFactory.cs.meta | 0 .../IO}/Runtime/MaterialImportParam.cs | 0 .../IO}/Runtime/MaterialImportParam.cs.meta | 0 .../{ => GLTF/IO}/Runtime/NormalConverter.cs | 0 .../IO}/Runtime/NormalConverter.cs.meta | 0 .../OcclusionMetallicRoughnessConverter.cs | 0 ...cclusionMetallicRoughnessConverter.cs.meta | 0 .../{ => GLTF/IO}/Runtime/SamplerParam.cs | 0 .../IO}/Runtime/SamplerParam.cs.meta | 0 .../{ => GLTF/IO}/Runtime/SamplerWrapTypes.cs | 0 .../IO}/Runtime/SamplerWrapTypes.cs.meta | 0 .../{ => GLTF/IO}/Runtime/TextureConverter.cs | 0 .../IO}/Runtime/TextureConverter.cs.meta | 0 .../{ => GLTF/IO}/Runtime/TextureExporter.cs | 0 .../IO}/Runtime/TextureExporter.cs.meta | 0 .../{ => GLTF/IO}/Runtime/TextureFactory.cs | 0 .../IO}/Runtime/TextureFactory.cs.meta | 0 .../IO}/Runtime/TextureImportName.cs | 0 .../IO}/Runtime/TextureImportName.cs.meta | 0 .../IO}/Runtime/TextureImportParam.cs | 0 .../IO}/Runtime/TextureImportParam.cs.meta | 0 .../IO}/Runtime/TextureImportTypes.cs | 0 .../IO}/Runtime/TextureImportTypes.cs.meta | 0 .../Runtime/VRMShaders.GLTF.IO.Runtime.asmdef | 13 ++++ .../VRMShaders.GLTF.IO.Runtime.asmdef.meta} | 0 Assets/VRMShaders/{ => GLTF/IO}/Tests.meta | 0 .../Tests/MetallicRoughnessConverterTests.cs | 0 .../MetallicRoughnessConverterTests.cs.meta | 0 .../IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef | 24 +++++++ .../VRMShaders.GLTF.IO.Tests.asmdef.meta} | 0 Assets/VRMShaders/{ => GLTF}/UniUnlit.meta | 0 .../{ => GLTF}/UniUnlit/Editor.meta | 0 .../UniUnlit/Editor/UniUnlitEditor.cs | 0 .../UniUnlit/Editor/UniUnlitEditor.cs.meta | 0 .../VRMShaders.GLTF.UniUnlit.Editor.asmdef | 17 +++++ ...MShaders.GLTF.UniUnlit.Editor.asmdef.meta} | 0 .../{ => GLTF}/UniUnlit/Resources.meta | 0 .../UniUnlit/Resources/UniUnlit.shader | 0 .../UniUnlit/Resources/UniUnlit.shader.meta | 0 .../UniUnlit/Runtime.meta} | 0 .../UniUnlit/Runtime}/Utils.cs | 0 .../UniUnlit/Runtime}/Utils.cs.meta | 0 .../VRMShaders.GLTF.UniUnlit.Runtime.asmdef | 13 ++++ ...Shaders.GLTF.UniUnlit.Runtime.asmdef.meta} | 0 Assets/VRMShaders/Runtime/VRMShaders.asmdef | 3 - .../Editor/ShaderProperty.Editor.asmdef | 12 ---- .../Runtime/ShaderProperty.Runtime.asmdef | 8 --- .../UniUnlit/Editor/UniUnlit.Editor.asmdef | 12 ---- Assets/VRMShaders/UniUnlit/UniUnlit.asmdef | 3 - Assets/VRMShaders/VRM.meta | 8 +++ Assets/VRMShaders/VRM/IO.meta | 8 +++ .../{ShaderProperty => VRM/IO}/Editor.meta | 0 .../IO}/Editor/ShaderPropMenu.cs | 0 .../IO}/Editor/ShaderPropMenu.cs.meta | 0 .../Editor/VRMShaders.VRM.IO.Editor.asmdef} | 12 ++-- .../VRMShaders.VRM.IO.Editor.asmdef.meta} | 0 .../{ShaderProperty => VRM/IO}/Runtime.meta | 0 .../IO}/Runtime/GLTF.meta | 0 .../IO}/Runtime/GLTF/PreExportShaders_GLTF.cs | 0 .../GLTF/PreExportShaders_GLTF.cs.meta | 0 .../IO}/Runtime/GLTF/Standard.cs | 0 .../IO}/Runtime/GLTF/Standard.cs.meta | 0 .../IO}/Runtime/GLTF/UniGLTF_UniUnlit.cs | 0 .../IO}/Runtime/GLTF/UniGLTF_UniUnlit.cs.meta | 0 .../IO}/Runtime/GLTF/Unlit_Color.cs | 0 .../IO}/Runtime/GLTF/Unlit_Color.cs.meta | 0 .../IO}/Runtime/GLTF/Unlit_Texture.cs | 0 .../IO}/Runtime/GLTF/Unlit_Texture.cs.meta | 0 .../IO}/Runtime/GLTF/Unlit_Transparent.cs | 0 .../Runtime/GLTF/Unlit_Transparent.cs.meta | 0 .../Runtime/GLTF/Unlit_Transparent_Cutout.cs | 0 .../GLTF/Unlit_Transparent_Cutout.cs.meta | 0 .../IO}/Runtime/PreShaderPropExporter.cs | 17 ----- .../IO}/Runtime/PreShaderPropExporter.cs.meta | 0 .../IO}/Runtime/ShaderProps.cs | 0 .../IO}/Runtime/ShaderProps.cs.meta | 0 .../IO}/Runtime/VRM.meta | 0 .../IO}/Runtime/VRM/PreExportShaders_VRM.cs | 0 .../Runtime/VRM/PreExportShaders_VRM.cs.meta | 0 .../IO}/Runtime/VRM/VRM_MToon.cs | 0 .../IO}/Runtime/VRM/VRM_MToon.cs.meta | 0 .../IO}/Runtime/VRM/VRM_UnlitCutout.cs | 0 .../IO}/Runtime/VRM/VRM_UnlitCutout.cs.meta | 0 .../IO}/Runtime/VRM/VRM_UnlitTexture.cs | 0 .../IO}/Runtime/VRM/VRM_UnlitTexture.cs.meta | 0 .../IO}/Runtime/VRM/VRM_UnlitTransparent.cs | 0 .../Runtime/VRM/VRM_UnlitTransparent.cs.meta | 0 .../Runtime/VRM/VRM_UnlitTransparentZWrite.cs | 0 .../VRM/VRM_UnlitTransparentZWrite.cs.meta | 0 .../Runtime/VRMShaders.VRM.IO.Runtime.asmdef | 13 ++++ .../VRMShaders.VRM.IO.Runtime.asmdef.meta} | 0 Assets/VRMShaders/{ => VRM}/MToon | 0 Assets/VRMShaders/{ => VRM}/MToon.meta | 0 .../VRMShaders/VRM/VRMShaders.shadervariants | 31 +++++++++ .../VRM}/VRMShaders.shadervariants.meta | 0 Assets/VRMShaders/VRM/VrmUnlitShaders.meta | 8 +++ .../VRM/VrmUnlitShaders}/Resources.meta | 0 .../VrmUnlitShaders}/Resources/Shaders.meta | 0 .../Resources/Shaders/VRMUnlitCutout.shader | 0 .../Shaders/VRMUnlitCutout.shader.meta | 0 .../Resources/Shaders/VRMUnlitTexture.shader | 0 .../Shaders/VRMUnlitTexture.shader.meta | 0 .../Shaders/VRMUnlitTransparent.shader | 0 .../Shaders/VRMUnlitTransparent.shader.meta | 0 .../Shaders/VRMUnlitTransparentZWrite.shader | 0 .../VRMUnlitTransparentZWrite.shader.meta | 0 Assets/VRMShaders/VRM10.meta | 8 +++ 131 files changed, 254 insertions(+), 241 deletions(-) delete mode 100644 Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/MaterialValidator.cs delete mode 100644 Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/MaterialValidator.cs.meta delete mode 100644 Assets/VRM/Resources/Shaders/VRMShaders.shadervariants rename Assets/VRMShaders/{ShaderProperty.meta => GLTF.meta} (77%) create mode 100644 Assets/VRMShaders/GLTF/IO.meta rename Assets/VRMShaders/{ => GLTF/IO}/Editor.meta (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Editor/AssetTextureUtil.cs (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Editor/AssetTextureUtil.cs.meta (100%) rename Assets/VRMShaders/{Editor/VRMShaders.Editor.asmdef => GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef} (55%) rename Assets/VRMShaders/{Editor/VRMShaders.Editor.asmdef.meta => GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef.meta} (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime.meta (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/MaterialFactory.cs (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/MaterialFactory.cs.meta (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/MaterialImportParam.cs (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/MaterialImportParam.cs.meta (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/NormalConverter.cs (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/NormalConverter.cs.meta (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/OcclusionMetallicRoughnessConverter.cs (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/OcclusionMetallicRoughnessConverter.cs.meta (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/SamplerParam.cs (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/SamplerParam.cs.meta (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/SamplerWrapTypes.cs (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/SamplerWrapTypes.cs.meta (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/TextureConverter.cs (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/TextureConverter.cs.meta (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/TextureExporter.cs (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/TextureExporter.cs.meta (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/TextureFactory.cs (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/TextureFactory.cs.meta (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/TextureImportName.cs (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/TextureImportName.cs.meta (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/TextureImportParam.cs (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/TextureImportParam.cs.meta (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/TextureImportTypes.cs (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Runtime/TextureImportTypes.cs.meta (100%) create mode 100644 Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef rename Assets/VRMShaders/{Runtime/VRMShaders.asmdef.meta => GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef.meta} (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Tests.meta (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Tests/MetallicRoughnessConverterTests.cs (100%) rename Assets/VRMShaders/{ => GLTF/IO}/Tests/MetallicRoughnessConverterTests.cs.meta (100%) create mode 100644 Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef rename Assets/VRMShaders/{Tests/VRMShaders.Tests.asmdef.meta => GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef.meta} (100%) rename Assets/VRMShaders/{ => GLTF}/UniUnlit.meta (100%) rename Assets/VRMShaders/{ => GLTF}/UniUnlit/Editor.meta (100%) rename Assets/VRMShaders/{ => GLTF}/UniUnlit/Editor/UniUnlitEditor.cs (100%) rename Assets/VRMShaders/{ => GLTF}/UniUnlit/Editor/UniUnlitEditor.cs.meta (100%) create mode 100644 Assets/VRMShaders/GLTF/UniUnlit/Editor/VRMShaders.GLTF.UniUnlit.Editor.asmdef rename Assets/VRMShaders/{UniUnlit/Editor/UniUnlit.Editor.asmdef.meta => GLTF/UniUnlit/Editor/VRMShaders.GLTF.UniUnlit.Editor.asmdef.meta} (100%) rename Assets/VRMShaders/{ => GLTF}/UniUnlit/Resources.meta (100%) rename Assets/VRMShaders/{ => GLTF}/UniUnlit/Resources/UniUnlit.shader (100%) rename Assets/VRMShaders/{ => GLTF}/UniUnlit/Resources/UniUnlit.shader.meta (100%) rename Assets/VRMShaders/{UniUnlit/Scripts.meta => GLTF/UniUnlit/Runtime.meta} (100%) rename Assets/VRMShaders/{UniUnlit/Scripts => GLTF/UniUnlit/Runtime}/Utils.cs (100%) rename Assets/VRMShaders/{UniUnlit/Scripts => GLTF/UniUnlit/Runtime}/Utils.cs.meta (100%) create mode 100644 Assets/VRMShaders/GLTF/UniUnlit/Runtime/VRMShaders.GLTF.UniUnlit.Runtime.asmdef rename Assets/VRMShaders/{UniUnlit/UniUnlit.asmdef.meta => GLTF/UniUnlit/Runtime/VRMShaders.GLTF.UniUnlit.Runtime.asmdef.meta} (100%) delete mode 100644 Assets/VRMShaders/Runtime/VRMShaders.asmdef delete mode 100644 Assets/VRMShaders/ShaderProperty/Editor/ShaderProperty.Editor.asmdef delete mode 100644 Assets/VRMShaders/ShaderProperty/Runtime/ShaderProperty.Runtime.asmdef delete mode 100644 Assets/VRMShaders/UniUnlit/Editor/UniUnlit.Editor.asmdef delete mode 100644 Assets/VRMShaders/UniUnlit/UniUnlit.asmdef create mode 100644 Assets/VRMShaders/VRM.meta create mode 100644 Assets/VRMShaders/VRM/IO.meta rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Editor.meta (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Editor/ShaderPropMenu.cs (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Editor/ShaderPropMenu.cs.meta (100%) rename Assets/VRMShaders/{Tests/VRMShaders.Tests.asmdef => VRM/IO/Editor/VRMShaders.VRM.IO.Editor.asmdef} (57%) rename Assets/VRMShaders/{ShaderProperty/Editor/ShaderProperty.Editor.asmdef.meta => VRM/IO/Editor/VRMShaders.VRM.IO.Editor.asmdef.meta} (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime.meta (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/GLTF.meta (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/GLTF/PreExportShaders_GLTF.cs (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/GLTF/PreExportShaders_GLTF.cs.meta (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/GLTF/Standard.cs (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/GLTF/Standard.cs.meta (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/GLTF/UniGLTF_UniUnlit.cs (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/GLTF/UniGLTF_UniUnlit.cs.meta (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/GLTF/Unlit_Color.cs (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/GLTF/Unlit_Color.cs.meta (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/GLTF/Unlit_Texture.cs (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/GLTF/Unlit_Texture.cs.meta (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/GLTF/Unlit_Transparent.cs (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/GLTF/Unlit_Transparent.cs.meta (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/GLTF/Unlit_Transparent_Cutout.cs (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/GLTF/Unlit_Transparent_Cutout.cs.meta (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/PreShaderPropExporter.cs (79%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/PreShaderPropExporter.cs.meta (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/ShaderProps.cs (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/ShaderProps.cs.meta (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/VRM.meta (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/VRM/PreExportShaders_VRM.cs (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/VRM/PreExportShaders_VRM.cs.meta (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/VRM/VRM_MToon.cs (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/VRM/VRM_MToon.cs.meta (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/VRM/VRM_UnlitCutout.cs (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/VRM/VRM_UnlitCutout.cs.meta (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/VRM/VRM_UnlitTexture.cs (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/VRM/VRM_UnlitTexture.cs.meta (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/VRM/VRM_UnlitTransparent.cs (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/VRM/VRM_UnlitTransparent.cs.meta (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/VRM/VRM_UnlitTransparentZWrite.cs (100%) rename Assets/VRMShaders/{ShaderProperty => VRM/IO}/Runtime/VRM/VRM_UnlitTransparentZWrite.cs.meta (100%) create mode 100644 Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef rename Assets/VRMShaders/{ShaderProperty/Runtime/ShaderProperty.Runtime.asmdef.meta => VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef.meta} (100%) rename Assets/VRMShaders/{ => VRM}/MToon (100%) rename Assets/VRMShaders/{ => VRM}/MToon.meta (100%) create mode 100644 Assets/VRMShaders/VRM/VRMShaders.shadervariants rename Assets/{VRM/Resources/Shaders => VRMShaders/VRM}/VRMShaders.shadervariants.meta (100%) create mode 100644 Assets/VRMShaders/VRM/VrmUnlitShaders.meta rename Assets/{VRM => VRMShaders/VRM/VrmUnlitShaders}/Resources.meta (100%) rename Assets/{VRM => VRMShaders/VRM/VrmUnlitShaders}/Resources/Shaders.meta (100%) rename Assets/{VRM => VRMShaders/VRM/VrmUnlitShaders}/Resources/Shaders/VRMUnlitCutout.shader (100%) rename Assets/{VRM => VRMShaders/VRM/VrmUnlitShaders}/Resources/Shaders/VRMUnlitCutout.shader.meta (100%) rename Assets/{VRM => VRMShaders/VRM/VrmUnlitShaders}/Resources/Shaders/VRMUnlitTexture.shader (100%) rename Assets/{VRM => VRMShaders/VRM/VrmUnlitShaders}/Resources/Shaders/VRMUnlitTexture.shader.meta (100%) rename Assets/{VRM => VRMShaders/VRM/VrmUnlitShaders}/Resources/Shaders/VRMUnlitTransparent.shader (100%) rename Assets/{VRM => VRMShaders/VRM/VrmUnlitShaders}/Resources/Shaders/VRMUnlitTransparent.shader.meta (100%) rename Assets/{VRM => VRMShaders/VRM/VrmUnlitShaders}/Resources/Shaders/VRMUnlitTransparentZWrite.shader (100%) rename Assets/{VRM => VRMShaders/VRM/VrmUnlitShaders}/Resources/Shaders/VRMUnlitTransparentZWrite.shader.meta (100%) create mode 100644 Assets/VRMShaders/VRM10.meta diff --git a/.gitmodules b/.gitmodules index 5baa4e8b85..7e91c5d3f9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ -[submodule "MToon"] - path = Assets/VRMShaders/MToon - url = https://github.com/Santarh/MToon.git [submodule "vrm-specification"] path = vrm-specification url = https://github.com/vrm-c/vrm-specification.git [submodule "glTF"] path = glTF url = https://github.com/KhronosGroup/glTF.git +[submodule "Assets/VRMShaders/VRM/MToon"] + path = Assets/VRMShaders/VRM/MToon + url = https://github.com/Santarh/MToon.git diff --git a/Assets/UniGLTF/Editor/UniGLTF.Editor.asmdef b/Assets/UniGLTF/Editor/UniGLTF.Editor.asmdef index 403b405c90..e99593f177 100644 --- a/Assets/UniGLTF/Editor/UniGLTF.Editor.asmdef +++ b/Assets/UniGLTF/Editor/UniGLTF.Editor.asmdef @@ -4,10 +4,9 @@ "UniGLTF", "MeshUtility", "MeshUtility.Editor", - "VRMShaders", - "VRMShaders.Editor" + "VRMShaders.GLTF.IO.Runtime", + "VRMShaders.GLTF.IO.Editor" ], - "optionalUnityReferences": [], "includePlatforms": [ "Editor" ], @@ -16,5 +15,7 @@ "overrideReferences": false, "precompiledReferences": [], "autoReferenced": true, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/MaterialValidator.cs b/Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/MaterialValidator.cs deleted file mode 100644 index 1aa6656c1d..0000000000 --- a/Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/MaterialValidator.cs +++ /dev/null @@ -1,65 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using MeshUtility.M17N; -using UnityEngine; - - -namespace MeshUtility.Validators -{ - public static class MaterialValidator - { - public enum ValidationMessages - { - [LangMsg(Languages.ja, "Standard, Unlit, MToon 以外のマテリアルは、Standard になります")] - [LangMsg(Languages.en, "It will export as `Standard` fallback")] - UNKNOWN_SHADER, - } - - public static IEnumerable Validate(GameObject ExportRoot) - { - if (ExportRoot == null) - { - yield break; - } - - var renderers = ExportRoot.GetComponentsInChildren(); - foreach (var r in renderers) - { - for (int i = 0; i < r.sharedMaterials.Length; ++i) - if (r.sharedMaterials[i] == null) - { - yield return Validation.Error($"Renderer: {r.name}.Materials[{i}] is null. please fix it"); - } - } - - var materials = renderers.SelectMany(x => x.sharedMaterials).Where(x => x != null).Distinct(); - foreach (var material in materials) - { - if (material == null) - { - continue; - } - - if (material.shader.name == "Standard") - { - // standard - continue; - } - - if (UniGLTF.ShaderPropExporter.PreShaderPropExporter.UseUnlit(material.shader.name)) - { - // unlit - continue; - } - - if (UniGLTF.ShaderPropExporter.PreShaderPropExporter.VRMExtensionShaders.Contains(material.shader.name)) - { - // VRM supported - continue; - } - - yield return Validation.Warning($"Material: {material.name}. Unknown Shader: \"{material.shader.name}\" is used. {ValidationMessages.UNKNOWN_SHADER.Msg()}"); - } - } - } -} diff --git a/Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/MaterialValidator.cs.meta b/Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/MaterialValidator.cs.meta deleted file mode 100644 index 6cc33b3947..0000000000 --- a/Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/MaterialValidator.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: aa8f593f0ade99a4d9cc23947cdded6e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/Runtime/UniGLTF.asmdef b/Assets/UniGLTF/Runtime/UniGLTF.asmdef index c43bea13cb..6eee713b33 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF.asmdef +++ b/Assets/UniGLTF/Runtime/UniGLTF.asmdef @@ -1,16 +1,16 @@ { "name": "UniGLTF", "references": [ - "UniUnlit", - "ShaderProperty.Runtime", - "VRMShaders" + "VRMShaders.GLTF.IO.Runtime", + "VRMShaders.GLTF.UniUnlit.Runtime" ], - "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": false, "precompiledReferences": [], "autoReferenced": true, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef b/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef index bb5646ef08..e19102640b 100644 --- a/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef +++ b/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef @@ -3,19 +3,24 @@ "references": [ "UniGLTF", "UniGLTF.Editor", - "VRMShaders", - "VRMShaders.Editor" - ], - "optionalUnityReferences": [ - "TestAssemblies" + "UnityEngine.TestRunner", + "UnityEditor.TestRunner", + "VRMShaders.GLTF.IO.Runtime", + "VRMShaders.GLTF.IO.Editor" ], "includePlatforms": [ "Editor" ], "excludePlatforms": [], "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [] + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll" + ], + "autoReferenced": false, + "defineConstraints": [ + "UNITY_INCLUDE_TESTS" + ], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRM.Samples/Editor/Tests/VRM.Samples.Editor.Tests.asmdef b/Assets/VRM.Samples/Editor/Tests/VRM.Samples.Editor.Tests.asmdef index 813b970b47..31e323af45 100644 --- a/Assets/VRM.Samples/Editor/Tests/VRM.Samples.Editor.Tests.asmdef +++ b/Assets/VRM.Samples/Editor/Tests/VRM.Samples.Editor.Tests.asmdef @@ -7,19 +7,24 @@ "UniGLTF", "UniVRM.Editor", "VRM.Tests", - "VRMShaders", - "VRMShaders.Editor" - ], - "optionalUnityReferences": [ - "TestAssemblies" + "UnityEngine.TestRunner", + "UnityEditor.TestRunner", + "VRMShaders.GLTF.IO.Runtime", + "VRMShaders.GLTF.IO.Editor" ], "includePlatforms": [ "Editor" ], "excludePlatforms": [], "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [] + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll" + ], + "autoReferenced": false, + "defineConstraints": [ + "UNITY_INCLUDE_TESTS" + ], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRM.Samples/VRM.Samples.asmdef b/Assets/VRM.Samples/VRM.Samples.asmdef index de2c46ae47..7019a6e74f 100644 --- a/Assets/VRM.Samples/VRM.Samples.asmdef +++ b/Assets/VRM.Samples/VRM.Samples.asmdef @@ -4,14 +4,15 @@ "VRM", "UniHumanoid", "UniGLTF", - "VRMShaders" + "VRMShaders.GLTF.IO.Runtime" ], - "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": false, "precompiledReferences": [], "autoReferenced": true, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRM/Editor/VRM.Editor.asmdef b/Assets/VRM/Editor/VRM.Editor.asmdef index 0cdfce423a..07a1a0ec1e 100644 --- a/Assets/VRM/Editor/VRM.Editor.asmdef +++ b/Assets/VRM/Editor/VRM.Editor.asmdef @@ -6,12 +6,11 @@ "MeshUtility", "MeshUtility.Editor", "UniUnlit", + "VRMShaders.GLTF.IO.Runtime", + "VRMShaders.GLTF.IO.Editor", "UniGLTF", - "UniGLTF.Editor", - "VRMShaders", - "VRMShaders.Editor" + "UniGLTF.Editor" ], - "optionalUnityReferences": [], "includePlatforms": [ "Editor" ], @@ -20,5 +19,7 @@ "overrideReferences": false, "precompiledReferences": [], "autoReferenced": true, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRM/Resources/Shaders/VRMShaders.shadervariants b/Assets/VRM/Resources/Shaders/VRMShaders.shadervariants deleted file mode 100644 index dc5583ce34..0000000000 --- a/Assets/VRM/Resources/Shaders/VRMShaders.shadervariants +++ /dev/null @@ -1,33 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!200 &20000000 -ShaderVariantCollection: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: VRMShaders - m_Shaders: - data: - first: {fileID: 4800000, guid: 1a70c9898704e1a4691843883f5101af, type: 3} - second: - variants: [] - data: - first: {fileID: 4800000, guid: 429a3203ab2959741aab76fa2856b450, type: 3} - second: - variants: [] - data: - first: {fileID: 4800000, guid: 4c9ce97af40038f45811fc4b0975a483, type: 3} - second: - variants: [] - data: - first: {fileID: 4800000, guid: 8c17b56f4bf084c47872edcb95237e4a, type: 3} - second: - variants: [] - data: - first: {fileID: 4800000, guid: df359ad0838642d4fa0339514fcbbb2d, type: 3} - second: - variants: [] - data: - first: {fileID: 4800000, guid: 1a97144e4ad27a04aafd70f7b915cedb, type: 3} - second: - variants: [] diff --git a/Assets/VRM/Runtime/VRM.asmdef b/Assets/VRM/Runtime/VRM.asmdef index 3d408ffc89..d48d35e2bd 100644 --- a/Assets/VRM/Runtime/VRM.asmdef +++ b/Assets/VRM/Runtime/VRM.asmdef @@ -2,19 +2,20 @@ "name": "VRM", "references": [ "MToon", - "UniUnlit", "UniHumanoid", - "ShaderProperty.Runtime", "MeshUtility", "UniGLTF", - "VRMShaders" + "VRMShaders.GLTF.IO.Runtime", + "UniUnlit", + "VRMShaders.VRM.IO.Runtime" ], - "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": false, "precompiledReferences": [], "autoReferenced": true, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRM/Tests/VRM.Tests.asmdef b/Assets/VRM/Tests/VRM.Tests.asmdef index de7e2bdab9..104cbed420 100644 --- a/Assets/VRM/Tests/VRM.Tests.asmdef +++ b/Assets/VRM/Tests/VRM.Tests.asmdef @@ -5,19 +5,24 @@ "UniGLTF", "MeshUtility", "MeshUtility.Editor", - "VRMShaders", - "VRMShaders.Editor" - ], - "optionalUnityReferences": [ - "TestAssemblies" + "UnityEngine.TestRunner", + "UnityEditor.TestRunner", + "VRMShaders.GLTF.IO.Runtime", + "VRMShaders.GLTF.IO.Editor" ], "includePlatforms": [ "Editor" ], "excludePlatforms": [], "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [] + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll" + ], + "autoReferenced": false, + "defineConstraints": [ + "UNITY_INCLUDE_TESTS" + ], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRM10/Editor/VRM10.Editor.asmdef b/Assets/VRM10/Editor/VRM10.Editor.asmdef index ad11988fe9..639e0eda8e 100644 --- a/Assets/VRM10/Editor/VRM10.Editor.asmdef +++ b/Assets/VRM10/Editor/VRM10.Editor.asmdef @@ -7,9 +7,9 @@ "MeshUtility.Editor", "UniGLTF.Editor", "UniGLTF", - "VRMShaders" + "VRMShaders.GLTF.IO.Runtime", + "VRMShaders.GLTF.IO.Editor" ], - "optionalUnityReferences": [], "includePlatforms": [ "Editor" ], @@ -18,5 +18,7 @@ "overrideReferences": false, "precompiledReferences": [], "autoReferenced": true, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRM10/Runtime/VRM10.asmdef b/Assets/VRM10/Runtime/VRM10.asmdef index de687fb35f..da10c463f9 100644 --- a/Assets/VRM10/Runtime/VRM10.asmdef +++ b/Assets/VRM10/Runtime/VRM10.asmdef @@ -7,14 +7,15 @@ "MeshUtility", "MeshUtility.Editor", "UniGLTF", - "VRMShaders" + "VRMShaders.GLTF.IO.Runtime" ], - "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": false, "precompiledReferences": [], "autoReferenced": true, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRM10/Tests.PlayMode/VRM10.Tests.PlayMode.asmdef b/Assets/VRM10/Tests.PlayMode/VRM10.Tests.PlayMode.asmdef index 032941920c..e3e9186fde 100644 --- a/Assets/VRM10/Tests.PlayMode/VRM10.Tests.PlayMode.asmdef +++ b/Assets/VRM10/Tests.PlayMode/VRM10.Tests.PlayMode.asmdef @@ -4,16 +4,21 @@ "VrmLib", "VRM10", "UniGLTF", - "VRMShaders" - ], - "optionalUnityReferences": [ - "TestAssemblies" + "UnityEngine.TestRunner", + "UnityEditor.TestRunner", + "VRMShaders.GLTF.IO.Runtime" ], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll" + ], "autoReferenced": false, - "defineConstraints": [] + "defineConstraints": [ + "UNITY_INCLUDE_TESTS" + ], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRMShaders/ShaderProperty.meta b/Assets/VRMShaders/GLTF.meta similarity index 77% rename from Assets/VRMShaders/ShaderProperty.meta rename to Assets/VRMShaders/GLTF.meta index 4b06ef7bec..da2660e130 100644 --- a/Assets/VRMShaders/ShaderProperty.meta +++ b/Assets/VRMShaders/GLTF.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f877649750df3814aa5272250b22678c +guid: 3b19641943478e4459a38dcd6eeb86f3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/VRMShaders/GLTF/IO.meta b/Assets/VRMShaders/GLTF/IO.meta new file mode 100644 index 0000000000..9a32289e5c --- /dev/null +++ b/Assets/VRMShaders/GLTF/IO.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 817051ccab3a4cc4986dc955681fac6f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRMShaders/Editor.meta b/Assets/VRMShaders/GLTF/IO/Editor.meta similarity index 100% rename from Assets/VRMShaders/Editor.meta rename to Assets/VRMShaders/GLTF/IO/Editor.meta diff --git a/Assets/VRMShaders/Editor/AssetTextureUtil.cs b/Assets/VRMShaders/GLTF/IO/Editor/AssetTextureUtil.cs similarity index 100% rename from Assets/VRMShaders/Editor/AssetTextureUtil.cs rename to Assets/VRMShaders/GLTF/IO/Editor/AssetTextureUtil.cs diff --git a/Assets/VRMShaders/Editor/AssetTextureUtil.cs.meta b/Assets/VRMShaders/GLTF/IO/Editor/AssetTextureUtil.cs.meta similarity index 100% rename from Assets/VRMShaders/Editor/AssetTextureUtil.cs.meta rename to Assets/VRMShaders/GLTF/IO/Editor/AssetTextureUtil.cs.meta diff --git a/Assets/VRMShaders/Editor/VRMShaders.Editor.asmdef b/Assets/VRMShaders/GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef similarity index 55% rename from Assets/VRMShaders/Editor/VRMShaders.Editor.asmdef rename to Assets/VRMShaders/GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef index c5a5ece209..175af88d24 100644 --- a/Assets/VRMShaders/Editor/VRMShaders.Editor.asmdef +++ b/Assets/VRMShaders/GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef @@ -1,7 +1,6 @@ { - "name": "VRMShaders.Editor", + "name": "VRMShaders.GLTF.IO.Editor", "references": [], - "optionalUnityReferences": [], "includePlatforms": [ "Editor" ], @@ -9,6 +8,8 @@ "allowUnsafeCode": false, "overrideReferences": false, "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [] + "autoReferenced": false, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRMShaders/Editor/VRMShaders.Editor.asmdef.meta b/Assets/VRMShaders/GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef.meta similarity index 100% rename from Assets/VRMShaders/Editor/VRMShaders.Editor.asmdef.meta rename to Assets/VRMShaders/GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef.meta diff --git a/Assets/VRMShaders/Runtime.meta b/Assets/VRMShaders/GLTF/IO/Runtime.meta similarity index 100% rename from Assets/VRMShaders/Runtime.meta rename to Assets/VRMShaders/GLTF/IO/Runtime.meta diff --git a/Assets/VRMShaders/Runtime/MaterialFactory.cs b/Assets/VRMShaders/GLTF/IO/Runtime/MaterialFactory.cs similarity index 100% rename from Assets/VRMShaders/Runtime/MaterialFactory.cs rename to Assets/VRMShaders/GLTF/IO/Runtime/MaterialFactory.cs diff --git a/Assets/VRMShaders/Runtime/MaterialFactory.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/MaterialFactory.cs.meta similarity index 100% rename from Assets/VRMShaders/Runtime/MaterialFactory.cs.meta rename to Assets/VRMShaders/GLTF/IO/Runtime/MaterialFactory.cs.meta diff --git a/Assets/VRMShaders/Runtime/MaterialImportParam.cs b/Assets/VRMShaders/GLTF/IO/Runtime/MaterialImportParam.cs similarity index 100% rename from Assets/VRMShaders/Runtime/MaterialImportParam.cs rename to Assets/VRMShaders/GLTF/IO/Runtime/MaterialImportParam.cs diff --git a/Assets/VRMShaders/Runtime/MaterialImportParam.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/MaterialImportParam.cs.meta similarity index 100% rename from Assets/VRMShaders/Runtime/MaterialImportParam.cs.meta rename to Assets/VRMShaders/GLTF/IO/Runtime/MaterialImportParam.cs.meta diff --git a/Assets/VRMShaders/Runtime/NormalConverter.cs b/Assets/VRMShaders/GLTF/IO/Runtime/NormalConverter.cs similarity index 100% rename from Assets/VRMShaders/Runtime/NormalConverter.cs rename to Assets/VRMShaders/GLTF/IO/Runtime/NormalConverter.cs diff --git a/Assets/VRMShaders/Runtime/NormalConverter.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/NormalConverter.cs.meta similarity index 100% rename from Assets/VRMShaders/Runtime/NormalConverter.cs.meta rename to Assets/VRMShaders/GLTF/IO/Runtime/NormalConverter.cs.meta diff --git a/Assets/VRMShaders/Runtime/OcclusionMetallicRoughnessConverter.cs b/Assets/VRMShaders/GLTF/IO/Runtime/OcclusionMetallicRoughnessConverter.cs similarity index 100% rename from Assets/VRMShaders/Runtime/OcclusionMetallicRoughnessConverter.cs rename to Assets/VRMShaders/GLTF/IO/Runtime/OcclusionMetallicRoughnessConverter.cs diff --git a/Assets/VRMShaders/Runtime/OcclusionMetallicRoughnessConverter.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/OcclusionMetallicRoughnessConverter.cs.meta similarity index 100% rename from Assets/VRMShaders/Runtime/OcclusionMetallicRoughnessConverter.cs.meta rename to Assets/VRMShaders/GLTF/IO/Runtime/OcclusionMetallicRoughnessConverter.cs.meta diff --git a/Assets/VRMShaders/Runtime/SamplerParam.cs b/Assets/VRMShaders/GLTF/IO/Runtime/SamplerParam.cs similarity index 100% rename from Assets/VRMShaders/Runtime/SamplerParam.cs rename to Assets/VRMShaders/GLTF/IO/Runtime/SamplerParam.cs diff --git a/Assets/VRMShaders/Runtime/SamplerParam.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/SamplerParam.cs.meta similarity index 100% rename from Assets/VRMShaders/Runtime/SamplerParam.cs.meta rename to Assets/VRMShaders/GLTF/IO/Runtime/SamplerParam.cs.meta diff --git a/Assets/VRMShaders/Runtime/SamplerWrapTypes.cs b/Assets/VRMShaders/GLTF/IO/Runtime/SamplerWrapTypes.cs similarity index 100% rename from Assets/VRMShaders/Runtime/SamplerWrapTypes.cs rename to Assets/VRMShaders/GLTF/IO/Runtime/SamplerWrapTypes.cs diff --git a/Assets/VRMShaders/Runtime/SamplerWrapTypes.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/SamplerWrapTypes.cs.meta similarity index 100% rename from Assets/VRMShaders/Runtime/SamplerWrapTypes.cs.meta rename to Assets/VRMShaders/GLTF/IO/Runtime/SamplerWrapTypes.cs.meta diff --git a/Assets/VRMShaders/Runtime/TextureConverter.cs b/Assets/VRMShaders/GLTF/IO/Runtime/TextureConverter.cs similarity index 100% rename from Assets/VRMShaders/Runtime/TextureConverter.cs rename to Assets/VRMShaders/GLTF/IO/Runtime/TextureConverter.cs diff --git a/Assets/VRMShaders/Runtime/TextureConverter.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/TextureConverter.cs.meta similarity index 100% rename from Assets/VRMShaders/Runtime/TextureConverter.cs.meta rename to Assets/VRMShaders/GLTF/IO/Runtime/TextureConverter.cs.meta diff --git a/Assets/VRMShaders/Runtime/TextureExporter.cs b/Assets/VRMShaders/GLTF/IO/Runtime/TextureExporter.cs similarity index 100% rename from Assets/VRMShaders/Runtime/TextureExporter.cs rename to Assets/VRMShaders/GLTF/IO/Runtime/TextureExporter.cs diff --git a/Assets/VRMShaders/Runtime/TextureExporter.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/TextureExporter.cs.meta similarity index 100% rename from Assets/VRMShaders/Runtime/TextureExporter.cs.meta rename to Assets/VRMShaders/GLTF/IO/Runtime/TextureExporter.cs.meta diff --git a/Assets/VRMShaders/Runtime/TextureFactory.cs b/Assets/VRMShaders/GLTF/IO/Runtime/TextureFactory.cs similarity index 100% rename from Assets/VRMShaders/Runtime/TextureFactory.cs rename to Assets/VRMShaders/GLTF/IO/Runtime/TextureFactory.cs diff --git a/Assets/VRMShaders/Runtime/TextureFactory.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/TextureFactory.cs.meta similarity index 100% rename from Assets/VRMShaders/Runtime/TextureFactory.cs.meta rename to Assets/VRMShaders/GLTF/IO/Runtime/TextureFactory.cs.meta diff --git a/Assets/VRMShaders/Runtime/TextureImportName.cs b/Assets/VRMShaders/GLTF/IO/Runtime/TextureImportName.cs similarity index 100% rename from Assets/VRMShaders/Runtime/TextureImportName.cs rename to Assets/VRMShaders/GLTF/IO/Runtime/TextureImportName.cs diff --git a/Assets/VRMShaders/Runtime/TextureImportName.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/TextureImportName.cs.meta similarity index 100% rename from Assets/VRMShaders/Runtime/TextureImportName.cs.meta rename to Assets/VRMShaders/GLTF/IO/Runtime/TextureImportName.cs.meta diff --git a/Assets/VRMShaders/Runtime/TextureImportParam.cs b/Assets/VRMShaders/GLTF/IO/Runtime/TextureImportParam.cs similarity index 100% rename from Assets/VRMShaders/Runtime/TextureImportParam.cs rename to Assets/VRMShaders/GLTF/IO/Runtime/TextureImportParam.cs diff --git a/Assets/VRMShaders/Runtime/TextureImportParam.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/TextureImportParam.cs.meta similarity index 100% rename from Assets/VRMShaders/Runtime/TextureImportParam.cs.meta rename to Assets/VRMShaders/GLTF/IO/Runtime/TextureImportParam.cs.meta diff --git a/Assets/VRMShaders/Runtime/TextureImportTypes.cs b/Assets/VRMShaders/GLTF/IO/Runtime/TextureImportTypes.cs similarity index 100% rename from Assets/VRMShaders/Runtime/TextureImportTypes.cs rename to Assets/VRMShaders/GLTF/IO/Runtime/TextureImportTypes.cs diff --git a/Assets/VRMShaders/Runtime/TextureImportTypes.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/TextureImportTypes.cs.meta similarity index 100% rename from Assets/VRMShaders/Runtime/TextureImportTypes.cs.meta rename to Assets/VRMShaders/GLTF/IO/Runtime/TextureImportTypes.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef b/Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef new file mode 100644 index 0000000000..a0e6a1dc5b --- /dev/null +++ b/Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef @@ -0,0 +1,13 @@ +{ + "name": "VRMShaders.GLTF.IO.Runtime", + "references": [], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": false, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/VRMShaders/Runtime/VRMShaders.asmdef.meta b/Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef.meta similarity index 100% rename from Assets/VRMShaders/Runtime/VRMShaders.asmdef.meta rename to Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef.meta diff --git a/Assets/VRMShaders/Tests.meta b/Assets/VRMShaders/GLTF/IO/Tests.meta similarity index 100% rename from Assets/VRMShaders/Tests.meta rename to Assets/VRMShaders/GLTF/IO/Tests.meta diff --git a/Assets/VRMShaders/Tests/MetallicRoughnessConverterTests.cs b/Assets/VRMShaders/GLTF/IO/Tests/MetallicRoughnessConverterTests.cs similarity index 100% rename from Assets/VRMShaders/Tests/MetallicRoughnessConverterTests.cs rename to Assets/VRMShaders/GLTF/IO/Tests/MetallicRoughnessConverterTests.cs diff --git a/Assets/VRMShaders/Tests/MetallicRoughnessConverterTests.cs.meta b/Assets/VRMShaders/GLTF/IO/Tests/MetallicRoughnessConverterTests.cs.meta similarity index 100% rename from Assets/VRMShaders/Tests/MetallicRoughnessConverterTests.cs.meta rename to Assets/VRMShaders/GLTF/IO/Tests/MetallicRoughnessConverterTests.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef b/Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef new file mode 100644 index 0000000000..eb41f813b7 --- /dev/null +++ b/Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef @@ -0,0 +1,24 @@ +{ + "name": "VRMShaders.GLTF.IO.Tests", + "references": [ + "VRMShaders.GLTF.IO.Runtime", + "VRMShaders.GLTF.IO.Editor", + "UnityEngine.TestRunner", + "UnityEditor.TestRunner" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll" + ], + "autoReferenced": false, + "defineConstraints": [ + "UNITY_INCLUDE_TESTS" + ], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/VRMShaders/Tests/VRMShaders.Tests.asmdef.meta b/Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef.meta similarity index 100% rename from Assets/VRMShaders/Tests/VRMShaders.Tests.asmdef.meta rename to Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef.meta diff --git a/Assets/VRMShaders/UniUnlit.meta b/Assets/VRMShaders/GLTF/UniUnlit.meta similarity index 100% rename from Assets/VRMShaders/UniUnlit.meta rename to Assets/VRMShaders/GLTF/UniUnlit.meta diff --git a/Assets/VRMShaders/UniUnlit/Editor.meta b/Assets/VRMShaders/GLTF/UniUnlit/Editor.meta similarity index 100% rename from Assets/VRMShaders/UniUnlit/Editor.meta rename to Assets/VRMShaders/GLTF/UniUnlit/Editor.meta diff --git a/Assets/VRMShaders/UniUnlit/Editor/UniUnlitEditor.cs b/Assets/VRMShaders/GLTF/UniUnlit/Editor/UniUnlitEditor.cs similarity index 100% rename from Assets/VRMShaders/UniUnlit/Editor/UniUnlitEditor.cs rename to Assets/VRMShaders/GLTF/UniUnlit/Editor/UniUnlitEditor.cs diff --git a/Assets/VRMShaders/UniUnlit/Editor/UniUnlitEditor.cs.meta b/Assets/VRMShaders/GLTF/UniUnlit/Editor/UniUnlitEditor.cs.meta similarity index 100% rename from Assets/VRMShaders/UniUnlit/Editor/UniUnlitEditor.cs.meta rename to Assets/VRMShaders/GLTF/UniUnlit/Editor/UniUnlitEditor.cs.meta diff --git a/Assets/VRMShaders/GLTF/UniUnlit/Editor/VRMShaders.GLTF.UniUnlit.Editor.asmdef b/Assets/VRMShaders/GLTF/UniUnlit/Editor/VRMShaders.GLTF.UniUnlit.Editor.asmdef new file mode 100644 index 0000000000..89999f43be --- /dev/null +++ b/Assets/VRMShaders/GLTF/UniUnlit/Editor/VRMShaders.GLTF.UniUnlit.Editor.asmdef @@ -0,0 +1,17 @@ +{ + "name": "VRMShaders.GLTF.UniUnlit.Editor", + "references": [ + "VRMShaders.GLTF.UniUnlit.Runtime" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": false, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/VRMShaders/UniUnlit/Editor/UniUnlit.Editor.asmdef.meta b/Assets/VRMShaders/GLTF/UniUnlit/Editor/VRMShaders.GLTF.UniUnlit.Editor.asmdef.meta similarity index 100% rename from Assets/VRMShaders/UniUnlit/Editor/UniUnlit.Editor.asmdef.meta rename to Assets/VRMShaders/GLTF/UniUnlit/Editor/VRMShaders.GLTF.UniUnlit.Editor.asmdef.meta diff --git a/Assets/VRMShaders/UniUnlit/Resources.meta b/Assets/VRMShaders/GLTF/UniUnlit/Resources.meta similarity index 100% rename from Assets/VRMShaders/UniUnlit/Resources.meta rename to Assets/VRMShaders/GLTF/UniUnlit/Resources.meta diff --git a/Assets/VRMShaders/UniUnlit/Resources/UniUnlit.shader b/Assets/VRMShaders/GLTF/UniUnlit/Resources/UniUnlit.shader similarity index 100% rename from Assets/VRMShaders/UniUnlit/Resources/UniUnlit.shader rename to Assets/VRMShaders/GLTF/UniUnlit/Resources/UniUnlit.shader diff --git a/Assets/VRMShaders/UniUnlit/Resources/UniUnlit.shader.meta b/Assets/VRMShaders/GLTF/UniUnlit/Resources/UniUnlit.shader.meta similarity index 100% rename from Assets/VRMShaders/UniUnlit/Resources/UniUnlit.shader.meta rename to Assets/VRMShaders/GLTF/UniUnlit/Resources/UniUnlit.shader.meta diff --git a/Assets/VRMShaders/UniUnlit/Scripts.meta b/Assets/VRMShaders/GLTF/UniUnlit/Runtime.meta similarity index 100% rename from Assets/VRMShaders/UniUnlit/Scripts.meta rename to Assets/VRMShaders/GLTF/UniUnlit/Runtime.meta diff --git a/Assets/VRMShaders/UniUnlit/Scripts/Utils.cs b/Assets/VRMShaders/GLTF/UniUnlit/Runtime/Utils.cs similarity index 100% rename from Assets/VRMShaders/UniUnlit/Scripts/Utils.cs rename to Assets/VRMShaders/GLTF/UniUnlit/Runtime/Utils.cs diff --git a/Assets/VRMShaders/UniUnlit/Scripts/Utils.cs.meta b/Assets/VRMShaders/GLTF/UniUnlit/Runtime/Utils.cs.meta similarity index 100% rename from Assets/VRMShaders/UniUnlit/Scripts/Utils.cs.meta rename to Assets/VRMShaders/GLTF/UniUnlit/Runtime/Utils.cs.meta diff --git a/Assets/VRMShaders/GLTF/UniUnlit/Runtime/VRMShaders.GLTF.UniUnlit.Runtime.asmdef b/Assets/VRMShaders/GLTF/UniUnlit/Runtime/VRMShaders.GLTF.UniUnlit.Runtime.asmdef new file mode 100644 index 0000000000..b2fa1c3278 --- /dev/null +++ b/Assets/VRMShaders/GLTF/UniUnlit/Runtime/VRMShaders.GLTF.UniUnlit.Runtime.asmdef @@ -0,0 +1,13 @@ +{ + "name": "VRMShaders.GLTF.UniUnlit.Runtime", + "references": [], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": false, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/VRMShaders/UniUnlit/UniUnlit.asmdef.meta b/Assets/VRMShaders/GLTF/UniUnlit/Runtime/VRMShaders.GLTF.UniUnlit.Runtime.asmdef.meta similarity index 100% rename from Assets/VRMShaders/UniUnlit/UniUnlit.asmdef.meta rename to Assets/VRMShaders/GLTF/UniUnlit/Runtime/VRMShaders.GLTF.UniUnlit.Runtime.asmdef.meta diff --git a/Assets/VRMShaders/Runtime/VRMShaders.asmdef b/Assets/VRMShaders/Runtime/VRMShaders.asmdef deleted file mode 100644 index 6bc7e93fb8..0000000000 --- a/Assets/VRMShaders/Runtime/VRMShaders.asmdef +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "VRMShaders" -} diff --git a/Assets/VRMShaders/ShaderProperty/Editor/ShaderProperty.Editor.asmdef b/Assets/VRMShaders/ShaderProperty/Editor/ShaderProperty.Editor.asmdef deleted file mode 100644 index 382622a74d..0000000000 --- a/Assets/VRMShaders/ShaderProperty/Editor/ShaderProperty.Editor.asmdef +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "ShaderProperty.Editor", - "references": [ - "ShaderProperty.Runtime" - ], - "optionalUnityReferences": [], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false -} \ No newline at end of file diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/ShaderProperty.Runtime.asmdef b/Assets/VRMShaders/ShaderProperty/Runtime/ShaderProperty.Runtime.asmdef deleted file mode 100644 index ed0a498d01..0000000000 --- a/Assets/VRMShaders/ShaderProperty/Runtime/ShaderProperty.Runtime.asmdef +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "ShaderProperty.Runtime", - "references": [], - "optionalUnityReferences": [], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false -} \ No newline at end of file diff --git a/Assets/VRMShaders/UniUnlit/Editor/UniUnlit.Editor.asmdef b/Assets/VRMShaders/UniUnlit/Editor/UniUnlit.Editor.asmdef deleted file mode 100644 index 564a54cc05..0000000000 --- a/Assets/VRMShaders/UniUnlit/Editor/UniUnlit.Editor.asmdef +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "UniUnlit.Editor", - "references": [ - "UniUnlit" - ], - "optionalUnityReferences": [], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false -} \ No newline at end of file diff --git a/Assets/VRMShaders/UniUnlit/UniUnlit.asmdef b/Assets/VRMShaders/UniUnlit/UniUnlit.asmdef deleted file mode 100644 index e58648d56b..0000000000 --- a/Assets/VRMShaders/UniUnlit/UniUnlit.asmdef +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "UniUnlit" -} diff --git a/Assets/VRMShaders/VRM.meta b/Assets/VRMShaders/VRM.meta new file mode 100644 index 0000000000..2022a2d8bb --- /dev/null +++ b/Assets/VRMShaders/VRM.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 67bc2cd71cccda64bba542dc0d8c2c9f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRMShaders/VRM/IO.meta b/Assets/VRMShaders/VRM/IO.meta new file mode 100644 index 0000000000..59eb885b73 --- /dev/null +++ b/Assets/VRMShaders/VRM/IO.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85f7c43c499b9f74d9a8e16f42d44492 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRMShaders/ShaderProperty/Editor.meta b/Assets/VRMShaders/VRM/IO/Editor.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Editor.meta rename to Assets/VRMShaders/VRM/IO/Editor.meta diff --git a/Assets/VRMShaders/ShaderProperty/Editor/ShaderPropMenu.cs b/Assets/VRMShaders/VRM/IO/Editor/ShaderPropMenu.cs similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Editor/ShaderPropMenu.cs rename to Assets/VRMShaders/VRM/IO/Editor/ShaderPropMenu.cs diff --git a/Assets/VRMShaders/ShaderProperty/Editor/ShaderPropMenu.cs.meta b/Assets/VRMShaders/VRM/IO/Editor/ShaderPropMenu.cs.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Editor/ShaderPropMenu.cs.meta rename to Assets/VRMShaders/VRM/IO/Editor/ShaderPropMenu.cs.meta diff --git a/Assets/VRMShaders/Tests/VRMShaders.Tests.asmdef b/Assets/VRMShaders/VRM/IO/Editor/VRMShaders.VRM.IO.Editor.asmdef similarity index 57% rename from Assets/VRMShaders/Tests/VRMShaders.Tests.asmdef rename to Assets/VRMShaders/VRM/IO/Editor/VRMShaders.VRM.IO.Editor.asmdef index a2a91ba59c..69b6cad383 100644 --- a/Assets/VRMShaders/Tests/VRMShaders.Tests.asmdef +++ b/Assets/VRMShaders/VRM/IO/Editor/VRMShaders.VRM.IO.Editor.asmdef @@ -1,11 +1,7 @@ { - "name": "VRMShaders.Tests", + "name": "VRMShaders.VRM.IO.Editor", "references": [ - "VRMShaders", - "VRMShaders.Editor" - ], - "optionalUnityReferences": [ - "TestAssemblies" + "VRMShaders.VRM.IO.Runtime" ], "includePlatforms": [ "Editor" @@ -15,5 +11,7 @@ "overrideReferences": false, "precompiledReferences": [], "autoReferenced": false, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRMShaders/ShaderProperty/Editor/ShaderProperty.Editor.asmdef.meta b/Assets/VRMShaders/VRM/IO/Editor/VRMShaders.VRM.IO.Editor.asmdef.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Editor/ShaderProperty.Editor.asmdef.meta rename to Assets/VRMShaders/VRM/IO/Editor/VRMShaders.VRM.IO.Editor.asmdef.meta diff --git a/Assets/VRMShaders/ShaderProperty/Runtime.meta b/Assets/VRMShaders/VRM/IO/Runtime.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime.meta rename to Assets/VRMShaders/VRM/IO/Runtime.meta diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/GLTF.meta b/Assets/VRMShaders/VRM/IO/Runtime/GLTF.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/GLTF.meta rename to Assets/VRMShaders/VRM/IO/Runtime/GLTF.meta diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/PreExportShaders_GLTF.cs b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/PreExportShaders_GLTF.cs similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/GLTF/PreExportShaders_GLTF.cs rename to Assets/VRMShaders/VRM/IO/Runtime/GLTF/PreExportShaders_GLTF.cs diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/PreExportShaders_GLTF.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/PreExportShaders_GLTF.cs.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/GLTF/PreExportShaders_GLTF.cs.meta rename to Assets/VRMShaders/VRM/IO/Runtime/GLTF/PreExportShaders_GLTF.cs.meta diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Standard.cs b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Standard.cs similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Standard.cs rename to Assets/VRMShaders/VRM/IO/Runtime/GLTF/Standard.cs diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Standard.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Standard.cs.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Standard.cs.meta rename to Assets/VRMShaders/VRM/IO/Runtime/GLTF/Standard.cs.meta diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/UniGLTF_UniUnlit.cs b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/UniGLTF_UniUnlit.cs similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/GLTF/UniGLTF_UniUnlit.cs rename to Assets/VRMShaders/VRM/IO/Runtime/GLTF/UniGLTF_UniUnlit.cs diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/UniGLTF_UniUnlit.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/UniGLTF_UniUnlit.cs.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/GLTF/UniGLTF_UniUnlit.cs.meta rename to Assets/VRMShaders/VRM/IO/Runtime/GLTF/UniGLTF_UniUnlit.cs.meta diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Color.cs b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Color.cs similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Color.cs rename to Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Color.cs diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Color.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Color.cs.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Color.cs.meta rename to Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Color.cs.meta diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Texture.cs b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Texture.cs similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Texture.cs rename to Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Texture.cs diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Texture.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Texture.cs.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Texture.cs.meta rename to Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Texture.cs.meta diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Transparent.cs b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent.cs similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Transparent.cs rename to Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent.cs diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Transparent.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent.cs.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Transparent.cs.meta rename to Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent.cs.meta diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Transparent_Cutout.cs b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent_Cutout.cs similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Transparent_Cutout.cs rename to Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent_Cutout.cs diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Transparent_Cutout.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent_Cutout.cs.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Transparent_Cutout.cs.meta rename to Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent_Cutout.cs.meta diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/PreShaderPropExporter.cs b/Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs similarity index 79% rename from Assets/VRMShaders/ShaderProperty/Runtime/PreShaderPropExporter.cs rename to Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs index 0d85607748..8bc5988cbc 100644 --- a/Assets/VRMShaders/ShaderProperty/Runtime/PreShaderPropExporter.cs +++ b/Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs @@ -27,23 +27,6 @@ public SupportedShader(string targetFolder, string shaderName) public static partial class PreShaderPropExporter { - public static bool UseUnlit(string shaderName) - { - switch (shaderName) - { - case "Unlit/Color": - case "Unlit/Texture": - case "Unlit/Transparent": - case "Unlit/Transparent Cutout": - case "UniGLTF/UniUnlit": - case "VRM/UnlitTexture": - case "VRM/UnlitTransparent": - case "VRM/UnlitCutout": - return true; - } - return false; - } - public static readonly string[] VRMExtensionShaders = new string[] { "VRM/UnlitTransparentZWrite", diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/PreShaderPropExporter.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/PreShaderPropExporter.cs.meta rename to Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs.meta diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/ShaderProps.cs b/Assets/VRMShaders/VRM/IO/Runtime/ShaderProps.cs similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/ShaderProps.cs rename to Assets/VRMShaders/VRM/IO/Runtime/ShaderProps.cs diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/ShaderProps.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/ShaderProps.cs.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/ShaderProps.cs.meta rename to Assets/VRMShaders/VRM/IO/Runtime/ShaderProps.cs.meta diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/VRM.meta b/Assets/VRMShaders/VRM/IO/Runtime/VRM.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/VRM.meta rename to Assets/VRMShaders/VRM/IO/Runtime/VRM.meta diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/VRM/PreExportShaders_VRM.cs b/Assets/VRMShaders/VRM/IO/Runtime/VRM/PreExportShaders_VRM.cs similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/VRM/PreExportShaders_VRM.cs rename to Assets/VRMShaders/VRM/IO/Runtime/VRM/PreExportShaders_VRM.cs diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/VRM/PreExportShaders_VRM.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/VRM/PreExportShaders_VRM.cs.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/VRM/PreExportShaders_VRM.cs.meta rename to Assets/VRMShaders/VRM/IO/Runtime/VRM/PreExportShaders_VRM.cs.meta diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_MToon.cs b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_MToon.cs similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_MToon.cs rename to Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_MToon.cs diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_MToon.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_MToon.cs.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_MToon.cs.meta rename to Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_MToon.cs.meta diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitCutout.cs b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitCutout.cs similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitCutout.cs rename to Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitCutout.cs diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitCutout.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitCutout.cs.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitCutout.cs.meta rename to Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitCutout.cs.meta diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTexture.cs b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTexture.cs similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTexture.cs rename to Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTexture.cs diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTexture.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTexture.cs.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTexture.cs.meta rename to Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTexture.cs.meta diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTransparent.cs b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparent.cs similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTransparent.cs rename to Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparent.cs diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTransparent.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparent.cs.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTransparent.cs.meta rename to Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparent.cs.meta diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTransparentZWrite.cs b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparentZWrite.cs similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTransparentZWrite.cs rename to Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparentZWrite.cs diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTransparentZWrite.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparentZWrite.cs.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTransparentZWrite.cs.meta rename to Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparentZWrite.cs.meta diff --git a/Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef b/Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef new file mode 100644 index 0000000000..1afe036ef0 --- /dev/null +++ b/Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef @@ -0,0 +1,13 @@ +{ + "name": "VRMShaders.VRM.IO.Runtime", + "references": [], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": false, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/VRMShaders/ShaderProperty/Runtime/ShaderProperty.Runtime.asmdef.meta b/Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef.meta similarity index 100% rename from Assets/VRMShaders/ShaderProperty/Runtime/ShaderProperty.Runtime.asmdef.meta rename to Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef.meta diff --git a/Assets/VRMShaders/MToon b/Assets/VRMShaders/VRM/MToon similarity index 100% rename from Assets/VRMShaders/MToon rename to Assets/VRMShaders/VRM/MToon diff --git a/Assets/VRMShaders/MToon.meta b/Assets/VRMShaders/VRM/MToon.meta similarity index 100% rename from Assets/VRMShaders/MToon.meta rename to Assets/VRMShaders/VRM/MToon.meta diff --git a/Assets/VRMShaders/VRM/VRMShaders.shadervariants b/Assets/VRMShaders/VRM/VRMShaders.shadervariants new file mode 100644 index 0000000000..2c05885ec0 --- /dev/null +++ b/Assets/VRMShaders/VRM/VRMShaders.shadervariants @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!200 &20000000 +ShaderVariantCollection: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: VRMShaders + m_Shaders: + - first: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: [] + - first: {fileID: 4800000, guid: df359ad0838642d4fa0339514fcbbb2d, type: 3} + second: + variants: [] + - first: {fileID: 4800000, guid: 429a3203ab2959741aab76fa2856b450, type: 3} + second: + variants: [] + - first: {fileID: 4800000, guid: 1a70c9898704e1a4691843883f5101af, type: 3} + second: + variants: [] + - first: {fileID: 4800000, guid: 4c9ce97af40038f45811fc4b0975a483, type: 3} + second: + variants: [] + - first: {fileID: 4800000, guid: 1a97144e4ad27a04aafd70f7b915cedb, type: 3} + second: + variants: [] + - first: {fileID: 4800000, guid: 8c17b56f4bf084c47872edcb95237e4a, type: 3} + second: + variants: [] diff --git a/Assets/VRM/Resources/Shaders/VRMShaders.shadervariants.meta b/Assets/VRMShaders/VRM/VRMShaders.shadervariants.meta similarity index 100% rename from Assets/VRM/Resources/Shaders/VRMShaders.shadervariants.meta rename to Assets/VRMShaders/VRM/VRMShaders.shadervariants.meta diff --git a/Assets/VRMShaders/VRM/VrmUnlitShaders.meta b/Assets/VRMShaders/VRM/VrmUnlitShaders.meta new file mode 100644 index 0000000000..cc0e850e8b --- /dev/null +++ b/Assets/VRMShaders/VRM/VrmUnlitShaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e4e5d647657271d47a51cc53b6ee338c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRM/Resources.meta b/Assets/VRMShaders/VRM/VrmUnlitShaders/Resources.meta similarity index 100% rename from Assets/VRM/Resources.meta rename to Assets/VRMShaders/VRM/VrmUnlitShaders/Resources.meta diff --git a/Assets/VRM/Resources/Shaders.meta b/Assets/VRMShaders/VRM/VrmUnlitShaders/Resources/Shaders.meta similarity index 100% rename from Assets/VRM/Resources/Shaders.meta rename to Assets/VRMShaders/VRM/VrmUnlitShaders/Resources/Shaders.meta diff --git a/Assets/VRM/Resources/Shaders/VRMUnlitCutout.shader b/Assets/VRMShaders/VRM/VrmUnlitShaders/Resources/Shaders/VRMUnlitCutout.shader similarity index 100% rename from Assets/VRM/Resources/Shaders/VRMUnlitCutout.shader rename to Assets/VRMShaders/VRM/VrmUnlitShaders/Resources/Shaders/VRMUnlitCutout.shader diff --git a/Assets/VRM/Resources/Shaders/VRMUnlitCutout.shader.meta b/Assets/VRMShaders/VRM/VrmUnlitShaders/Resources/Shaders/VRMUnlitCutout.shader.meta similarity index 100% rename from Assets/VRM/Resources/Shaders/VRMUnlitCutout.shader.meta rename to Assets/VRMShaders/VRM/VrmUnlitShaders/Resources/Shaders/VRMUnlitCutout.shader.meta diff --git a/Assets/VRM/Resources/Shaders/VRMUnlitTexture.shader b/Assets/VRMShaders/VRM/VrmUnlitShaders/Resources/Shaders/VRMUnlitTexture.shader similarity index 100% rename from Assets/VRM/Resources/Shaders/VRMUnlitTexture.shader rename to Assets/VRMShaders/VRM/VrmUnlitShaders/Resources/Shaders/VRMUnlitTexture.shader diff --git a/Assets/VRM/Resources/Shaders/VRMUnlitTexture.shader.meta b/Assets/VRMShaders/VRM/VrmUnlitShaders/Resources/Shaders/VRMUnlitTexture.shader.meta similarity index 100% rename from Assets/VRM/Resources/Shaders/VRMUnlitTexture.shader.meta rename to Assets/VRMShaders/VRM/VrmUnlitShaders/Resources/Shaders/VRMUnlitTexture.shader.meta diff --git a/Assets/VRM/Resources/Shaders/VRMUnlitTransparent.shader b/Assets/VRMShaders/VRM/VrmUnlitShaders/Resources/Shaders/VRMUnlitTransparent.shader similarity index 100% rename from Assets/VRM/Resources/Shaders/VRMUnlitTransparent.shader rename to Assets/VRMShaders/VRM/VrmUnlitShaders/Resources/Shaders/VRMUnlitTransparent.shader diff --git a/Assets/VRM/Resources/Shaders/VRMUnlitTransparent.shader.meta b/Assets/VRMShaders/VRM/VrmUnlitShaders/Resources/Shaders/VRMUnlitTransparent.shader.meta similarity index 100% rename from Assets/VRM/Resources/Shaders/VRMUnlitTransparent.shader.meta rename to Assets/VRMShaders/VRM/VrmUnlitShaders/Resources/Shaders/VRMUnlitTransparent.shader.meta diff --git a/Assets/VRM/Resources/Shaders/VRMUnlitTransparentZWrite.shader b/Assets/VRMShaders/VRM/VrmUnlitShaders/Resources/Shaders/VRMUnlitTransparentZWrite.shader similarity index 100% rename from Assets/VRM/Resources/Shaders/VRMUnlitTransparentZWrite.shader rename to Assets/VRMShaders/VRM/VrmUnlitShaders/Resources/Shaders/VRMUnlitTransparentZWrite.shader diff --git a/Assets/VRM/Resources/Shaders/VRMUnlitTransparentZWrite.shader.meta b/Assets/VRMShaders/VRM/VrmUnlitShaders/Resources/Shaders/VRMUnlitTransparentZWrite.shader.meta similarity index 100% rename from Assets/VRM/Resources/Shaders/VRMUnlitTransparentZWrite.shader.meta rename to Assets/VRMShaders/VRM/VrmUnlitShaders/Resources/Shaders/VRMUnlitTransparentZWrite.shader.meta diff --git a/Assets/VRMShaders/VRM10.meta b/Assets/VRMShaders/VRM10.meta new file mode 100644 index 0000000000..5b091fcb2e --- /dev/null +++ b/Assets/VRMShaders/VRM10.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6fd2c7dcb3464e340814d2a7289e9790 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: