From b2fe35739c41fd261c206f0145c4f6722dc198c0 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Thu, 10 Jun 2021 15:47:10 +0900 Subject: [PATCH] mv --- .../VRM10/MToon10/Editor/MToonDefined.meta | 3 - .../VRM10/MToon10/Editor/MToonInspector.cs | 78 +++++++++---------- .../VRM10/MToon10/Runtime/Extensions.meta | 3 + .../Extensions}/MaterialExtensions.cs | 8 +- .../Extensions}/MaterialExtensions.cs.meta | 0 .../VRM10/MToon10/Runtime/MToon10Meta.cs | 7 ++ .../VRM10/MToon10/Runtime/MToon10Meta.cs.meta | 3 + .../{Migrator.cs => MToon10Migrator.cs} | 2 +- ...grator.cs.meta => MToon10Migrator.cs.meta} | 0 .../MToon10/Runtime/MToon10Properties.cs | 63 --------------- .../{Editor => Runtime}/MToonValidator.cs | 76 +++++++++--------- .../MToonValidator.cs.meta | 0 .../VRM10/MToon10/Runtime/UnityShaderLab.meta | 3 + .../MToon10Prop.cs} | 2 +- .../MToon10Prop.cs.meta} | 0 .../UnityShaderLab/MToon10Properties.cs | 63 +++++++++++++++ .../MToon10Properties.cs.meta | 0 .../UnityShaderLab/MToonDefinedValue.meta | 3 + .../MToonDefinedValue}/AlphaMode.cs | 2 +- .../MToonDefinedValue}/AlphaMode.cs.meta | 0 .../MToonDefinedValue}/DoubleSidedMode.cs | 2 +- .../DoubleSidedMode.cs.meta | 0 .../MToonDefinedValue}/EmissiveMapKeyword.cs | 2 +- .../EmissiveMapKeyword.cs.meta | 0 .../MToonDefinedValue}/NormalMapKeyword.cs | 2 +- .../NormalMapKeyword.cs.meta | 0 .../MToonDefinedValue}/OutlineMode.cs | 2 +- .../MToonDefinedValue}/OutlineMode.cs.meta | 0 .../MToonDefinedValue}/OutlineModeKeyword.cs | 2 +- .../OutlineModeKeyword.cs.meta | 0 .../MToonDefinedValue}/ParameterMapKeyword.cs | 2 +- .../ParameterMapKeyword.cs.meta | 0 .../MToonDefinedValue}/RimMapKeyword.cs | 2 +- .../MToonDefinedValue}/RimMapKeyword.cs.meta | 0 .../TransparentWithZWriteMode.cs | 2 +- .../TransparentWithZWriteMode.cs.meta | 0 .../UnityShaderLab/UnityDefinedValue.meta} | 0 .../UnityAlphaModeKeyword.cs | 2 +- .../UnityAlphaModeKeyword.cs.meta | 0 .../UnityAlphaToMaskMode.cs | 2 +- .../UnityAlphaToMaskMode.cs.meta | 0 .../UnityDefinedValue}/UnityRenderTag.cs | 2 +- .../UnityDefinedValue}/UnityRenderTag.cs.meta | 0 .../UnityDefinedValue}/UnityZWriteMode.cs | 2 +- .../UnityZWriteMode.cs.meta | 0 45 files changed, 178 insertions(+), 162 deletions(-) delete mode 100644 Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined.meta create mode 100644 Assets/VRMShaders/VRM10/MToon10/Runtime/Extensions.meta rename Assets/VRMShaders/VRM10/MToon10/{Editor => Runtime/Extensions}/MaterialExtensions.cs (70%) rename Assets/VRMShaders/VRM10/MToon10/{Editor => Runtime/Extensions}/MaterialExtensions.cs.meta (100%) create mode 100644 Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Meta.cs create mode 100644 Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Meta.cs.meta rename Assets/VRMShaders/VRM10/MToon10/Runtime/{Migrator.cs => MToon10Migrator.cs} (97%) rename Assets/VRMShaders/VRM10/MToon10/Runtime/{Migrator.cs.meta => MToon10Migrator.cs.meta} (100%) delete mode 100644 Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Properties.cs rename Assets/VRMShaders/VRM10/MToon10/{Editor => Runtime}/MToonValidator.cs (54%) rename Assets/VRMShaders/VRM10/MToon10/{Editor => Runtime}/MToonValidator.cs.meta (100%) create mode 100644 Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab.meta rename Assets/VRMShaders/VRM10/MToon10/Runtime/{Prop.cs => UnityShaderLab/MToon10Prop.cs} (97%) rename Assets/VRMShaders/VRM10/MToon10/Runtime/{Prop.cs.meta => UnityShaderLab/MToon10Prop.cs.meta} (100%) create mode 100644 Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToon10Properties.cs rename Assets/VRMShaders/VRM10/MToon10/Runtime/{ => UnityShaderLab}/MToon10Properties.cs.meta (100%) create mode 100644 Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue.meta rename Assets/VRMShaders/VRM10/MToon10/{Editor/MToonDefined => Runtime/UnityShaderLab/MToonDefinedValue}/AlphaMode.cs (69%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/MToonDefined => Runtime/UnityShaderLab/MToonDefinedValue}/AlphaMode.cs.meta (100%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/MToonDefined => Runtime/UnityShaderLab/MToonDefinedValue}/DoubleSidedMode.cs (62%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/MToonDefined => Runtime/UnityShaderLab/MToonDefinedValue}/DoubleSidedMode.cs.meta (100%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/MToonDefined => Runtime/UnityShaderLab/MToonDefinedValue}/EmissiveMapKeyword.cs (70%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/MToonDefined => Runtime/UnityShaderLab/MToonDefinedValue}/EmissiveMapKeyword.cs.meta (100%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/MToonDefined => Runtime/UnityShaderLab/MToonDefinedValue}/NormalMapKeyword.cs (68%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/MToonDefined => Runtime/UnityShaderLab/MToonDefinedValue}/NormalMapKeyword.cs.meta (100%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/MToonDefined => Runtime/UnityShaderLab/MToonDefinedValue}/OutlineMode.cs (67%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/MToonDefined => Runtime/UnityShaderLab/MToonDefinedValue}/OutlineMode.cs.meta (100%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/MToonDefined => Runtime/UnityShaderLab/MToonDefinedValue}/OutlineModeKeyword.cs (79%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/MToonDefined => Runtime/UnityShaderLab/MToonDefinedValue}/OutlineModeKeyword.cs.meta (100%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/MToonDefined => Runtime/UnityShaderLab/MToonDefinedValue}/ParameterMapKeyword.cs (70%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/MToonDefined => Runtime/UnityShaderLab/MToonDefinedValue}/ParameterMapKeyword.cs.meta (100%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/MToonDefined => Runtime/UnityShaderLab/MToonDefinedValue}/RimMapKeyword.cs (68%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/MToonDefined => Runtime/UnityShaderLab/MToonDefinedValue}/RimMapKeyword.cs.meta (100%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/MToonDefined => Runtime/UnityShaderLab/MToonDefinedValue}/TransparentWithZWriteMode.cs (65%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/MToonDefined => Runtime/UnityShaderLab/MToonDefinedValue}/TransparentWithZWriteMode.cs.meta (100%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/UnityDefined.meta => Runtime/UnityShaderLab/UnityDefinedValue.meta} (100%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/UnityDefined => Runtime/UnityShaderLab/UnityDefinedValue}/UnityAlphaModeKeyword.cs (84%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/UnityDefined => Runtime/UnityShaderLab/UnityDefinedValue}/UnityAlphaModeKeyword.cs.meta (100%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/UnityDefined => Runtime/UnityShaderLab/UnityDefinedValue}/UnityAlphaToMaskMode.cs (64%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/UnityDefined => Runtime/UnityShaderLab/UnityDefinedValue}/UnityAlphaToMaskMode.cs.meta (100%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/UnityDefined => Runtime/UnityShaderLab/UnityDefinedValue}/UnityRenderTag.cs (86%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/UnityDefined => Runtime/UnityShaderLab/UnityDefinedValue}/UnityRenderTag.cs.meta (100%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/UnityDefined => Runtime/UnityShaderLab/UnityDefinedValue}/UnityZWriteMode.cs (62%) rename Assets/VRMShaders/VRM10/MToon10/{Editor/UnityDefined => Runtime/UnityShaderLab/UnityDefinedValue}/UnityZWriteMode.cs.meta (100%) diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined.meta b/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined.meta deleted file mode 100644 index 291a05829..000000000 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 3f051e7d892a4bccbcc8fd1f4c2ca162 -timeCreated: 1622456532 \ No newline at end of file diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonInspector.cs b/Assets/VRMShaders/VRM10/MToon10/Editor/MToonInspector.cs index 2e5a92db1..d88057edb 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonInspector.cs +++ b/Assets/VRMShaders/VRM10/MToon10/Editor/MToonInspector.cs @@ -21,65 +21,65 @@ namespace VRMShaders.VRM10.MToon10.Editor using (new LabelScope("Rendering")) { - PopupEnum("Alpha Mode", props[Prop.AlphaMode], materialEditor); - var alphaMode = (AlphaMode) (int) props[Prop.AlphaMode].floatValue; + PopupEnum("Alpha Mode", props[MToon10Prop.AlphaMode], materialEditor); + var alphaMode = (AlphaMode) (int) props[MToon10Prop.AlphaMode].floatValue; if (alphaMode == AlphaMode.Transparent) { PopupEnum( "Transparent With ZWrite Mode", - props[Prop.TransparentWithZWrite], + props[MToon10Prop.TransparentWithZWrite], materialEditor ); } if (alphaMode == AlphaMode.Cutout) { - materialEditor.ShaderProperty(props[Prop.AlphaCutoff], "Cutoff"); + materialEditor.ShaderProperty(props[MToon10Prop.AlphaCutoff], "Cutoff"); } - PopupEnum("Double Sided", props[Prop.DoubleSided], materialEditor); + PopupEnum("Double Sided", props[MToon10Prop.DoubleSided], materialEditor); - materialEditor.ShaderProperty(props[Prop.RenderQueueOffsetNumber], "RenderQueue Offset"); + materialEditor.ShaderProperty(props[MToon10Prop.RenderQueueOffsetNumber], "RenderQueue Offset"); } using (new LabelScope("Lighting")) { materialEditor.TexturePropertySingleLine( new GUIContent("Lit Color, Alpha", "Lit (RGB), Alpha (A)"), - props[Prop.BaseColorTexture], - props[Prop.BaseColorFactor] + props[MToon10Prop.BaseColorTexture], + props[MToon10Prop.BaseColorFactor] ); materialEditor.TexturePropertySingleLine( new GUIContent("Shade Color", "Shade (RGB)"), - props[Prop.ShadeColorTexture], - props[Prop.ShadeColorFactor] + props[MToon10Prop.ShadeColorTexture], + props[MToon10Prop.ShadeColorFactor] ); materialEditor.TexturePropertySingleLine( new GUIContent("Normal Map", "Normal Map (RGB)"), - props[Prop.NormalTexture], - props[Prop.NormalTextureScale] + props[MToon10Prop.NormalTexture], + props[MToon10Prop.NormalTextureScale] ); - materialEditor.ShaderProperty(props[Prop.ShadingShiftFactor], "Shading Shift"); - materialEditor.ShaderProperty(props[Prop.ShadingToonyFactor], "Shading Toony"); + materialEditor.ShaderProperty(props[MToon10Prop.ShadingShiftFactor], "Shading Shift"); + materialEditor.ShaderProperty(props[MToon10Prop.ShadingToonyFactor], "Shading Toony"); materialEditor.TexturePropertySingleLine( new GUIContent("Additive Shading Shift", "Shading Shift (R)"), - props[Prop.ShadingShiftTexture], - props[Prop.ShadingShiftTextureScale] + props[MToon10Prop.ShadingShiftTexture], + props[MToon10Prop.ShadingShiftTextureScale] ); } using (new LabelScope("Global Illumination")) { - materialEditor.ShaderProperty(props[Prop.GiEqualizationFactor], "GI Equalization"); + materialEditor.ShaderProperty(props[MToon10Prop.GiEqualizationFactor], "GI Equalization"); } using (new LabelScope("Emission")) { materialEditor.TexturePropertySingleLine( new GUIContent("Emission", "Emission (RGB)"), - props[Prop.EmissiveTexture], - props[Prop.EmissiveFactor] + props[MToon10Prop.EmissiveTexture], + props[MToon10Prop.EmissiveFactor] ); } @@ -87,48 +87,48 @@ namespace VRMShaders.VRM10.MToon10.Editor { materialEditor.TexturePropertySingleLine( new GUIContent("Rim Color", "Rim Color (RGB)"), - props[Prop.RimMultiplyTexture] + props[MToon10Prop.RimMultiplyTexture] ); materialEditor.ShaderProperty( - props[Prop.RimLightingMixFactor], + props[MToon10Prop.RimLightingMixFactor], new GUIContent("Rim LightingMix") ); EditorGUILayout.Space(); materialEditor.TexturePropertySingleLine( new GUIContent("Matcap Rim", "Matcap Rim (RGB)"), - props[Prop.MatcapTexture] + props[MToon10Prop.MatcapTexture] ); EditorGUILayout.Space(); materialEditor.ShaderProperty( - props[Prop.ParametricRimColorFactor], + props[MToon10Prop.ParametricRimColorFactor], new GUIContent("Parametric Rim Color") ); materialEditor.ShaderProperty( - props[Prop.ParametricRimFresnelPowerFactor], + props[MToon10Prop.ParametricRimFresnelPowerFactor], new GUIContent("Parametric Rim Fresnel Power") ); materialEditor.ShaderProperty( - props[Prop.ParametricRimLiftFactor], + props[MToon10Prop.ParametricRimLiftFactor], new GUIContent("Parametric Rim Lift") ); } using (new LabelScope("Outline")) { - PopupEnum("Outline Mode", props[Prop.OutlineWidthMode], materialEditor); + PopupEnum("Outline Mode", props[MToon10Prop.OutlineWidthMode], materialEditor); materialEditor.TexturePropertySingleLine( new GUIContent("Outline Width", "Outline Width (G) [meter]"), - props[Prop.OutlineWidthMultiplyTexture], - props[Prop.OutlineWidthFactor] + props[MToon10Prop.OutlineWidthMultiplyTexture], + props[MToon10Prop.OutlineWidthFactor] ); materialEditor.ShaderProperty( - props[Prop.OutlineColorFactor], + props[MToon10Prop.OutlineColorFactor], new GUIContent("Outline Color") ); materialEditor.ShaderProperty( - props[Prop.OutlineLightingMixFactor], + props[MToon10Prop.OutlineLightingMixFactor], new GUIContent("Outline LightingMix") ); } @@ -137,18 +137,18 @@ namespace VRMShaders.VRM10.MToon10.Editor { materialEditor.TexturePropertySingleLine( new GUIContent("Mask", "Mask (B)"), - props[Prop.UvAnimationMaskTexture] + props[MToon10Prop.UvAnimationMaskTexture] ); materialEditor.ShaderProperty( - props[Prop.UvAnimationScrollXSpeedFactor], + props[MToon10Prop.UvAnimationScrollXSpeedFactor], new GUIContent("Translate X") ); materialEditor.ShaderProperty( - props[Prop.UvAnimationScrollYSpeedFactor], + props[MToon10Prop.UvAnimationScrollYSpeedFactor], new GUIContent("Translate Y") ); materialEditor.ShaderProperty( - props[Prop.UvAnimationRotationSpeedFactor], + props[MToon10Prop.UvAnimationRotationSpeedFactor], new GUIContent("Rotation") ); } @@ -165,11 +165,11 @@ namespace VRMShaders.VRM10.MToon10.Editor var mat = materials[0]; EditorGUILayout.LabelField("RenderQueue", mat.renderQueue.ToString()); - EditorGUILayout.LabelField("Cull", ((CullMode) props[Prop.UnityCullMode].floatValue).ToString()); - EditorGUILayout.LabelField("SrcBlend", ((BlendMode) props[Prop.UnitySrcBlend].floatValue).ToString()); - EditorGUILayout.LabelField("DstBlend", ((BlendMode) props[Prop.UnityDstBlend].floatValue).ToString()); - EditorGUILayout.LabelField("ZWrite", ((UnityZWriteMode) props[Prop.UnityZWrite].floatValue).ToString()); - EditorGUILayout.LabelField("AlphaToMask", ((UnityAlphaToMaskMode) props[Prop.UnityAlphaToMask].floatValue).ToString()); + EditorGUILayout.LabelField("Cull", ((CullMode) props[MToon10Prop.UnityCullMode].floatValue).ToString()); + EditorGUILayout.LabelField("SrcBlend", ((BlendMode) props[MToon10Prop.UnitySrcBlend].floatValue).ToString()); + EditorGUILayout.LabelField("DstBlend", ((BlendMode) props[MToon10Prop.UnityDstBlend].floatValue).ToString()); + EditorGUILayout.LabelField("ZWrite", ((UnityZWriteMode) props[MToon10Prop.UnityZWrite].floatValue).ToString()); + EditorGUILayout.LabelField("AlphaToMask", ((UnityAlphaToMaskMode) props[MToon10Prop.UnityAlphaToMask].floatValue).ToString()); EditorGUILayout.LabelField("Enabled Keywords", string.Join("\n", mat.shaderKeywords), EditorStyles.textArea); } } diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/Extensions.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/Extensions.meta new file mode 100644 index 000000000..05ff88e79 --- /dev/null +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/Extensions.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 757975a3fecf43b1ad7b288185f6c7fd +timeCreated: 1623307417 \ No newline at end of file diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MaterialExtensions.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs similarity index 70% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MaterialExtensions.cs rename to Assets/VRMShaders/VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs index f4f6edf18..7143ce4fd 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/MaterialExtensions.cs +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs @@ -1,7 +1,7 @@ using UnityEngine; using VRMShaders.VRM10.MToon10.Runtime; -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRMShaders.VRM10.MToon10.Runtime { public static class MaterialExtensions { @@ -17,17 +17,17 @@ namespace VRMShaders.VRM10.MToon10.Editor } } - public static int GetInt(this Material mat, Prop prop) + public static int GetInt(this Material mat, MToon10Prop prop) { return mat.GetInt(prop.ToUnityShaderLabName()); } - public static void SetInt(this Material mat, Prop prop, int val) + public static void SetInt(this Material mat, MToon10Prop prop, int val) { mat.SetInt(prop.ToUnityShaderLabName(), val); } - public static Texture GetTexture(this Material mat, Prop prop) + public static Texture GetTexture(this Material mat, MToon10Prop prop) { return mat.GetTexture(prop.ToUnityShaderLabName()); } diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MaterialExtensions.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MaterialExtensions.cs.meta rename to Assets/VRMShaders/VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Meta.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Meta.cs new file mode 100644 index 000000000..331a7e7af --- /dev/null +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Meta.cs @@ -0,0 +1,7 @@ +namespace VRMShaders.VRM10.MToon10.Runtime +{ + public static class MToon10Meta + { + public static readonly string UnityShaderName = "Hidden/VRM10/vrmc_materials_mtoon"; + } +} \ No newline at end of file diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Meta.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Meta.cs.meta new file mode 100644 index 000000000..97f8dd1e1 --- /dev/null +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Meta.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4cb4057134654c769422a3618b76bccc +timeCreated: 1623307086 \ No newline at end of file diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/Migrator.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Migrator.cs similarity index 97% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/Migrator.cs rename to Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Migrator.cs index eda2462bc..317b40c48 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/Migrator.cs +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Migrator.cs @@ -5,7 +5,7 @@ namespace VRMShaders.VRM10.MToon10.Runtime /// /// Migrate from VRM 0.x MToon to VRM 1.0 vrmc_materials_mtoon /// - public sealed class MToonMigrator + public static class MToon10Migrator { /// /// mtoon.shadingToonyFactor diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/Migrator.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Migrator.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/Migrator.cs.meta rename to Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Migrator.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Properties.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Properties.cs deleted file mode 100644 index 0e4e5fc9b..000000000 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Properties.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System.Collections.Generic; - -namespace VRMShaders.VRM10.MToon10.Runtime -{ - public static class MToon10Properties - { - private static readonly Dictionary _unityShaderLabNames = new Dictionary - { - [Prop.AlphaMode] = "_AlphaMode", - [Prop.TransparentWithZWrite] = "_TransparentWithZWrite", - [Prop.AlphaCutoff] = "_Cutoff", - [Prop.RenderQueueOffsetNumber] = "_RenderQueueOffset", - [Prop.DoubleSided] = "_DoubleSided", - - [Prop.BaseColorFactor] = "_Color", - [Prop.BaseColorTexture] = "_MainTex", - [Prop.ShadeColorFactor] = "_ShadeColor", - [Prop.ShadeColorTexture] = "_ShadeTex", - [Prop.NormalTexture] = "_BumpMap", - [Prop.NormalTextureScale] = "_BumpScale", - [Prop.ShadingShiftFactor] = "_ShadingShiftFactor", - [Prop.ShadingShiftTexture] = "_ShadingShiftTex", - [Prop.ShadingShiftTextureScale] = "_ShadingShiftTexScale", - [Prop.ShadingToonyFactor] = "_ShadingToonyFactor", - - [Prop.GiEqualizationFactor] = "_GiEqualization", - - [Prop.EmissiveFactor] = "_EmissionColor", - [Prop.EmissiveTexture] = "_EmissionMap", - - [Prop.MatcapTexture] = "_MatcapTex", - [Prop.ParametricRimColorFactor] = "_RimColor", - [Prop.ParametricRimFresnelPowerFactor] = "_RimFresnelPower", - [Prop.ParametricRimLiftFactor] = "_RimLift", - [Prop.RimMultiplyTexture] = "_RimTex", - [Prop.RimLightingMixFactor] = "_RimLightingMix", - - [Prop.OutlineWidthMode] = "_OutlineWidthMode", - [Prop.OutlineWidthFactor] = "_OutlineWidth", - [Prop.OutlineWidthMultiplyTexture] = "_OutlineWidthTex", - [Prop.OutlineColorFactor] = "_OutlineColor", - [Prop.OutlineLightingMixFactor] = "_OutlineLightingMix", - - [Prop.UvAnimationMaskTexture] = "_UvAnimMaskTex", - [Prop.UvAnimationScrollXSpeedFactor] = "_UvAnimScrollXSpeed", - [Prop.UvAnimationScrollYSpeedFactor] = "_UvAnimScrollYSpeed", - [Prop.UvAnimationRotationSpeedFactor] = "_UvAnimRotationSpeed", - - [Prop.UnityCullMode] = "_M_CullMode", - [Prop.UnitySrcBlend] = "_M_SrcBlend", - [Prop.UnityDstBlend] = "_M_DstBlend", - [Prop.UnityZWrite] = "_M_ZWrite", - [Prop.UnityAlphaToMask] = "_M_AlphaToMask", - }; - - public static IReadOnlyDictionary UnityShaderLabNames => _unityShaderLabNames; - - public static string ToUnityShaderLabName(this Prop prop) - { - return UnityShaderLabNames[prop]; - } - } -} \ No newline at end of file diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonValidator.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/MToonValidator.cs similarity index 54% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonValidator.cs rename to Assets/VRMShaders/VRM10/MToon10/Runtime/MToonValidator.cs index 013fbe23d..58143cb66 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonValidator.cs +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/MToonValidator.cs @@ -3,7 +3,7 @@ using UnityEngine; using UnityEngine.Rendering; using VRMShaders.VRM10.MToon10.Runtime; -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRMShaders.VRM10.MToon10.Runtime { public sealed class MToonValidator { @@ -16,58 +16,58 @@ namespace VRMShaders.VRM10.MToon10.Editor public void Validate() { - var alphaMode = (AlphaMode) _material.GetInt(Prop.AlphaMode); - var zWriteMode = (TransparentWithZWriteMode) _material.GetInt(Prop.TransparentWithZWrite); - var renderQueueOffset = _material.GetInt(Prop.RenderQueueOffsetNumber); - var doubleSidedMode = (DoubleSidedMode) _material.GetInt(Prop.DoubleSided); + var alphaMode = (AlphaMode) _material.GetInt(MToon10Prop.AlphaMode); + var zWriteMode = (TransparentWithZWriteMode) _material.GetInt(MToon10Prop.TransparentWithZWrite); + var renderQueueOffset = _material.GetInt(MToon10Prop.RenderQueueOffsetNumber); + var doubleSidedMode = (DoubleSidedMode) _material.GetInt(MToon10Prop.DoubleSided); SetUnityShaderPassSettings(_material, alphaMode, zWriteMode, renderQueueOffset, doubleSidedMode); SetUnityShaderVariants(_material); } private static void SetUnityShaderPassSettings(Material material, AlphaMode alphaMode, TransparentWithZWriteMode zWriteMode, int renderQueueOffset, DoubleSidedMode doubleSidedMode) { - material.SetInt(Prop.AlphaMode, (int) alphaMode); - material.SetInt(Prop.TransparentWithZWrite, (int) zWriteMode); - material.SetInt(Prop.DoubleSided, (int) doubleSidedMode); + material.SetInt(MToon10Prop.AlphaMode, (int) alphaMode); + material.SetInt(MToon10Prop.TransparentWithZWrite, (int) zWriteMode); + material.SetInt(MToon10Prop.DoubleSided, (int) doubleSidedMode); switch (alphaMode) { case AlphaMode.Opaque: material.SetOverrideTag(UnityRenderTag.Key, UnityRenderTag.OpaqueValue); - material.SetInt(Prop.UnitySrcBlend, (int) BlendMode.One); - material.SetInt(Prop.UnityDstBlend, (int) BlendMode.Zero); - material.SetInt(Prop.UnityZWrite, (int) UnityZWriteMode.On); - material.SetInt(Prop.UnityAlphaToMask, (int) UnityAlphaToMaskMode.Off); + material.SetInt(MToon10Prop.UnitySrcBlend, (int) BlendMode.One); + material.SetInt(MToon10Prop.UnityDstBlend, (int) BlendMode.Zero); + material.SetInt(MToon10Prop.UnityZWrite, (int) UnityZWriteMode.On); + material.SetInt(MToon10Prop.UnityAlphaToMask, (int) UnityAlphaToMaskMode.Off); renderQueueOffset = 0; material.renderQueue = (int) RenderQueue.Geometry; break; case AlphaMode.Cutout: material.SetOverrideTag(UnityRenderTag.Key, UnityRenderTag.TransparentCutoutValue); - material.SetInt(Prop.UnitySrcBlend, (int) BlendMode.One); - material.SetInt(Prop.UnityDstBlend, (int) BlendMode.Zero); - material.SetInt(Prop.UnityZWrite, (int) UnityZWriteMode.On); - material.SetInt(Prop.UnityAlphaToMask, (int) UnityAlphaToMaskMode.On); + material.SetInt(MToon10Prop.UnitySrcBlend, (int) BlendMode.One); + material.SetInt(MToon10Prop.UnityDstBlend, (int) BlendMode.Zero); + material.SetInt(MToon10Prop.UnityZWrite, (int) UnityZWriteMode.On); + material.SetInt(MToon10Prop.UnityAlphaToMask, (int) UnityAlphaToMaskMode.On); renderQueueOffset = 0; material.renderQueue = (int) RenderQueue.AlphaTest; break; case AlphaMode.Transparent when zWriteMode == TransparentWithZWriteMode.Off: material.SetOverrideTag(UnityRenderTag.Key, UnityRenderTag.TransparentValue); - material.SetInt(Prop.UnitySrcBlend, (int) BlendMode.SrcAlpha); - material.SetInt(Prop.UnityDstBlend, (int) BlendMode.OneMinusSrcAlpha); - material.SetInt(Prop.UnityZWrite, (int) UnityZWriteMode.Off); - material.SetInt(Prop.UnityAlphaToMask, (int) UnityAlphaToMaskMode.Off); + material.SetInt(MToon10Prop.UnitySrcBlend, (int) BlendMode.SrcAlpha); + material.SetInt(MToon10Prop.UnityDstBlend, (int) BlendMode.OneMinusSrcAlpha); + material.SetInt(MToon10Prop.UnityZWrite, (int) UnityZWriteMode.Off); + material.SetInt(MToon10Prop.UnityAlphaToMask, (int) UnityAlphaToMaskMode.Off); renderQueueOffset = Mathf.Clamp(renderQueueOffset, -9, 0); material.renderQueue = (int) RenderQueue.Transparent + renderQueueOffset; break; case AlphaMode.Transparent when zWriteMode == TransparentWithZWriteMode.On: material.SetOverrideTag(UnityRenderTag.Key, UnityRenderTag.TransparentValue); - material.SetInt(Prop.UnitySrcBlend, (int) BlendMode.SrcAlpha); - material.SetInt(Prop.UnityDstBlend, (int) BlendMode.OneMinusSrcAlpha); - material.SetInt(Prop.UnityZWrite, (int) UnityZWriteMode.On); - material.SetInt(Prop.UnityAlphaToMask, (int) UnityAlphaToMaskMode.Off); + material.SetInt(MToon10Prop.UnitySrcBlend, (int) BlendMode.SrcAlpha); + material.SetInt(MToon10Prop.UnityDstBlend, (int) BlendMode.OneMinusSrcAlpha); + material.SetInt(MToon10Prop.UnityZWrite, (int) UnityZWriteMode.On); + material.SetInt(MToon10Prop.UnityAlphaToMask, (int) UnityAlphaToMaskMode.Off); renderQueueOffset = Mathf.Clamp(renderQueueOffset, 0, +9); material.renderQueue = (int) RenderQueue.GeometryLast + 1 + renderQueueOffset; // Transparent First + N @@ -79,17 +79,17 @@ namespace VRMShaders.VRM10.MToon10.Editor switch (doubleSidedMode) { case DoubleSidedMode.Off: - material.SetInt(Prop.UnityCullMode, (int) CullMode.Back); + material.SetInt(MToon10Prop.UnityCullMode, (int) CullMode.Back); break; case DoubleSidedMode.On: - material.SetInt(Prop.UnityCullMode, (int) CullMode.Off); + material.SetInt(MToon10Prop.UnityCullMode, (int) CullMode.Off); break; default: throw new ArgumentOutOfRangeException(nameof(doubleSidedMode), doubleSidedMode, null); } // Set after validation - material.SetInt(Prop.RenderQueueOffsetNumber, renderQueueOffset); + material.SetInt(MToon10Prop.RenderQueueOffsetNumber, renderQueueOffset); } private static void SetUnityCullingSettings(Material material, DoubleSidedMode doubleSidedMode) @@ -101,11 +101,11 @@ namespace VRMShaders.VRM10.MToon10.Editor { material.SetKeyword( UnityAlphaModeKeyword.AlphaTest, - (AlphaMode) material.GetInt(Prop.AlphaMode) == AlphaMode.Cutout + (AlphaMode) material.GetInt(MToon10Prop.AlphaMode) == AlphaMode.Cutout ); material.SetKeyword( UnityAlphaModeKeyword.AlphaBlend, - (AlphaMode) material.GetInt(Prop.AlphaMode) == AlphaMode.Transparent + (AlphaMode) material.GetInt(MToon10Prop.AlphaMode) == AlphaMode.Transparent ); material.SetKeyword( UnityAlphaModeKeyword.AlphaPremultiply, @@ -113,30 +113,30 @@ namespace VRMShaders.VRM10.MToon10.Editor ); material.SetKeyword( NormalMapKeyword.On, - material.GetTexture(Prop.NormalTexture) != null + material.GetTexture(MToon10Prop.NormalTexture) != null ); material.SetKeyword( EmissiveMapKeyword.On, - material.GetTexture(Prop.EmissiveTexture) != null + material.GetTexture(MToon10Prop.EmissiveTexture) != null ); material.SetKeyword( RimMapKeyword.On, - material.GetTexture(Prop.MatcapTexture) != null || // Matcap - material.GetTexture(Prop.RimMultiplyTexture) != null // Rim + material.GetTexture(MToon10Prop.MatcapTexture) != null || // Matcap + material.GetTexture(MToon10Prop.RimMultiplyTexture) != null // Rim ); material.SetKeyword( ParameterMapKeyword.On, - material.GetTexture(Prop.ShadingShiftTexture) != null || // Shading Shift (R) - material.GetTexture(Prop.OutlineWidthMultiplyTexture) != null || // Outline Width (G) - material.GetTexture(Prop.UvAnimationMaskTexture) != null // UV Anim Mask (B) + material.GetTexture(MToon10Prop.ShadingShiftTexture) != null || // Shading Shift (R) + material.GetTexture(MToon10Prop.OutlineWidthMultiplyTexture) != null || // Outline Width (G) + material.GetTexture(MToon10Prop.UvAnimationMaskTexture) != null // UV Anim Mask (B) ); material.SetKeyword( OutlineModeKeyword.World, - (OutlineMode) material.GetInt(Prop.OutlineWidthMode) == OutlineMode.World + (OutlineMode) material.GetInt(MToon10Prop.OutlineWidthMode) == OutlineMode.World ); material.SetKeyword( OutlineModeKeyword.Screen, - (OutlineMode) material.GetInt(Prop.OutlineWidthMode) == OutlineMode.Screen + (OutlineMode) material.GetInt(MToon10Prop.OutlineWidthMode) == OutlineMode.Screen ); } } diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonValidator.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/MToonValidator.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonValidator.cs.meta rename to Assets/VRMShaders/VRM10/MToon10/Runtime/MToonValidator.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab.meta new file mode 100644 index 000000000..25e2a8b92 --- /dev/null +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f9b3c71ed31c4ffba700ebf1f8705524 +timeCreated: 1623307328 \ No newline at end of file diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/Prop.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToon10Prop.cs similarity index 97% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/Prop.cs rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToon10Prop.cs index 7601b7701..c7047cecf 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/Prop.cs +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToon10Prop.cs @@ -1,6 +1,6 @@ namespace VRMShaders.VRM10.MToon10.Runtime { - public enum Prop + public enum MToon10Prop { // Rendering AlphaMode, diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/Prop.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToon10Prop.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/Prop.cs.meta rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToon10Prop.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToon10Properties.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToon10Properties.cs new file mode 100644 index 000000000..29aa35d7b --- /dev/null +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToon10Properties.cs @@ -0,0 +1,63 @@ +using System.Collections.Generic; + +namespace VRMShaders.VRM10.MToon10.Runtime +{ + public static class MToon10Properties + { + private static readonly Dictionary _unityShaderLabNames = new Dictionary + { + [MToon10Prop.AlphaMode] = "_AlphaMode", + [MToon10Prop.TransparentWithZWrite] = "_TransparentWithZWrite", + [MToon10Prop.AlphaCutoff] = "_Cutoff", + [MToon10Prop.RenderQueueOffsetNumber] = "_RenderQueueOffset", + [MToon10Prop.DoubleSided] = "_DoubleSided", + + [MToon10Prop.BaseColorFactor] = "_Color", + [MToon10Prop.BaseColorTexture] = "_MainTex", + [MToon10Prop.ShadeColorFactor] = "_ShadeColor", + [MToon10Prop.ShadeColorTexture] = "_ShadeTex", + [MToon10Prop.NormalTexture] = "_BumpMap", + [MToon10Prop.NormalTextureScale] = "_BumpScale", + [MToon10Prop.ShadingShiftFactor] = "_ShadingShiftFactor", + [MToon10Prop.ShadingShiftTexture] = "_ShadingShiftTex", + [MToon10Prop.ShadingShiftTextureScale] = "_ShadingShiftTexScale", + [MToon10Prop.ShadingToonyFactor] = "_ShadingToonyFactor", + + [MToon10Prop.GiEqualizationFactor] = "_GiEqualization", + + [MToon10Prop.EmissiveFactor] = "_EmissionColor", + [MToon10Prop.EmissiveTexture] = "_EmissionMap", + + [MToon10Prop.MatcapTexture] = "_MatcapTex", + [MToon10Prop.ParametricRimColorFactor] = "_RimColor", + [MToon10Prop.ParametricRimFresnelPowerFactor] = "_RimFresnelPower", + [MToon10Prop.ParametricRimLiftFactor] = "_RimLift", + [MToon10Prop.RimMultiplyTexture] = "_RimTex", + [MToon10Prop.RimLightingMixFactor] = "_RimLightingMix", + + [MToon10Prop.OutlineWidthMode] = "_OutlineWidthMode", + [MToon10Prop.OutlineWidthFactor] = "_OutlineWidth", + [MToon10Prop.OutlineWidthMultiplyTexture] = "_OutlineWidthTex", + [MToon10Prop.OutlineColorFactor] = "_OutlineColor", + [MToon10Prop.OutlineLightingMixFactor] = "_OutlineLightingMix", + + [MToon10Prop.UvAnimationMaskTexture] = "_UvAnimMaskTex", + [MToon10Prop.UvAnimationScrollXSpeedFactor] = "_UvAnimScrollXSpeed", + [MToon10Prop.UvAnimationScrollYSpeedFactor] = "_UvAnimScrollYSpeed", + [MToon10Prop.UvAnimationRotationSpeedFactor] = "_UvAnimRotationSpeed", + + [MToon10Prop.UnityCullMode] = "_M_CullMode", + [MToon10Prop.UnitySrcBlend] = "_M_SrcBlend", + [MToon10Prop.UnityDstBlend] = "_M_DstBlend", + [MToon10Prop.UnityZWrite] = "_M_ZWrite", + [MToon10Prop.UnityAlphaToMask] = "_M_AlphaToMask", + }; + + public static IReadOnlyDictionary UnityShaderLabNames => _unityShaderLabNames; + + public static string ToUnityShaderLabName(this MToon10Prop prop) + { + return UnityShaderLabNames[prop]; + } + } +} \ No newline at end of file diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Properties.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToon10Properties.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Properties.cs.meta rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToon10Properties.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue.meta new file mode 100644 index 000000000..439f303e4 --- /dev/null +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5f987f36ced048ae95acea66b5eeb2dc +timeCreated: 1623307328 \ No newline at end of file diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/AlphaMode.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/AlphaMode.cs similarity index 69% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/AlphaMode.cs rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/AlphaMode.cs index 9cec1a274..801577b7f 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/AlphaMode.cs +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/AlphaMode.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRMShaders.VRM10.MToon10.Runtime { public enum AlphaMode { diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/AlphaMode.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/AlphaMode.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/AlphaMode.cs.meta rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/AlphaMode.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/DoubleSidedMode.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/DoubleSidedMode.cs similarity index 62% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/DoubleSidedMode.cs rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/DoubleSidedMode.cs index 5c7ef2fb8..aef0bf38a 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/DoubleSidedMode.cs +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/DoubleSidedMode.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRMShaders.VRM10.MToon10.Runtime { public enum DoubleSidedMode { diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/DoubleSidedMode.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/DoubleSidedMode.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/DoubleSidedMode.cs.meta rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/DoubleSidedMode.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/EmissiveMapKeyword.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/EmissiveMapKeyword.cs similarity index 70% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/EmissiveMapKeyword.cs rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/EmissiveMapKeyword.cs index 96a8aac95..d528adb7f 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/EmissiveMapKeyword.cs +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/EmissiveMapKeyword.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRMShaders.VRM10.MToon10.Runtime { public static class EmissiveMapKeyword { diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/EmissiveMapKeyword.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/EmissiveMapKeyword.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/EmissiveMapKeyword.cs.meta rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/EmissiveMapKeyword.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/NormalMapKeyword.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/NormalMapKeyword.cs similarity index 68% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/NormalMapKeyword.cs rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/NormalMapKeyword.cs index 1c9358db3..d6e39c522 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/NormalMapKeyword.cs +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/NormalMapKeyword.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRMShaders.VRM10.MToon10.Runtime { public static class NormalMapKeyword { diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/NormalMapKeyword.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/NormalMapKeyword.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/NormalMapKeyword.cs.meta rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/NormalMapKeyword.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/OutlineMode.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineMode.cs similarity index 67% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/OutlineMode.cs rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineMode.cs index 5c157566a..536403a30 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/OutlineMode.cs +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineMode.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRMShaders.VRM10.MToon10.Runtime { public enum OutlineMode { diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/OutlineMode.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineMode.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/OutlineMode.cs.meta rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineMode.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/OutlineModeKeyword.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineModeKeyword.cs similarity index 79% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/OutlineModeKeyword.cs rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineModeKeyword.cs index 408821b31..d4f1f4e19 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/OutlineModeKeyword.cs +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineModeKeyword.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRMShaders.VRM10.MToon10.Runtime { public static class OutlineModeKeyword { diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/OutlineModeKeyword.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineModeKeyword.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/OutlineModeKeyword.cs.meta rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineModeKeyword.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/ParameterMapKeyword.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/ParameterMapKeyword.cs similarity index 70% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/ParameterMapKeyword.cs rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/ParameterMapKeyword.cs index 7d83c8789..7acea68a2 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/ParameterMapKeyword.cs +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/ParameterMapKeyword.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRMShaders.VRM10.MToon10.Runtime { public static class ParameterMapKeyword { diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/ParameterMapKeyword.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/ParameterMapKeyword.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/ParameterMapKeyword.cs.meta rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/ParameterMapKeyword.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/RimMapKeyword.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/RimMapKeyword.cs similarity index 68% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/RimMapKeyword.cs rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/RimMapKeyword.cs index ed2f61ce7..d9d19c698 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/RimMapKeyword.cs +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/RimMapKeyword.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRMShaders.VRM10.MToon10.Runtime { public static class RimMapKeyword { diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/RimMapKeyword.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/RimMapKeyword.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/RimMapKeyword.cs.meta rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/RimMapKeyword.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/TransparentWithZWriteMode.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/TransparentWithZWriteMode.cs similarity index 65% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/TransparentWithZWriteMode.cs rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/TransparentWithZWriteMode.cs index 946e52bd4..7c1194eb8 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/TransparentWithZWriteMode.cs +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/TransparentWithZWriteMode.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRMShaders.VRM10.MToon10.Runtime { public enum TransparentWithZWriteMode { diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/TransparentWithZWriteMode.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/TransparentWithZWriteMode.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/MToonDefined/TransparentWithZWriteMode.cs.meta rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/TransparentWithZWriteMode.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined.meta rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityAlphaModeKeyword.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityAlphaModeKeyword.cs similarity index 84% rename from Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityAlphaModeKeyword.cs rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityAlphaModeKeyword.cs index 2dd590eb7..bfb0c93b3 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityAlphaModeKeyword.cs +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityAlphaModeKeyword.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRMShaders.VRM10.MToon10.Runtime { public static class UnityAlphaModeKeyword { diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityAlphaModeKeyword.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityAlphaModeKeyword.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityAlphaModeKeyword.cs.meta rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityAlphaModeKeyword.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityAlphaToMaskMode.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityAlphaToMaskMode.cs similarity index 64% rename from Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityAlphaToMaskMode.cs rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityAlphaToMaskMode.cs index ab0e1f736..41b792af2 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityAlphaToMaskMode.cs +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityAlphaToMaskMode.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRMShaders.VRM10.MToon10.Runtime { public enum UnityAlphaToMaskMode { diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityAlphaToMaskMode.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityAlphaToMaskMode.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityAlphaToMaskMode.cs.meta rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityAlphaToMaskMode.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityRenderTag.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityRenderTag.cs similarity index 86% rename from Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityRenderTag.cs rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityRenderTag.cs index 2a7a50136..1631b96e8 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityRenderTag.cs +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityRenderTag.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRMShaders.VRM10.MToon10.Runtime { public static class UnityRenderTag { diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityRenderTag.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityRenderTag.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityRenderTag.cs.meta rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityRenderTag.cs.meta diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityZWriteMode.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityZWriteMode.cs similarity index 62% rename from Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityZWriteMode.cs rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityZWriteMode.cs index 4d7a85441..6b5d5855d 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityZWriteMode.cs +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityZWriteMode.cs @@ -1,4 +1,4 @@ -namespace VRMShaders.VRM10.MToon10.Editor +namespace VRMShaders.VRM10.MToon10.Runtime { public enum UnityZWriteMode { diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityZWriteMode.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityZWriteMode.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM10/MToon10/Editor/UnityDefined/UnityZWriteMode.cs.meta rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityZWriteMode.cs.meta