diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs index 8077b58b3..04a311fa9 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs @@ -59,7 +59,8 @@ namespace UniGLTF } else { - throw new Exception($"{key} is not converted."); + // throw new Exception($"{key} is not converted."); + Debug.LogWarning($"{key} is not converted."); } } diff --git a/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs index c5722da28..3c4d84a63 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs @@ -5,7 +5,7 @@ namespace UniGLTF { public const int MAJOR = 0; public const int MINOR = 124; - public const int PATCH = 1; - public const string VERSION = "0.124.1"; + public const int PATCH = 2; + public const string VERSION = "0.124.2"; } } diff --git a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs index 5d39040f9..e329b4d15 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs @@ -5,7 +5,7 @@ namespace UniGLTF { public const int MAJOR = 2; public const int MINOR = 60; - public const int PATCH = 1; - public const string VERSION = "2.60.1"; + public const int PATCH = 2; + public const string VERSION = "2.60.2"; } } diff --git a/Assets/UniGLTF/package.json b/Assets/UniGLTF/package.json index 768d743fb..5756de268 100644 --- a/Assets/UniGLTF/package.json +++ b/Assets/UniGLTF/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.gltf", - "version": "0.124.1", + "version": "0.124.2", "displayName": "UniGLTF", "description": "GLTF importer and exporter", "unity": "2021.3", @@ -11,7 +11,7 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.124.1", + "com.vrmc.vrmshaders": "0.124.2", "com.unity.modules.animation": "1.0.0" }, "samples": [ diff --git a/Assets/VRM/Editor/Format/VRMMaterialValidator.cs b/Assets/VRM/Editor/Format/VRMMaterialValidator.cs index 5d0cd30cf..f2734ed48 100644 --- a/Assets/VRM/Editor/Format/VRMMaterialValidator.cs +++ b/Assets/VRM/Editor/Format/VRMMaterialValidator.cs @@ -30,10 +30,10 @@ namespace VRM // // extensions.VRM.materialProperties に記録する // - var prop = UniGLTF.ShaderPropExporter.PreShaderPropExporter.GetPropsForMToon(); + var prop = PreShaderPropExporter.GetPropsForMToon(); foreach (var kv in prop.Properties) { - if (kv.ShaderPropertyType == UniGLTF.ShaderPropExporter.ShaderPropertyType.TexEnv) + if (kv.ShaderPropertyType == ShaderPropertyType.TexEnv) { yield return (kv.Key, m.GetTexture(kv.Key)); } diff --git a/Assets/VRM/Editor/VRM.Editor.asmdef b/Assets/VRM/Editor/VRM.Editor.asmdef index 1f917e647..0e11c34da 100644 --- a/Assets/VRM/Editor/VRM.Editor.asmdef +++ b/Assets/VRM/Editor/VRM.Editor.asmdef @@ -8,7 +8,6 @@ "GUID:7da8a75dcade2144aab699032d7d7987", "GUID:8d76e605759c3f64a957d63ef96ada7c", "GUID:5f875fdc81c40184c8333b9d63c6ddd5", - "GUID:301b251fd9834274c9228e0532f444f7", "GUID:1cd941934d098654fa21a13f28346412" ], "includePlatforms": [ diff --git a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/BuiltInVrmExtensionMaterialPropertyExporter.cs b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/BuiltInVrmExtensionMaterialPropertyExporter.cs index 84fb47e2a..fd4ab2da5 100644 --- a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/BuiltInVrmExtensionMaterialPropertyExporter.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/BuiltInVrmExtensionMaterialPropertyExporter.cs @@ -1,6 +1,5 @@ using System; using UniGLTF; -using UniGLTF.ShaderPropExporter; using UnityEngine; using VRMShaders; using ColorSpace = VRMShaders.ColorSpace; diff --git a/Assets/VRMShaders/VRM/IO.meta b/Assets/VRM/Runtime/IO/MaterialIO/MToon.meta similarity index 77% rename from Assets/VRMShaders/VRM/IO.meta rename to Assets/VRM/Runtime/IO/MaterialIO/MToon.meta index 59eb885b7..8b6089fe0 100644 --- a/Assets/VRMShaders/VRM/IO.meta +++ b/Assets/VRM/Runtime/IO/MaterialIO/MToon.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 85f7c43c499b9f74d9a8e16f42d44492 +guid: fbf9b693f6dfcb247abd30eec9c1092f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs b/Assets/VRM/Runtime/IO/MaterialIO/MToon/PreShaderPropExporter.cs similarity index 98% rename from Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs rename to Assets/VRM/Runtime/IO/MaterialIO/MToon/PreShaderPropExporter.cs index 50c6e6cf4..65b3c0fbf 100644 --- a/Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/MToon/PreShaderPropExporter.cs @@ -1,4 +1,4 @@ -namespace UniGLTF.ShaderPropExporter +namespace VRM { /// /// TODO: MToon にひきとってもらう diff --git a/Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs.meta b/Assets/VRM/Runtime/IO/MaterialIO/MToon/PreShaderPropExporter.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs.meta rename to Assets/VRM/Runtime/IO/MaterialIO/MToon/PreShaderPropExporter.cs.meta diff --git a/Assets/VRMShaders/VRM/IO/Runtime/ShaderProps.cs b/Assets/VRM/Runtime/IO/MaterialIO/MToon/ShaderProps.cs similarity index 98% rename from Assets/VRMShaders/VRM/IO/Runtime/ShaderProps.cs rename to Assets/VRM/Runtime/IO/MaterialIO/MToon/ShaderProps.cs index 36d9a8258..805b62573 100644 --- a/Assets/VRMShaders/VRM/IO/Runtime/ShaderProps.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/MToon/ShaderProps.cs @@ -5,8 +5,7 @@ using UnityEditor; using UnityEngine; #endif - -namespace UniGLTF.ShaderPropExporter +namespace VRM { public enum ShaderPropertyType { diff --git a/Assets/VRMShaders/VRM/IO/Runtime/ShaderProps.cs.meta b/Assets/VRM/Runtime/IO/MaterialIO/MToon/ShaderProps.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM/IO/Runtime/ShaderProps.cs.meta rename to Assets/VRM/Runtime/IO/MaterialIO/MToon/ShaderProps.cs.meta diff --git a/Assets/VRM/Runtime/VRM.asmdef b/Assets/VRM/Runtime/VRM.asmdef index e18ce1e85..ccd56a061 100644 --- a/Assets/VRM/Runtime/VRM.asmdef +++ b/Assets/VRM/Runtime/VRM.asmdef @@ -5,7 +5,6 @@ "GUID:b7aa47b240b57de44a4b2021c143c9bf", "GUID:8d76e605759c3f64a957d63ef96ada7c", "GUID:da3e51d19d51a544fa14d43fee843098", - "GUID:301b251fd9834274c9228e0532f444f7", "GUID:a9bc101fb0471f94a8f99fd242fdd934", "GUID:ac229b552c3025545b074203f857547c", "GUID:1cd941934d098654fa21a13f28346412", diff --git a/Assets/VRM/package.json b/Assets/VRM/package.json index e4bfac6f0..5e360c1be 100644 --- a/Assets/VRM/package.json +++ b/Assets/VRM/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.univrm", - "version": "0.124.1", + "version": "0.124.2", "displayName": "VRM", "description": "VRM importer", "unity": "2021.3", @@ -14,8 +14,8 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.124.1", - "com.vrmc.gltf": "0.124.1", + "com.vrmc.vrmshaders": "0.124.2", + "com.vrmc.gltf": "0.124.2", "com.unity.ugui": "1.0.0" }, "samples": [ diff --git a/Assets/VRM10/Editor/Vrm10SerializerGenerator.cs b/Assets/VRM10/Editor/Vrm10SerializerGenerator.cs index 184132e93..034f3b792 100644 --- a/Assets/VRM10/Editor/Vrm10SerializerGenerator.cs +++ b/Assets/VRM10/Editor/Vrm10SerializerGenerator.cs @@ -15,7 +15,7 @@ namespace UniVRM10 /// public static class Vrm10SerializerGenerator { - struct GenerateInfo + private struct GenerateInfo { public string JsonSchema; public string FormatDir; @@ -33,7 +33,8 @@ namespace UniVRM10 } } - const string SPEC_DIR = "vrm-specification/specification"; + private const string Vrm10SpecDir = "vrm-specification/specification"; + private const string Vrm10FormatGeneratedDir = "Assets/VRM10/Runtime/Format"; public static void Run(bool debug) { @@ -45,45 +46,44 @@ namespace UniVRM10 { // VRMC_hdr_emissiveMultiplier new GenerateInfo( - $"{SPEC_DIR}/VRMC_materials_hdr_emissiveMultiplier-1.0/schema/VRMC_materials_hdr_emissiveMultiplier.json", + $"{Vrm10SpecDir}/VRMC_materials_hdr_emissiveMultiplier-1.0/schema/VRMC_materials_hdr_emissiveMultiplier.json", "Assets/UniGLTF/Runtime/UniGLTF/Format/ExtensionsAndExtras/EmissiveMultiplier" ), // VRMC_vrm new GenerateInfo( - $"{SPEC_DIR}/VRMC_vrm-1.0/schema/VRMC_vrm.schema.json", - "Assets/VRM10/Runtime/Format/Vrm" + $"{Vrm10SpecDir}/VRMC_vrm-1.0/schema/VRMC_vrm.schema.json", + $"{Vrm10FormatGeneratedDir}/Vrm" ), // VRMC_materials_mtoon new GenerateInfo( - $"{SPEC_DIR}/VRMC_materials_mtoon-1.0/schema/VRMC_materials_mtoon.schema.json", - "Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon", - "Assets/VRM10/Runtime/Format/MaterialsMToon" + $"{Vrm10SpecDir}/VRMC_materials_mtoon-1.0/schema/VRMC_materials_mtoon.schema.json", + $"{Vrm10FormatGeneratedDir}/MaterialsMToon" ), // VRMC_springBone new GenerateInfo( - $"{SPEC_DIR}/VRMC_springBone-1.0/schema/VRMC_springBone.schema.json", - "Assets/VRM10/Runtime/Format/SpringBone" + $"{Vrm10SpecDir}/VRMC_springBone-1.0/schema/VRMC_springBone.schema.json", + $"{Vrm10FormatGeneratedDir}/SpringBone" ), // VRMC_node_constraint new GenerateInfo( - $"{SPEC_DIR}/VRMC_node_constraint-1.0/schema/VRMC_node_constraint.schema.json", - "Assets/VRM10/Runtime/Format/Constraints" + $"{Vrm10SpecDir}/VRMC_node_constraint-1.0/schema/VRMC_node_constraint.schema.json", + $"{Vrm10FormatGeneratedDir}/Constraints" ), // VRMC_animation new GenerateInfo( - $"{SPEC_DIR}/VRMC_vrm_animation-1.0/schema/VRMC_vrm_animation.schema.json", - "Assets/VRM10/Runtime/Format/Animation" + $"{Vrm10SpecDir}/VRMC_vrm_animation-1.0/schema/VRMC_vrm_animation.schema.json", + $"{Vrm10FormatGeneratedDir}/Animation" ), // VRMC_animation new GenerateInfo( - $"{SPEC_DIR}/VRMC_springBone_extended_collider-1.0/schema/VRMC_springBone_extended_collider.schema.json", - "Assets/VRM10/Runtime/Format/SpringBoneExtendedCollider" + $"{Vrm10SpecDir}/VRMC_springBone_extended_collider-1.0/schema/VRMC_springBone_extended_collider.schema.json", + $"{Vrm10FormatGeneratedDir}/SpringBoneExtendedCollider" ), }; diff --git a/Assets/VRMShaders/VRM10/MToon10.meta b/Assets/VRM10/MToon10.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10.meta rename to Assets/VRM10/MToon10.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor.meta b/Assets/VRM10/MToon10/Editor.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor.meta rename to Assets/VRM10/MToon10/Editor.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/EditorMenu.cs b/Assets/VRM10/MToon10/Editor/EditorMenu.cs similarity index 96% rename from Assets/VRMShaders/VRM10/MToon10/Editor/EditorMenu.cs rename to Assets/VRM10/MToon10/Editor/EditorMenu.cs index 4736e4b76..388891199 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/EditorMenu.cs +++ b/Assets/VRM10/MToon10/Editor/EditorMenu.cs @@ -2,7 +2,7 @@ using UnityEditor; using UnityEngine; -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRM10.MToon10.Editor { internal static class EditorMenu { diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/EditorMenu.cs.meta b/Assets/VRM10/MToon10/Editor/EditorMenu.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/EditorMenu.cs.meta rename to Assets/VRM10/MToon10/Editor/EditorMenu.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/LabelScope.cs b/Assets/VRM10/MToon10/Editor/LabelScope.cs similarity index 91% rename from Assets/VRMShaders/VRM10/MToon10/Editor/LabelScope.cs rename to Assets/VRM10/MToon10/Editor/LabelScope.cs index 29c7a973d..9afd7bac2 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/LabelScope.cs +++ b/Assets/VRM10/MToon10/Editor/LabelScope.cs @@ -2,7 +2,7 @@ using UnityEditor; using UnityEngine; -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRM10.MToon10.Editor { public readonly struct LabelScope : IDisposable { diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/LabelScope.cs.meta b/Assets/VRM10/MToon10/Editor/LabelScope.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/LabelScope.cs.meta rename to Assets/VRM10/MToon10/Editor/LabelScope.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToon10EditorEditMode.cs b/Assets/VRM10/MToon10/Editor/MToon10EditorEditMode.cs similarity index 66% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToon10EditorEditMode.cs rename to Assets/VRM10/MToon10/Editor/MToon10EditorEditMode.cs index 07855be10..21217a1f1 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/MToon10EditorEditMode.cs +++ b/Assets/VRM10/MToon10/Editor/MToon10EditorEditMode.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRM10.MToon10.Editor { public enum MToon10EditorEditMode { diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToon10EditorEditMode.cs.meta b/Assets/VRM10/MToon10/Editor/MToon10EditorEditMode.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToon10EditorEditMode.cs.meta rename to Assets/VRM10/MToon10/Editor/MToon10EditorEditMode.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonInspector.cs b/Assets/VRM10/MToon10/Editor/MToonInspector.cs similarity index 98% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonInspector.cs rename to Assets/VRM10/MToon10/Editor/MToonInspector.cs index da625d88a..0c8a3a05d 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonInspector.cs +++ b/Assets/VRM10/MToon10/Editor/MToonInspector.cs @@ -1,13 +1,10 @@ using System; -using System.Collections; -using System.Collections.Generic; using System.Linq; using UnityEditor; using UnityEngine; using UnityEngine.Rendering; -using VRMShaders.VRM10.MToon10.Runtime; -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRM10.MToon10.Editor { public sealed class MToonInspector : ShaderGUI { diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonInspector.cs.meta b/Assets/VRM10/MToon10/Editor/MToonInspector.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonInspector.cs.meta rename to Assets/VRM10/MToon10/Editor/MToonInspector.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/VRMShaders.VRM10.MToon10.Editor.asmdef b/Assets/VRM10/MToon10/Editor/VRM10.MToon10.Editor.asmdef similarity index 85% rename from Assets/VRMShaders/VRM10/MToon10/Editor/VRMShaders.VRM10.MToon10.Editor.asmdef rename to Assets/VRM10/MToon10/Editor/VRM10.MToon10.Editor.asmdef index f14e33bbc..20754f5c4 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/VRMShaders.VRM10.MToon10.Editor.asmdef +++ b/Assets/VRM10/MToon10/Editor/VRM10.MToon10.Editor.asmdef @@ -1,5 +1,6 @@ { - "name": "VRMShaders.VRM10.MToon10.Editor", + "name": "VRM10.MToon10.Editor", + "rootNamespace": "", "references": [ "GUID:0aaf403bd13871a44b7127aef2695ff8" ], diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/VRMShaders.VRM10.MToon10.Editor.asmdef.meta b/Assets/VRM10/MToon10/Editor/VRM10.MToon10.Editor.asmdef.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/VRMShaders.VRM10.MToon10.Editor.asmdef.meta rename to Assets/VRM10/MToon10/Editor/VRM10.MToon10.Editor.asmdef.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources.meta b/Assets/VRM10/MToon10/Resources.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources.meta rename to Assets/VRM10/MToon10/Resources.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10.meta b/Assets/VRM10/MToon10/Resources/VRM10.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10.meta rename to Assets/VRM10/MToon10/Resources/VRM10.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader similarity index 99% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader index 76e3d25a9..2a2f8f632 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader +++ b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader @@ -209,5 +209,5 @@ Shader "VRM10/MToon10" } } Fallback "Unlit/Texture" - CustomEditor "VRMShaders.VRM10.MToon10.Editor.MToonInspector" + CustomEditor "VRM10.MToon10.Editor.MToonInspector" } diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_attribute.hlsl b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_attribute.hlsl similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_attribute.hlsl rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_attribute.hlsl diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_attribute.hlsl.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_attribute.hlsl.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_attribute.hlsl.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_attribute.hlsl.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_define.hlsl b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_define.hlsl similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_define.hlsl rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_define.hlsl diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_define.hlsl.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_define.hlsl.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_define.hlsl.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_define.hlsl.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthnormals_fragment.hlsl b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthnormals_fragment.hlsl similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthnormals_fragment.hlsl rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthnormals_fragment.hlsl diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthnormals_fragment.hlsl.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthnormals_fragment.hlsl.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthnormals_fragment.hlsl.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthnormals_fragment.hlsl.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthnormals_vertex.hlsl b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthnormals_vertex.hlsl similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthnormals_vertex.hlsl rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthnormals_vertex.hlsl diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthnormals_vertex.hlsl.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthnormals_vertex.hlsl.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthnormals_vertex.hlsl.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthnormals_vertex.hlsl.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthonly_fragment.hlsl b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthonly_fragment.hlsl similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthonly_fragment.hlsl rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthonly_fragment.hlsl diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthonly_fragment.hlsl.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthonly_fragment.hlsl.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthonly_fragment.hlsl.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthonly_fragment.hlsl.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthonly_vertex.hlsl b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthonly_vertex.hlsl similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthonly_vertex.hlsl rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthonly_vertex.hlsl diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthonly_vertex.hlsl.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthonly_vertex.hlsl.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthonly_vertex.hlsl.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_depthonly_vertex.hlsl.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_fragment.hlsl b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_fragment.hlsl similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_fragment.hlsl rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_fragment.hlsl diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_fragment.hlsl.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_fragment.hlsl.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_fragment.hlsl.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_fragment.hlsl.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_vertex.hlsl b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_vertex.hlsl similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_vertex.hlsl rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_vertex.hlsl diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_vertex.hlsl.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_vertex.hlsl.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_vertex.hlsl.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_vertex.hlsl.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_alpha.hlsl b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_alpha.hlsl similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_alpha.hlsl rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_alpha.hlsl diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_alpha.hlsl.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_alpha.hlsl.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_alpha.hlsl.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_alpha.hlsl.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_normal.hlsl b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_normal.hlsl similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_normal.hlsl rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_normal.hlsl diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_normal.hlsl.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_normal.hlsl.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_normal.hlsl.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_normal.hlsl.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_uv.hlsl b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_uv.hlsl similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_uv.hlsl rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_uv.hlsl diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_uv.hlsl.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_uv.hlsl.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_uv.hlsl.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_uv.hlsl.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_vertex.hlsl b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_vertex.hlsl similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_vertex.hlsl rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_vertex.hlsl diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_vertex.hlsl.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_vertex.hlsl.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_vertex.hlsl.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_vertex.hlsl.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_mtoon.hlsl b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_mtoon.hlsl similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_mtoon.hlsl rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_mtoon.hlsl diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_mtoon.hlsl.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_mtoon.hlsl.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_mtoon.hlsl.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_mtoon.hlsl.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_unity.hlsl b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_unity.hlsl similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_unity.hlsl rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_unity.hlsl diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_unity.hlsl.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_unity.hlsl.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_unity.hlsl.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_unity.hlsl.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_render_pipeline.hlsl b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_render_pipeline.hlsl similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_render_pipeline.hlsl rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_render_pipeline.hlsl diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_render_pipeline.hlsl.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_render_pipeline.hlsl.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_render_pipeline.hlsl.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_render_pipeline.hlsl.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_shadowcaster_fragment.hlsl b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_shadowcaster_fragment.hlsl similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_shadowcaster_fragment.hlsl rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_shadowcaster_fragment.hlsl diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_shadowcaster_fragment.hlsl.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_shadowcaster_fragment.hlsl.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_shadowcaster_fragment.hlsl.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_shadowcaster_fragment.hlsl.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_shadowcaster_vertex.hlsl b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_shadowcaster_vertex.hlsl similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_shadowcaster_vertex.hlsl rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_shadowcaster_vertex.hlsl diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_shadowcaster_vertex.hlsl.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_shadowcaster_vertex.hlsl.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_shadowcaster_vertex.hlsl.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_shadowcaster_vertex.hlsl.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_urp.shader b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_urp.shader similarity index 99% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_urp.shader rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_urp.shader index 198661fc0..7144fed58 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_urp.shader +++ b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_urp.shader @@ -253,5 +253,5 @@ Shader "VRM10/Universal Render Pipeline/MToon10" } FallBack "Hidden/Universal Render Pipeline/FallbackError" - CustomEditor "VRMShaders.VRM10.MToon10.Editor.MToonInspector" + CustomEditor "VRM10.MToon10.Editor.MToonInspector" } diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_urp.shader.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_urp.shader.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_urp.shader.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_urp.shader.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_utility.hlsl b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_utility.hlsl similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_utility.hlsl rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_utility.hlsl diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_utility.hlsl.meta b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_utility.hlsl.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_utility.hlsl.meta rename to Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_utility.hlsl.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime.meta b/Assets/VRM10/MToon10/Runtime.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime.meta rename to Assets/VRM10/MToon10/Runtime.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/Extensions.meta b/Assets/VRM10/MToon10/Runtime/Extensions.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/Extensions.meta rename to Assets/VRM10/MToon10/Runtime/Extensions.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs b/Assets/VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs similarity index 98% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs rename to Assets/VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs index c44ded094..10189b45a 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs +++ b/Assets/VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public static class MaterialExtensions { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs.meta b/Assets/VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs.meta rename to Assets/VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X.meta b/Assets/VRM10/MToon10/Runtime/MToon0X.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X.meta rename to Assets/VRM10/MToon10/Runtime/MToon0X.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XDefinition.cs b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XDefinition.cs similarity index 98% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XDefinition.cs rename to Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XDefinition.cs index aebe2de99..dc24c4fab 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XDefinition.cs +++ b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XDefinition.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X +namespace VRM10.MToon10.MToon0X { public class MToon0XDefinition { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XDefinition.cs.meta b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XDefinition.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XDefinition.cs.meta rename to Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XDefinition.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XEnums.cs b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XEnums.cs similarity index 93% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XEnums.cs rename to Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XEnums.cs index babee5172..4637839d8 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XEnums.cs +++ b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XEnums.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X +namespace VRM10.MToon10.MToon0X { public enum MToon0XDebugMode { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XEnums.cs.meta b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XEnums.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XEnums.cs.meta rename to Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XEnums.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XUtils.cs b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtils.cs similarity index 98% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XUtils.cs rename to Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtils.cs index 485bdc875..5691dda6f 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XUtils.cs +++ b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtils.cs @@ -1,8 +1,7 @@ using System; -using UnityEngine; using UnityEngine.Rendering; -namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X +namespace VRM10.MToon10.MToon0X { public static partial class MToon0XUtils { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XUtils.cs.meta b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtils.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XUtils.cs.meta rename to Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtils.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsGetter.cs b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsGetter.cs similarity index 98% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsGetter.cs rename to Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsGetter.cs index 795ee2f8e..d6953a3e3 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsGetter.cs +++ b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsGetter.cs @@ -1,7 +1,6 @@ -using System; using UnityEngine; -namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X +namespace VRM10.MToon10.MToon0X { public static partial class MToon0XUtils { @@ -11,7 +10,7 @@ namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X { Meta = new MToon0XMetaDefinition { - Implementation = Implementation, + Implementation = MToon0XUtils.Implementation, VersionNumber = material.GetInt(PropVersion), }, Rendering = new MToon0XRenderingDefinition diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsGetter.cs.meta b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsGetter.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsGetter.cs.meta rename to Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsGetter.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsVersion.cs b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsVersion.cs similarity index 76% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsVersion.cs rename to Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsVersion.cs index bd8bb40aa..05a77372e 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsVersion.cs +++ b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsVersion.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X +namespace VRM10.MToon10.MToon0X { public static partial class MToon0XUtils { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsVersion.cs.meta b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsVersion.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsVersion.cs.meta rename to Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsVersion.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Context.cs b/Assets/VRM10/MToon10/Runtime/MToon10Context.cs similarity index 99% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Context.cs rename to Assets/VRM10/MToon10/Runtime/MToon10Context.cs index b48751b86..9ed39a28d 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Context.cs +++ b/Assets/VRM10/MToon10/Runtime/MToon10Context.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public sealed class MToon10Context { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Context.cs.meta b/Assets/VRM10/MToon10/Runtime/MToon10Context.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Context.cs.meta rename to Assets/VRM10/MToon10/Runtime/MToon10Context.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Migrator.cs b/Assets/VRM10/MToon10/Runtime/MToon10Migrator.cs similarity index 97% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Migrator.cs rename to Assets/VRM10/MToon10/Runtime/MToon10Migrator.cs index cd49fa111..c41fe36e7 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Migrator.cs +++ b/Assets/VRM10/MToon10/Runtime/MToon10Migrator.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { /// /// Migrate from VRM 0.x MToon to VRM 1.0 vrmc_materials_mtoon diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Migrator.cs.meta b/Assets/VRM10/MToon10/Runtime/MToon10Migrator.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Migrator.cs.meta rename to Assets/VRM10/MToon10/Runtime/MToon10Migrator.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToonMaterialMigrator.cs b/Assets/VRM10/MToon10/Runtime/MToonMaterialMigrator.cs similarity index 98% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToonMaterialMigrator.cs rename to Assets/VRM10/MToon10/Runtime/MToonMaterialMigrator.cs index cc8c14351..b72fd8fd1 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToonMaterialMigrator.cs +++ b/Assets/VRM10/MToon10/Runtime/MToonMaterialMigrator.cs @@ -1,10 +1,10 @@ using System; using UnityEngine; -using VRMShaders.VRM10.MToon10.Runtime; -using VRMShaders.VRM10.MToon10.Runtime.MToon0X; +using VRM10.MToon10.MToon0X; +using MToon0XUtils = VRM10.MToon10.MToon0X.MToon0XUtils; using Object = UnityEngine.Object; -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRM10.MToon10 { public sealed class MToonMaterialMigrator { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToonMaterialMigrator.cs.meta b/Assets/VRM10/MToon10/Runtime/MToonMaterialMigrator.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToonMaterialMigrator.cs.meta rename to Assets/VRM10/MToon10/Runtime/MToonMaterialMigrator.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToonOutlineRenderFeature.cs b/Assets/VRM10/MToon10/Runtime/MToonOutlineRenderFeature.cs similarity index 94% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToonOutlineRenderFeature.cs rename to Assets/VRM10/MToon10/Runtime/MToonOutlineRenderFeature.cs index 28b610f8d..760b40692 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToonOutlineRenderFeature.cs +++ b/Assets/VRM10/MToon10/Runtime/MToonOutlineRenderFeature.cs @@ -2,7 +2,7 @@ using UnityEngine.Rendering; using UnityEngine.Rendering.Universal; -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public sealed class MToonOutlineRenderFeature : ScriptableRendererFeature { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToonOutlineRenderFeature.cs.meta b/Assets/VRM10/MToon10/Runtime/MToonOutlineRenderFeature.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToonOutlineRenderFeature.cs.meta rename to Assets/VRM10/MToon10/Runtime/MToonOutlineRenderFeature.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToonOutlineRenderPass.cs b/Assets/VRM10/MToon10/Runtime/MToonOutlineRenderPass.cs similarity index 97% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToonOutlineRenderPass.cs rename to Assets/VRM10/MToon10/Runtime/MToonOutlineRenderPass.cs index 91def816c..3865807b5 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToonOutlineRenderPass.cs +++ b/Assets/VRM10/MToon10/Runtime/MToonOutlineRenderPass.cs @@ -1,9 +1,8 @@ #if MTOON_URP -using System; using UnityEngine.Rendering; using UnityEngine.Rendering.Universal; -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public sealed class MToonOutlineRenderPass : ScriptableRenderPass { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToonOutlineRenderPass.cs.meta b/Assets/VRM10/MToon10/Runtime/MToonOutlineRenderPass.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToonOutlineRenderPass.cs.meta rename to Assets/VRM10/MToon10/Runtime/MToonOutlineRenderPass.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToonValidator.cs b/Assets/VRM10/MToon10/Runtime/MToonValidator.cs similarity index 98% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToonValidator.cs rename to Assets/VRM10/MToon10/Runtime/MToonValidator.cs index 81c0c420d..34121aec5 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToonValidator.cs +++ b/Assets/VRM10/MToon10/Runtime/MToonValidator.cs @@ -1,9 +1,8 @@ using System; using UnityEngine; using UnityEngine.Rendering; -using VRMShaders.VRM10.MToon10.Runtime; -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public sealed class MToonValidator { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToonValidator.cs.meta b/Assets/VRM10/MToon10/Runtime/MToonValidator.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToonValidator.cs.meta rename to Assets/VRM10/MToon10/Runtime/MToonValidator.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs similarity index 70% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs index fce84b9c8..67bb8de33 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs +++ b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public enum MToon10AlphaMode { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs similarity index 64% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs index 0f487f06c..3f8e243e9 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs +++ b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public enum MToon10DoubleSidedMode { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs similarity index 71% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs index e5885d888..cd2d714fd 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs +++ b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public static class MToon10EmissiveMapKeyword { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs similarity index 69% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs index 2ae3edc7a..2a58beb22 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs +++ b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public static class MToon10NormalMapKeyword { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs similarity index 69% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs index 05c2da674..5cca6ba20 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs +++ b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public enum MToon10OutlineMode { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs similarity index 79% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs index 87ce3de3e..40789d765 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs +++ b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public static class MToon10OutlineModeKeyword { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10ParameterMapKeyword.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10ParameterMapKeyword.cs similarity index 72% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10ParameterMapKeyword.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10ParameterMapKeyword.cs index 785e2c538..a6f9bbe8a 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10ParameterMapKeyword.cs +++ b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10ParameterMapKeyword.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public static class MToon10ParameterMapKeyword { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10ParameterMapKeyword.cs.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10ParameterMapKeyword.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10ParameterMapKeyword.cs.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10ParameterMapKeyword.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs similarity index 69% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs index 0e81947d1..cb6ebea15 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs +++ b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public static class MToon10RimMapKeyword { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10TransparentWithZWriteMode.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10TransparentWithZWriteMode.cs similarity index 67% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10TransparentWithZWriteMode.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10TransparentWithZWriteMode.cs index 188d273c5..3ae09cdbe 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10TransparentWithZWriteMode.cs +++ b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10TransparentWithZWriteMode.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public enum MToon10TransparentWithZWriteMode { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10TransparentWithZWriteMode.cs.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10TransparentWithZWriteMode.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10TransparentWithZWriteMode.cs.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10TransparentWithZWriteMode.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Meta.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Meta.cs similarity index 82% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Meta.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Meta.cs index 33e485a96..399223743 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Meta.cs +++ b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Meta.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public static class MToon10Meta { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Meta.cs.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Meta.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Meta.cs.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Meta.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs similarity index 96% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs index f21a4c8c3..f3e896097 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs +++ b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public enum MToon10Prop { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs similarity index 98% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs index d7d684284..fa9904d85 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs +++ b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public static class MToon10Properties { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaModeKeyword.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaModeKeyword.cs similarity index 84% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaModeKeyword.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaModeKeyword.cs index bfb0c93b3..f817f549a 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaModeKeyword.cs +++ b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaModeKeyword.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public static class UnityAlphaModeKeyword { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaModeKeyword.cs.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaModeKeyword.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaModeKeyword.cs.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaModeKeyword.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaToMaskMode.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaToMaskMode.cs similarity index 64% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaToMaskMode.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaToMaskMode.cs index 41b792af2..38aeff06e 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaToMaskMode.cs +++ b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaToMaskMode.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public enum UnityAlphaToMaskMode { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaToMaskMode.cs.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaToMaskMode.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaToMaskMode.cs.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaToMaskMode.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityCullMode.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityCullMode.cs similarity index 68% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityCullMode.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityCullMode.cs index fcfff41e1..88f0e5cc9 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityCullMode.cs +++ b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityCullMode.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public enum UnityCullMode { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityCullMode.cs.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityCullMode.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityCullMode.cs.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityCullMode.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityRenderTag.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityRenderTag.cs similarity index 86% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityRenderTag.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityRenderTag.cs index 1631b96e8..a57325bb0 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityRenderTag.cs +++ b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityRenderTag.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public static class UnityRenderTag { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityRenderTag.cs.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityRenderTag.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityRenderTag.cs.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityRenderTag.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityZWriteMode.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityZWriteMode.cs similarity index 62% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityZWriteMode.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityZWriteMode.cs index 6b5d5855d..10c602667 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityZWriteMode.cs +++ b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityZWriteMode.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Runtime +namespace VRM10.MToon10 { public enum UnityZWriteMode { diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityZWriteMode.cs.meta b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityZWriteMode.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityZWriteMode.cs.meta rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityZWriteMode.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/VRMShaders.VRM10.MToon10.Runtime.asmdef b/Assets/VRM10/MToon10/Runtime/VRM10.MToon10.Runtime.asmdef similarity index 92% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/VRMShaders.VRM10.MToon10.Runtime.asmdef rename to Assets/VRM10/MToon10/Runtime/VRM10.MToon10.Runtime.asmdef index df7c69f39..64d63c1a8 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/VRMShaders.VRM10.MToon10.Runtime.asmdef +++ b/Assets/VRM10/MToon10/Runtime/VRM10.MToon10.Runtime.asmdef @@ -1,5 +1,5 @@ { - "name": "VRMShaders.VRM10.MToon10.Runtime", + "name": "VRM10.MToon10", "rootNamespace": "", "references": [ "GUID:15fc0a57446b3144c949da3e2b9737a9", diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/VRMShaders.VRM10.MToon10.Runtime.asmdef.meta b/Assets/VRM10/MToon10/Runtime/VRM10.MToon10.Runtime.asmdef.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/VRMShaders.VRM10.MToon10.Runtime.asmdef.meta rename to Assets/VRM10/MToon10/Runtime/VRM10.MToon10.Runtime.asmdef.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Tests.meta b/Assets/VRM10/MToon10/Tests.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Tests.meta rename to Assets/VRM10/MToon10/Tests.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Tests/MigrationTests.cs b/Assets/VRM10/MToon10/Tests/MigrationTests.cs similarity index 95% rename from Assets/VRMShaders/VRM10/MToon10/Tests/MigrationTests.cs rename to Assets/VRM10/MToon10/Tests/MigrationTests.cs index d58451b12..190e10742 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Tests/MigrationTests.cs +++ b/Assets/VRM10/MToon10/Tests/MigrationTests.cs @@ -1,7 +1,6 @@ using NUnit.Framework; -using VRMShaders.VRM10.MToon10.Runtime; -namespace VRMShaders.VRM10.MToon10.Tests +namespace VRM10.MToon10.Tests { public sealed class MigrationTests { diff --git a/Assets/VRMShaders/VRM10/MToon10/Tests/MigrationTests.cs.meta b/Assets/VRM10/MToon10/Tests/MigrationTests.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Tests/MigrationTests.cs.meta rename to Assets/VRM10/MToon10/Tests/MigrationTests.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Tests/VRMShaders.VRM10.MToon10.Tests.asmdef b/Assets/VRM10/MToon10/Tests/VRM10.MToon10.Tests.asmdef similarity index 89% rename from Assets/VRMShaders/VRM10/MToon10/Tests/VRMShaders.VRM10.MToon10.Tests.asmdef rename to Assets/VRM10/MToon10/Tests/VRM10.MToon10.Tests.asmdef index 4245e99ce..36e0295f6 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Tests/VRMShaders.VRM10.MToon10.Tests.asmdef +++ b/Assets/VRM10/MToon10/Tests/VRM10.MToon10.Tests.asmdef @@ -1,5 +1,6 @@ { - "name": "VRMShaders.VRM10.MToon10.Tests", + "name": "VRM10.MToon10.Tests", + "rootNamespace": "", "references": [ "GUID:0aaf403bd13871a44b7127aef2695ff8", "GUID:27619889b8ba8c24980f49ee34dbb44a", diff --git a/Assets/VRMShaders/VRM10/MToon10/Tests/VRMShaders.VRM10.MToon10.Tests.asmdef.meta b/Assets/VRM10/MToon10/Tests/VRM10.MToon10.Tests.asmdef.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Tests/VRMShaders.VRM10.MToon10.Tests.asmdef.meta rename to Assets/VRM10/MToon10/Tests/VRM10.MToon10.Tests.asmdef.meta diff --git a/Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs b/Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs index d0bd550cf..97cb99ff9 100644 --- a/Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs +++ b/Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using UniGLTF.Extensions.VRMC_vrm; using UnityEngine; -using VRMShaders.VRM10.MToon10.Runtime; +using VRM10.MToon10; namespace UniVRM10 { diff --git a/Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs b/Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs index 9e5a388f6..af3315c5d 100644 --- a/Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs +++ b/Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using UnityEngine; using UniGLTF.Extensions.VRMC_vrm; -using VRMShaders.VRM10.MToon10.Runtime; +using VRM10.MToon10; namespace UniVRM10 diff --git a/Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon/Format.g.cs b/Assets/VRM10/Runtime/Format/MaterialsMToon/Format.g.cs similarity index 100% rename from Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon/Format.g.cs rename to Assets/VRM10/Runtime/Format/MaterialsMToon/Format.g.cs diff --git a/Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon/Format.g.cs.meta b/Assets/VRM10/Runtime/Format/MaterialsMToon/Format.g.cs.meta similarity index 83% rename from Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon/Format.g.cs.meta rename to Assets/VRM10/Runtime/Format/MaterialsMToon/Format.g.cs.meta index d1f29bc99..7e91b262f 100644 --- a/Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon/Format.g.cs.meta +++ b/Assets/VRM10/Runtime/Format/MaterialsMToon/Format.g.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7bbff45dd057a5a4d935d5ee9a64e40a +guid: a36356ed698e0cb4d8ad805b14c3d361 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/Materials/BuiltInVrm10MToonMaterialExporter.cs b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/Materials/BuiltInVrm10MToonMaterialExporter.cs index 93b5ebc1d..a5057ee71 100644 --- a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/Materials/BuiltInVrm10MToonMaterialExporter.cs +++ b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/Materials/BuiltInVrm10MToonMaterialExporter.cs @@ -2,8 +2,8 @@ using UniGLTF; using UniGLTF.Extensions.VRMC_materials_mtoon; using UnityEngine; +using VRM10.MToon10; using VRMShaders; -using VRMShaders.VRM10.MToon10.Runtime; using ColorSpace = VRMShaders.ColorSpace; namespace UniVRM10 diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/BuiltInVrm10MToonMaterialImporter.cs b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/BuiltInVrm10MToonMaterialImporter.cs index b7ba7a563..6a43e14ba 100644 --- a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/BuiltInVrm10MToonMaterialImporter.cs +++ b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/BuiltInVrm10MToonMaterialImporter.cs @@ -4,8 +4,8 @@ using System.Linq; using UniGLTF; using UniGLTF.Extensions.VRMC_materials_mtoon; using UnityEngine; +using VRM10.MToon10; using VRMShaders; -using VRMShaders.VRM10.MToon10.Runtime; using ColorSpace = VRMShaders.ColorSpace; using OutlineWidthMode = UniGLTF.Extensions.VRMC_materials_mtoon.OutlineWidthMode; diff --git a/Assets/VRM10/Runtime/IO/Material/URP/Import/Materials/UrpVrm10MToonMaterialImporter.cs b/Assets/VRM10/Runtime/IO/Material/URP/Import/Materials/UrpVrm10MToonMaterialImporter.cs index 1a690e060..9fd485809 100644 --- a/Assets/VRM10/Runtime/IO/Material/URP/Import/Materials/UrpVrm10MToonMaterialImporter.cs +++ b/Assets/VRM10/Runtime/IO/Material/URP/Import/Materials/UrpVrm10MToonMaterialImporter.cs @@ -2,8 +2,8 @@ using System.Linq; using UniGLTF; using UnityEngine; +using VRM10.MToon10; using VRMShaders; -using VRMShaders.VRM10.MToon10.Runtime; namespace UniVRM10 { diff --git a/Assets/VRM10/Runtime/IO/Texture/Vrm10MToonTextureImporter.cs b/Assets/VRM10/Runtime/IO/Texture/Vrm10MToonTextureImporter.cs index 9dbba8a44..fe9dac249 100644 --- a/Assets/VRM10/Runtime/IO/Texture/Vrm10MToonTextureImporter.cs +++ b/Assets/VRM10/Runtime/IO/Texture/Vrm10MToonTextureImporter.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using UniGLTF; using UniGLTF.Extensions.VRMC_materials_mtoon; using UnityEngine; +using VRM10.MToon10; using VRMShaders; -using VRMShaders.VRM10.MToon10.Runtime; namespace UniVRM10 { diff --git a/Assets/VRM10/Runtime/Migration/Materials/MigrationMToonMaterial.cs b/Assets/VRM10/Runtime/Migration/Materials/MigrationMToonMaterial.cs index 0dbf74997..67fb61727 100644 --- a/Assets/VRM10/Runtime/Migration/Materials/MigrationMToonMaterial.cs +++ b/Assets/VRM10/Runtime/Migration/Materials/MigrationMToonMaterial.cs @@ -4,8 +4,8 @@ using UniGLTF; using UniGLTF.Extensions.VRMC_materials_mtoon; using UniJSON; using UnityEngine; -using VRMShaders.VRM10.MToon10.Runtime; -using VRMShaders.VRM10.MToon10.Runtime.MToon0X; +using VRM10.MToon10; +using VRM10.MToon10.MToon0X; using ColorSpace = VRMShaders.ColorSpace; namespace UniVRM10 diff --git a/Assets/VRM10/Runtime/Migration/Materials/Vrm0XMToonValue.cs b/Assets/VRM10/Runtime/Migration/Materials/Vrm0XMToonValue.cs index 25d0d62b2..3a413ee04 100644 --- a/Assets/VRM10/Runtime/Migration/Materials/Vrm0XMToonValue.cs +++ b/Assets/VRM10/Runtime/Migration/Materials/Vrm0XMToonValue.cs @@ -3,9 +3,10 @@ using System.Linq; using UniGLTF; using UniJSON; using UnityEngine; +using VRM10.MToon10.MToon0X; using VRMShaders; -using VRMShaders.VRM10.MToon10.Runtime.MToon0X; using ColorSpace = VRMShaders.ColorSpace; +using MToon0XUtils = VRM10.MToon10.MToon0X.MToon0XUtils; namespace UniVRM10 { diff --git a/Assets/VRM10/Samples~/VRM10Viewer/VRM10Loaded.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10Loaded.cs index e5d5882b5..11d47dac9 100644 --- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10Loaded.cs +++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10Loaded.cs @@ -1,6 +1,5 @@ using System; using UniGLTF; -using UniGLTF.Utils; using UnityEngine; namespace UniVRM10.VRM10Viewer diff --git a/Assets/VRM10/Samples~/VRM10Viewer/VRM10Viewer.unity b/Assets/VRM10/Samples~/VRM10Viewer/VRM10Viewer.unity index 1346fb42d..54855ea3b 100644 --- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10Viewer.unity +++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10Viewer.unity @@ -232,7 +232,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 339774397} - m_RootOrder: 14 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -773,7 +773,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 339774397} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1236,13 +1236,15 @@ RectTransform: - {fileID: 1621794411} - {fileID: 2009818432} - {fileID: 168425995} - - {fileID: 1307084561} - {fileID: 224350191} - {fileID: 1791103379} - {fileID: 1311520909} - - {fileID: 1557052150} - - {fileID: 1767706907} + - {fileID: 1307084561} - {fileID: 974864191} + - {fileID: 1767706907} + - {fileID: 1557052150} + - {fileID: 1728528388} + - {fileID: 704896193} - {fileID: 597950322} - {fileID: 935566651} - {fileID: 634488421} @@ -1822,7 +1824,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 339774397} - m_RootOrder: 10 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1903,7 +1905,7 @@ RectTransform: - {fileID: 154330168} - {fileID: 1954133885} m_Father: {fileID: 339774397} - m_RootOrder: 16 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1990,7 +1992,7 @@ RectTransform: - {fileID: 2010083454} - {fileID: 1081455630} m_Father: {fileID: 339774397} - m_RootOrder: 12 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2246,6 +2248,128 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &704896192 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 704896193} + - component: {fileID: 704896196} + - component: {fileID: 704896195} + - component: {fileID: 704896194} + m_Layer: 5 + m_Name: ResetSpringBone + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &704896193 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 704896192} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 983782643} + m_Father: {fileID: 339774397} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 162, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &704896194 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 704896192} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 704896195} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &704896195 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 704896192} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &704896196 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 704896192} + m_CullTransparentMesh: 0 --- !u!1 &773923918 GameObject: m_ObjectHideFlags: 0 @@ -3397,7 +3521,7 @@ RectTransform: - {fileID: 175751363} - {fileID: 1904789319} m_Father: {fileID: 339774397} - m_RootOrder: 11 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3435,7 +3559,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 339774397} - m_RootOrder: 9 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3484,6 +3608,88 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 974864190} m_CullTransparentMesh: 0 +--- !u!1 &983782642 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 983782643} + - component: {fileID: 983782645} + - component: {fileID: 983782644} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &983782643 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 983782642} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 704896193} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &983782644 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 983782642} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'ResetSpring + +' +--- !u!222 &983782645 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 983782642} + m_CullTransparentMesh: 0 --- !u!1 &1007924635 GameObject: m_ObjectHideFlags: 0 @@ -4600,6 +4806,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1242458542} m_CullTransparentMesh: 0 +--- !u!1 &1258907230 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1258907231} + - component: {fileID: 1258907233} + - component: {fileID: 1258907232} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1258907231 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1258907230} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1728528388} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 9, y: -0.5} + m_SizeDelta: {x: -28, y: -3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1258907232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1258907230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: PauseSpringBone +--- !u!222 &1258907233 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1258907230} + m_CullTransparentMesh: 1 --- !u!1 &1268276254 GameObject: m_ObjectHideFlags: 0 @@ -4869,7 +5155,7 @@ RectTransform: m_Children: - {fileID: 910859648} m_Father: {fileID: 339774397} - m_RootOrder: 3 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5066,7 +5352,7 @@ RectTransform: - {fileID: 1866921958} - {fileID: 1767669911} m_Father: {fileID: 339774397} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5363,7 +5649,7 @@ RectTransform: - {fileID: 452923209} - {fileID: 2090837017} m_Father: {fileID: 339774397} - m_RootOrder: 15 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5498,6 +5784,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1476033060} m_CullTransparentMesh: 0 +--- !u!1 &1519258557 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1519258558} + - component: {fileID: 1519258560} + - component: {fileID: 1519258559} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1519258558 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519258557} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2055567529} + m_Father: {fileID: 1728528388} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10, y: -10} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1519258559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519258557} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1519258560 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519258557} + m_CullTransparentMesh: 1 --- !u!1 &1557052149 GameObject: m_ObjectHideFlags: 0 @@ -5510,7 +5873,7 @@ GameObject: - component: {fileID: 1557052152} - component: {fileID: 1557052151} m_Layer: 5 - m_Name: _ + m_Name: _SpringBone_ m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5529,7 +5892,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 339774397} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5569,7 +5932,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: + m_Text: SpringBone --- !u!222 &1557052152 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5920,6 +6283,93 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1636340563} m_CullTransparentMesh: 0 +--- !u!1 &1728528387 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1728528388} + - component: {fileID: 1728528389} + m_Layer: 5 + m_Name: PauseSpringBone + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1728528388 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1728528387} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1519258558} + - {fileID: 1258907231} + m_Father: {fileID: 339774397} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1728528389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1728528387} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1519258559} + toggleTransition: 1 + graphic: {fileID: 2055567530} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_IsOn: 0 --- !u!1 &1761414315 GameObject: m_ObjectHideFlags: 0 @@ -6199,7 +6649,7 @@ RectTransform: - {fileID: 62367395} - {fileID: 1037763549} m_Father: {fileID: 339774397} - m_RootOrder: 13 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -6373,6 +6823,8 @@ MonoBehaviour: m_openMotion: {fileID: 168425996} m_pastePose: {fileID: 1307084564} m_showBoxMan: {fileID: 1767706908} + m_pauseSpringBone: {fileID: 1728528389} + m_resetSpringBone: {fileID: 704896194} m_enableLipSync: {fileID: 935566650} m_enableAutoBlink: {fileID: 634488422} m_enableAutoExpression: {fileID: 1767738855} @@ -6431,7 +6883,7 @@ RectTransform: - {fileID: 1166391799} - {fileID: 1140410864} m_Father: {fileID: 339774397} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -7243,6 +7695,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2010083453} m_CullTransparentMesh: 0 +--- !u!1 &2055567528 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2055567529} + - component: {fileID: 2055567531} + - component: {fileID: 2055567530} + m_Layer: 5 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2055567529 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2055567528} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1519258558} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2055567530 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2055567528} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2055567531 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2055567528} + m_CullTransparentMesh: 1 --- !u!1 &2090837016 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs index f4ecd3445..f0f842ae2 100644 --- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs +++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs @@ -27,6 +27,12 @@ namespace UniVRM10.VRM10Viewer [SerializeField] Toggle m_showBoxMan = default; + [SerializeField] + Toggle m_pauseSpringBone = default; + + [SerializeField] + Button m_resetSpringBone = default; + [SerializeField] Toggle m_enableLipSync = default; @@ -252,6 +258,7 @@ namespace UniVRM10.VRM10Viewer m_openModel = buttons.First(x => x.name == "OpenModel"); m_openMotion = buttons.First(x => x.name == "OpenMotion"); m_pastePose = buttons.First(x => x.name == "PastePose"); + m_resetSpringBone = buttons.First(x => x.name == "ResetSpringBone"); #if UNITY_2022_3_OR_NEWER var toggles = GameObject.FindObjectsByType(FindObjectsSortMode.InstanceID); @@ -259,6 +266,7 @@ namespace UniVRM10.VRM10Viewer var toggles = GameObject.FindObjectsOfType(); #endif m_showBoxMan = toggles.First(x => x.name == "ShowBoxMan"); + m_pauseSpringBone = toggles.First(x => x.name == "PauseSpringBone"); m_enableLipSync = toggles.First(x => x.name == "EnableLipSync"); m_enableAutoBlink = toggles.First(x => x.name == "EnableAutoBlink"); m_enableAutoExpression = toggles.First(x => x.name == "EnableAutoExpression"); @@ -347,6 +355,7 @@ namespace UniVRM10.VRM10Viewer m_openModel.onClick.AddListener(OnOpenModelClicked); m_openMotion.onClick.AddListener(OnOpenMotionClicked); m_pastePose.onClick.AddListener(OnPastePoseClicked); + m_resetSpringBone.onClick.AddListener(OnResetSpringBoneClicked); // load initial bvh if (m_motion != null) @@ -393,18 +402,20 @@ namespace UniVRM10.VRM10Viewer m_loaded.EnableLipSyncValue = m_enableLipSync.isOn; m_loaded.EnableBlinkValue = m_enableAutoBlink.isOn; m_loaded.EnableAutoExpressionValue = m_enableAutoExpression.isOn; - } - if (m_loaded != null) - { - if (m_ui.IsTPose) + if (m_loaded.Runtime != null) { - m_loaded.Runtime.VrmAnimation = TPose; - } - else if (Motion != null) - { - // Automatically retarget in Vrm10Runtime.Process - m_loaded.Runtime.VrmAnimation = Motion; + if (m_ui.IsTPose) + { + m_loaded.Runtime.VrmAnimation = TPose; + } + else if (Motion != null) + { + // Automatically retarget in Vrm10Runtime.Process + m_loaded.Runtime.VrmAnimation = Motion; + } + + m_loaded.Runtime.SpringBone.IsSpringBoneEnabled = !m_pauseSpringBone.isOn; } } } @@ -484,6 +495,17 @@ namespace UniVRM10.VRM10Viewer } } + void OnResetSpringBoneClicked() + { + if (m_loaded != null) + { + if (m_loaded.Runtime != null) + { + m_loaded.Runtime.SpringBone.RestoreInitialTransform(); + } + } + } + static IMaterialDescriptorGenerator GetVrmMaterialDescriptorGenerator(bool useUrp) { if (useUrp) diff --git a/Assets/VRM10/package.json b/Assets/VRM10/package.json index dd3982033..7e91df3a7 100644 --- a/Assets/VRM10/package.json +++ b/Assets/VRM10/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.vrm", - "version": "0.124.1", + "version": "0.124.2", "displayName": "VRM-1.0", "description": "VRM-1.0 importer", "unity": "2021.3", @@ -14,8 +14,8 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.124.1", - "com.vrmc.gltf": "0.124.1" + "com.vrmc.vrmshaders": "0.124.2", + "com.vrmc.gltf": "0.124.2" }, "samples": [ { diff --git a/Assets/VRMShaders/VRM/IO/Runtime.meta b/Assets/VRMShaders/VRM/IO/Runtime.meta deleted file mode 100644 index 8fa342dbb..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dd900b6f302c9404b99d77a1ae3d00be -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef b/Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef deleted file mode 100644 index 1afe036ef..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef +++ /dev/null @@ -1,13 +0,0 @@ -{ - "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/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef.meta b/Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef.meta deleted file mode 100644 index ec0da628b..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 301b251fd9834274c9228e0532f444f7 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM10/Format.meta b/Assets/VRMShaders/VRM10/Format.meta deleted file mode 100644 index f42cb0b10..000000000 --- a/Assets/VRMShaders/VRM10/Format.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 83500e0cfc53cf04f95af8a60cc32017 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM10/Format/Runtime.meta b/Assets/VRMShaders/VRM10/Format/Runtime.meta deleted file mode 100644 index 9dda04a2d..000000000 --- a/Assets/VRMShaders/VRM10/Format/Runtime.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 07be59cdcf4b2df4ca9241939bf1054e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon.meta b/Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon.meta deleted file mode 100644 index 7bf05b5d3..000000000 --- a/Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c6bae94a423d90d45bc6f1bd1eada5fe -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM10/Format/Runtime/VRMShaders.VRM10.Format.Runtime.asmdef b/Assets/VRMShaders/VRM10/Format/Runtime/VRMShaders.VRM10.Format.Runtime.asmdef deleted file mode 100644 index fd9a63aee..000000000 --- a/Assets/VRMShaders/VRM10/Format/Runtime/VRMShaders.VRM10.Format.Runtime.asmdef +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "VRMShaders.VRM10.Format.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/VRM10/Format/Runtime/VRMShaders.VRM10.Format.Runtime.asmdef.meta b/Assets/VRMShaders/VRM10/Format/Runtime/VRMShaders.VRM10.Format.Runtime.asmdef.meta deleted file mode 100644 index 3667d97ad..000000000 --- a/Assets/VRMShaders/VRM10/Format/Runtime/VRMShaders.VRM10.Format.Runtime.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: bce005214fa49654d93927908c15b1f2 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/package.json b/Assets/VRMShaders/package.json index 3ed0b2c14..898e3fc3a 100644 --- a/Assets/VRMShaders/package.json +++ b/Assets/VRMShaders/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.vrmshaders", - "version": "0.124.1", + "version": "0.124.2", "displayName": "VRM Shaders", "description": "VRM Shaders", "unity": "2021.3",