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 4736e4b76c..3888911993 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 29c7a973d5..9afd7bac23 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 67% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToon10EditorEditMode.cs rename to Assets/VRM10/MToon10/Editor/MToon10EditorEditMode.cs index 07855be106..21217a1f1a 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 da625d88aa..0c8a3a05d9 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 f14e33bbc3..20754f5c4b 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 76e3d25a99..2a2f8f632e 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 198661fc05..7144fed583 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 c44ded094a..10189b45a2 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 aebe2de99c..dc24c4fab1 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 babee51721..4637839d8e 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 485bdc875f..5691dda6f2 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 795ee2f8eb..d6953a3e3e 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 @@ public static MToon0XDefinition GetMToonParametersFromMaterial(Material material { 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 bd8bb40aab..05a77372ef 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 b48751b869..9ed39a28d6 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 cd49fa1114..c41fe36e76 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 cc8c143512..b72fd8fd16 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 95% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToonOutlineRenderFeature.cs rename to Assets/VRM10/MToon10/Runtime/MToonOutlineRenderFeature.cs index 28b610f8dd..760b40692a 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 91def816c8..3865807b5b 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 81c0c420d5..34121aec52 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 71% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs index fce84b9c84..67bb8de339 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 65% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs index 0f487f06c7..3f8e243e9f 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 72% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs index e5885d8885..cd2d714fd3 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 70% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs index 2ae3edc7a3..2a58beb223 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 05c2da6745..5cca6ba203 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 80% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs index 87ce3de3e6..40789d765e 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 785e2c5381..a6f9bbe8af 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 70% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs index 0e81947d16..cb6ebea15e 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 188d273c58..3ae09cdbea 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 83% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Meta.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Meta.cs index 33e485a968..399223743b 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 f21a4c8c31..f3e8960972 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 d7d6842843..fa9904d85b 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 bfb0c93b3e..f817f549ac 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 41b792af2c..38aeff06e5 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 fcfff41e14..88f0e5cc9b 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 1631b96e87..a57325bb08 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 63% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityZWriteMode.cs rename to Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityZWriteMode.cs index 6b5d5855d8..10c6026671 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 df7c69f396..64d63c1a86 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 d58451b120..190e107424 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 4245e99ce6..36e0295f61 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 d0bd550cf1..97cb99ff90 100644 --- a/Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs +++ b/Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs @@ -2,7 +2,7 @@ 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 9e5a388f68..af3315c5dd 100644 --- a/Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs +++ b/Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs @@ -2,7 +2,7 @@ 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/VRM10/Runtime/IO/Material/BuiltInRP/Export/Materials/BuiltInVrm10MToonMaterialExporter.cs b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/Materials/BuiltInVrm10MToonMaterialExporter.cs index 93b5ebc1dd..a5057ee71d 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 b7ba7a5635..6a43e14ba8 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 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 1a690e0602..9fd485809b 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 9dbba8a44a..fe9dac249e 100644 --- a/Assets/VRM10/Runtime/IO/Texture/Vrm10MToonTextureImporter.cs +++ b/Assets/VRM10/Runtime/IO/Texture/Vrm10MToonTextureImporter.cs @@ -3,8 +3,8 @@ 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 0dbf749972..67fb617275 100644 --- a/Assets/VRM10/Runtime/Migration/Materials/MigrationMToonMaterial.cs +++ b/Assets/VRM10/Runtime/Migration/Materials/MigrationMToonMaterial.cs @@ -4,8 +4,8 @@ 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 25d0d62b2b..3a413ee049 100644 --- a/Assets/VRM10/Runtime/Migration/Materials/Vrm0XMToonValue.cs +++ b/Assets/VRM10/Runtime/Migration/Materials/Vrm0XMToonValue.cs @@ -3,9 +3,10 @@ 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 {