Merge pull request #2366 from Santarh/disassemblyVrmShaders2

Move MToon10 material io definitions from VRMShaders to VRM10

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
     {

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
     {

Assets/VRM10/MToon10/Editor/MToon10EditorEditMode.cs

@@ -1,4 +1,4 @@
-namespace VRMShaders.VRM10.MToon10.Editor
+namespace VRM10.MToon10.Editor
 {
     public enum MToon10EditorEditMode
     {

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
     {

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"
     ],

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"
 }

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"
 }

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
     {

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
     {

Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XEnums.cs

@@ -1,4 +1,4 @@
-namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X
+namespace VRM10.MToon10.MToon0X
 {
     public enum MToon0XDebugMode
     {

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
     {

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

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
     {

Assets/VRM10/MToon10/Runtime/MToon10Context.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace VRMShaders.VRM10.MToon10.Runtime
+namespace VRM10.MToon10
 {
     public sealed class MToon10Context
     {

Assets/VRM10/MToon10/Runtime/MToon10Migrator.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace VRMShaders.VRM10.MToon10.Runtime
+namespace VRM10.MToon10
 {
     /// <summary>
     /// Migrate from VRM 0.x MToon to VRM 1.0 vrmc_materials_mtoon

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
     {

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
     {

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
     {

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
     {

Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs

@@ -1,4 +1,4 @@
-namespace VRMShaders.VRM10.MToon10.Runtime
+namespace VRM10.MToon10
 {
     public enum MToon10AlphaMode
     {

Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs

@@ -1,4 +1,4 @@
-namespace VRMShaders.VRM10.MToon10.Runtime
+namespace VRM10.MToon10
 {
     public enum MToon10DoubleSidedMode
     {

Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs

@@ -1,4 +1,4 @@
-namespace VRMShaders.VRM10.MToon10.Runtime
+namespace VRM10.MToon10
 {
     public static class MToon10EmissiveMapKeyword
     {

Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs

@@ -1,4 +1,4 @@
-namespace VRMShaders.VRM10.MToon10.Runtime
+namespace VRM10.MToon10
 {
     public static class MToon10NormalMapKeyword
     {

Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs

@@ -1,4 +1,4 @@
-namespace VRMShaders.VRM10.MToon10.Runtime
+namespace VRM10.MToon10
 {
     public enum MToon10OutlineMode
     {

Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs

@@ -1,4 +1,4 @@
-namespace VRMShaders.VRM10.MToon10.Runtime
+namespace VRM10.MToon10
 {
     public static class MToon10OutlineModeKeyword
     {

Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10ParameterMapKeyword.cs

@@ -1,4 +1,4 @@
-namespace VRMShaders.VRM10.MToon10.Runtime
+namespace VRM10.MToon10
 {
     public static class MToon10ParameterMapKeyword
     {

Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs

@@ -1,4 +1,4 @@
-namespace VRMShaders.VRM10.MToon10.Runtime
+namespace VRM10.MToon10
 {
     public static class MToon10RimMapKeyword
     {