From 8a7d0a82f398495128f6a47b41bf8aabfce2cf66 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Thu, 18 Jul 2024 23:24:50 +0900 Subject: [PATCH] mv namespace from VRMShaders.VRM10.MToon10 to VRM10.MToon10 --- Assets/VRM10/MToon10/Editor/EditorMenu.cs | 2 +- Assets/VRM10/MToon10/Editor/LabelScope.cs | 2 +- Assets/VRM10/MToon10/Editor/MToon10EditorEditMode.cs | 2 +- Assets/VRM10/MToon10/Editor/MToonInspector.cs | 5 +---- .../MToon10/Resources/VRM10/vrmc_materials_mtoon.shader | 2 +- .../MToon10/Resources/VRM10/vrmc_materials_mtoon_urp.shader | 2 +- .../VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs | 2 +- Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XDefinition.cs | 2 +- Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XEnums.cs | 2 +- Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtils.cs | 3 +-- Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsGetter.cs | 5 ++--- Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsVersion.cs | 2 +- Assets/VRM10/MToon10/Runtime/MToon10Context.cs | 2 +- Assets/VRM10/MToon10/Runtime/MToon10Migrator.cs | 2 +- Assets/VRM10/MToon10/Runtime/MToonMaterialMigrator.cs | 6 +++--- Assets/VRM10/MToon10/Runtime/MToonOutlineRenderFeature.cs | 2 +- Assets/VRM10/MToon10/Runtime/MToonOutlineRenderPass.cs | 3 +-- Assets/VRM10/MToon10/Runtime/MToonValidator.cs | 3 +-- .../UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs | 2 +- .../MToonDefinedValues/MToon10DoubleSidedMode.cs | 2 +- .../MToonDefinedValues/MToon10EmissiveMapKeyword.cs | 2 +- .../MToonDefinedValues/MToon10NormalMapKeyword.cs | 2 +- .../UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs | 2 +- .../MToonDefinedValues/MToon10OutlineModeKeyword.cs | 2 +- .../MToonDefinedValues/MToon10ParameterMapKeyword.cs | 2 +- .../MToonDefinedValues/MToon10RimMapKeyword.cs | 2 +- .../MToonDefinedValues/MToon10TransparentWithZWriteMode.cs | 2 +- .../Runtime/UnityShaderLab/Properties/MToon10Meta.cs | 2 +- .../Runtime/UnityShaderLab/Properties/MToon10Prop.cs | 2 +- .../Runtime/UnityShaderLab/Properties/MToon10Properties.cs | 2 +- .../ShaderLabDefinedValues/UnityAlphaModeKeyword.cs | 2 +- .../ShaderLabDefinedValues/UnityAlphaToMaskMode.cs | 2 +- .../UnityShaderLab/ShaderLabDefinedValues/UnityCullMode.cs | 2 +- .../UnityShaderLab/ShaderLabDefinedValues/UnityRenderTag.cs | 2 +- .../ShaderLabDefinedValues/UnityZWriteMode.cs | 2 +- Assets/VRM10/MToon10/Tests/MigrationTests.cs | 3 +-- .../Components/Expression/MaterialValueBindingMerger.cs | 2 +- .../Runtime/Components/Expression/PreviewMaterialItem.cs | 2 +- .../Export/Materials/BuiltInVrm10MToonMaterialExporter.cs | 2 +- .../Import/Materials/BuiltInVrm10MToonMaterialImporter.cs | 2 +- .../URP/Import/Materials/UrpVrm10MToonMaterialImporter.cs | 2 +- .../VRM10/Runtime/IO/Texture/Vrm10MToonTextureImporter.cs | 2 +- .../Runtime/Migration/Materials/MigrationMToonMaterial.cs | 4 ++-- Assets/VRM10/Runtime/Migration/Materials/Vrm0XMToonValue.cs | 3 ++- 44 files changed, 49 insertions(+), 56 deletions(-) diff --git a/Assets/VRM10/MToon10/Editor/EditorMenu.cs b/Assets/VRM10/MToon10/Editor/EditorMenu.cs index 4736e4b76..388891199 100644 --- a/Assets/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/VRM10/MToon10/Editor/LabelScope.cs b/Assets/VRM10/MToon10/Editor/LabelScope.cs index 29c7a973d..9afd7bac2 100644 --- a/Assets/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/VRM10/MToon10/Editor/MToon10EditorEditMode.cs b/Assets/VRM10/MToon10/Editor/MToon10EditorEditMode.cs index 07855be10..21217a1f1 100644 --- a/Assets/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/VRM10/MToon10/Editor/MToonInspector.cs b/Assets/VRM10/MToon10/Editor/MToonInspector.cs index da625d88a..0c8a3a05d 100644 --- a/Assets/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/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader index 76e3d25a9..2a2f8f632 100644 --- a/Assets/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/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_urp.shader b/Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_urp.shader index 198661fc0..7144fed58 100644 --- a/Assets/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/VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs b/Assets/VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs index c44ded094..10189b45a 100644 --- a/Assets/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/VRM10/MToon10/Runtime/MToon0X/MToon0XDefinition.cs b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XDefinition.cs index aebe2de99..dc24c4fab 100644 --- a/Assets/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/VRM10/MToon10/Runtime/MToon0X/MToon0XEnums.cs b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XEnums.cs index babee5172..4637839d8 100644 --- a/Assets/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/VRM10/MToon10/Runtime/MToon0X/MToon0XUtils.cs b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtils.cs index 485bdc875..5691dda6f 100644 --- a/Assets/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/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsGetter.cs b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsGetter.cs index 795ee2f8e..d6953a3e3 100644 --- a/Assets/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/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsVersion.cs b/Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsVersion.cs index bd8bb40aa..05a77372e 100644 --- a/Assets/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/VRM10/MToon10/Runtime/MToon10Context.cs b/Assets/VRM10/MToon10/Runtime/MToon10Context.cs index b48751b86..9ed39a28d 100644 --- a/Assets/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/VRM10/MToon10/Runtime/MToon10Migrator.cs b/Assets/VRM10/MToon10/Runtime/MToon10Migrator.cs index cd49fa111..c41fe36e7 100644 --- a/Assets/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/VRM10/MToon10/Runtime/MToonMaterialMigrator.cs b/Assets/VRM10/MToon10/Runtime/MToonMaterialMigrator.cs index cc8c14351..b72fd8fd1 100644 --- a/Assets/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/VRM10/MToon10/Runtime/MToonOutlineRenderFeature.cs b/Assets/VRM10/MToon10/Runtime/MToonOutlineRenderFeature.cs index 28b610f8d..760b40692 100644 --- a/Assets/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/VRM10/MToon10/Runtime/MToonOutlineRenderPass.cs b/Assets/VRM10/MToon10/Runtime/MToonOutlineRenderPass.cs index 91def816c..3865807b5 100644 --- a/Assets/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/VRM10/MToon10/Runtime/MToonValidator.cs b/Assets/VRM10/MToon10/Runtime/MToonValidator.cs index 81c0c420d..34121aec5 100644 --- a/Assets/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/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs index fce84b9c8..67bb8de33 100644 --- a/Assets/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/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs index 0f487f06c..3f8e243e9 100644 --- a/Assets/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/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs index e5885d888..cd2d714fd 100644 --- a/Assets/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/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs index 2ae3edc7a..2a58beb22 100644 --- a/Assets/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/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs index 05c2da674..5cca6ba20 100644 --- a/Assets/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/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs index 87ce3de3e..40789d765 100644 --- a/Assets/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/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10ParameterMapKeyword.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10ParameterMapKeyword.cs index 785e2c538..a6f9bbe8a 100644 --- a/Assets/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/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs index 0e81947d1..cb6ebea15 100644 --- a/Assets/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/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10TransparentWithZWriteMode.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10TransparentWithZWriteMode.cs index 188d273c5..3ae09cdbe 100644 --- a/Assets/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/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Meta.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Meta.cs index 33e485a96..399223743 100644 --- a/Assets/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/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs index f21a4c8c3..f3e896097 100644 --- a/Assets/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/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs index d7d684284..fa9904d85 100644 --- a/Assets/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/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaModeKeyword.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaModeKeyword.cs index bfb0c93b3..f817f549a 100644 --- a/Assets/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/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaToMaskMode.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaToMaskMode.cs index 41b792af2..38aeff06e 100644 --- a/Assets/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/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityCullMode.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityCullMode.cs index fcfff41e1..88f0e5cc9 100644 --- a/Assets/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/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityRenderTag.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityRenderTag.cs index 1631b96e8..a57325bb0 100644 --- a/Assets/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/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityZWriteMode.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityZWriteMode.cs index 6b5d5855d..10c602667 100644 --- a/Assets/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/VRM10/MToon10/Tests/MigrationTests.cs b/Assets/VRM10/MToon10/Tests/MigrationTests.cs index d58451b12..190e10742 100644 --- a/Assets/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/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/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 {