Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-27 21:34:38 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add EditMode

Browse Source
This commit is contained in:
Masataka SUMI
2021-07-15 18:05:34 +09:00
parent 8c661736cd
commit f71e1fbbce
4 changed files with 103 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
Assets/VRMShaders/VRM10/MToon10/Editor/MToonInspector.cs
View File

@@ -19,12 +19,21 @@ namespace VRMShaders.VRM10.MToon10.Editor
EditorGUI.BeginChangeCheck();
EditorGUILayout.HelpBox("This shader is for VRM 1.0.", MessageType.Info);
using (new LabelScope("Editor Settings"))
{
PopupEnum<MToon10EditorEditMode>("Edit Mode", props[MToon10Prop.EditorEditMode], materialEditor);
}
var editMode = (MToon10EditorEditMode) (int) props[MToon10Prop.EditorEditMode].floatValue;
var isAdvancedEditMode = editMode == MToon10EditorEditMode.Advanced;
using (new LabelScope("Rendering"))
{
PopupEnum<MToon10AlphaMode>("Alpha Mode", props[MToon10Prop.AlphaMode], materialEditor);
var alphaMode = (MToon10AlphaMode) (int) props[MToon10Prop.AlphaMode].floatValue;
if (alphaMode == MToon10AlphaMode.Transparent)
if (isAdvancedEditMode && alphaMode == MToon10AlphaMode.Transparent)
{
PopupEnum<MToon10TransparentWithZWriteMode>(
"Transparent With ZWrite Mode",
@@ -40,7 +49,10 @@ namespace VRMShaders.VRM10.MToon10.Editor
PopupEnum<MToon10DoubleSidedMode>("Double Sided", props[MToon10Prop.DoubleSided], materialEditor);
materialEditor.ShaderProperty(props[MToon10Prop.RenderQueueOffsetNumber], "RenderQueue Offset");
if (isAdvancedEditMode)
{
materialEditor.ShaderProperty(props[MToon10Prop.RenderQueueOffsetNumber], "RenderQueue Offset");
}
}
using (new LabelScope("Lighting"))
@@ -55,23 +67,34 @@ namespace VRMShaders.VRM10.MToon10.Editor
props[MToon10Prop.ShadeColorTexture],
props[MToon10Prop.ShadeColorFactor]
);
materialEditor.TexturePropertySingleLine(
new GUIContent("Normal Map", "Normal Map (RGB)"),
props[MToon10Prop.NormalTexture],
props[MToon10Prop.NormalTextureScale]
);
materialEditor.ShaderProperty(props[MToon10Prop.ShadingShiftFactor], "Shading Shift");
if (isAdvancedEditMode)
{
materialEditor.TexturePropertySingleLine(
new GUIContent("Normal Map", "Normal Map (RGB)"),
props[MToon10Prop.NormalTexture],
props[MToon10Prop.NormalTextureScale]
);
}
EditorGUILayout.Space();
materialEditor.ShaderProperty(props[MToon10Prop.ShadingToonyFactor], "Shading Toony");
materialEditor.TexturePropertySingleLine(
new GUIContent("Additive Shading Shift", "Shading Shift (R)"),
props[MToon10Prop.ShadingShiftTexture],
props[MToon10Prop.ShadingShiftTextureScale]
);
materialEditor.ShaderProperty(props[MToon10Prop.ShadingShiftFactor], "Shading Shift");
if (isAdvancedEditMode)
{
materialEditor.TexturePropertySingleLine(
new GUIContent("Additive Shading Shift", "Shading Shift (R)"),
props[MToon10Prop.ShadingShiftTexture],
props[MToon10Prop.ShadingShiftTextureScale]
);
}
}
using (new LabelScope("Global Illumination"))
if (isAdvancedEditMode)
{
materialEditor.ShaderProperty(props[MToon10Prop.GiEqualizationFactor], "GI Equalization");
using (new LabelScope("Global Illumination"))
{
materialEditor.ShaderProperty(props[MToon10Prop.GiEqualizationFactor], "GI Equalization");
}
}
using (new LabelScope("Emission"))
@@ -89,16 +112,19 @@ namespace VRMShaders.VRM10.MToon10.Editor
new GUIContent("Rim Color", "Rim Color (RGB)"),
props[MToon10Prop.RimMultiplyTexture]
);
materialEditor.ShaderProperty(
props[MToon10Prop.RimLightingMixFactor],
new GUIContent("Rim LightingMix")
);
EditorGUILayout.Space();
if (isAdvancedEditMode)
{
materialEditor.ShaderProperty(
props[MToon10Prop.RimLightingMixFactor],
new GUIContent("Rim LightingMix")
);
EditorGUILayout.Space();
materialEditor.TexturePropertySingleLine(
new GUIContent("Matcap Rim", "Matcap Rim (RGB)"),
props[MToon10Prop.MatcapTexture]
);
materialEditor.TexturePropertySingleLine(
new GUIContent("Matcap Rim", "Matcap Rim (RGB)"),
props[MToon10Prop.MatcapTexture]
);
}
EditorGUILayout.Space();
materialEditor.ShaderProperty(
@@ -118,39 +144,50 @@ namespace VRMShaders.VRM10.MToon10.Editor
using (new LabelScope("Outline"))
{
PopupEnum<MToon10OutlineMode>("Outline Mode", props[MToon10Prop.OutlineWidthMode], materialEditor);
materialEditor.TexturePropertySingleLine(
new GUIContent("Outline Width", "Outline Width (G) [meter]"),
props[MToon10Prop.OutlineWidthMultiplyTexture],
props[MToon10Prop.OutlineWidthFactor]
);
materialEditor.ShaderProperty(
props[MToon10Prop.OutlineColorFactor],
new GUIContent("Outline Color")
);
materialEditor.ShaderProperty(
props[MToon10Prop.OutlineLightingMixFactor],
new GUIContent("Outline LightingMix")
);
var hasOutline = (MToon10OutlineMode) (int) props[MToon10Prop.OutlineWidthMode].floatValue != MToon10OutlineMode.None;
if (hasOutline)
{
materialEditor.TexturePropertySingleLine(
new GUIContent("Outline Width", "Outline Width (G) [meter]"),
props[MToon10Prop.OutlineWidthMultiplyTexture],
props[MToon10Prop.OutlineWidthFactor]
);
materialEditor.ShaderProperty(
props[MToon10Prop.OutlineColorFactor],
new GUIContent("Outline Color")
);
if (isAdvancedEditMode)
{
materialEditor.ShaderProperty(
props[MToon10Prop.OutlineLightingMixFactor],
new GUIContent("Outline LightingMix")
);
}
}
}
using (new LabelScope("UV Animation"))
if (isAdvancedEditMode)
{
materialEditor.TexturePropertySingleLine(
new GUIContent("Mask", "Mask (B)"),
props[MToon10Prop.UvAnimationMaskTexture]
);
materialEditor.ShaderProperty(
props[MToon10Prop.UvAnimationScrollXSpeedFactor],
new GUIContent("Translate X")
);
materialEditor.ShaderProperty(
props[MToon10Prop.UvAnimationScrollYSpeedFactor],
new GUIContent("Translate Y")
);
materialEditor.ShaderProperty(
props[MToon10Prop.UvAnimationRotationSpeedFactor],
new GUIContent("Rotation")
);
using (new LabelScope("UV Animation"))
{
materialEditor.TexturePropertySingleLine(
new GUIContent("Mask", "Mask (B)"),
props[MToon10Prop.UvAnimationMaskTexture]
);
materialEditor.ShaderProperty(
props[MToon10Prop.UvAnimationScrollXSpeedFactor],
new GUIContent("Translate X")
);
materialEditor.ShaderProperty(
props[MToon10Prop.UvAnimationScrollYSpeedFactor],
new GUIContent("Translate Y")
);
materialEditor.ShaderProperty(
props[MToon10Prop.UvAnimationRotationSpeedFactor],
new GUIContent("Rotation")
);
}
}
if (EditorGUI.EndChangeCheck())
@@ -158,12 +195,11 @@ namespace VRMShaders.VRM10.MToon10.Editor
Validate(materials);
}
using (new LabelScope("Debug"))
if (isAdvancedEditMode && materials.Length == 1)
{
if (materials.Length == 1)
var mat = materials[0];
using (new LabelScope("Debug"))
{
var mat = materials[0];
EditorGUILayout.LabelField("RenderQueue", mat.renderQueue.ToString());
EditorGUILayout.LabelField("Cull", ((CullMode) props[MToon10Prop.UnityCullMode].floatValue).ToString());
EditorGUILayout.LabelField("SrcBlend", ((BlendMode) props[MToon10Prop.UnitySrcBlend].floatValue).ToString());
@@ -193,7 +229,7 @@ namespace VRMShaders.VRM10.MToon10.Editor
var changed = EditorGUI.EndChangeCheck();
if (changed)
{
editor.RegisterPropertyChangeUndo("EnumPopUp");
editor.RegisterPropertyChangeUndo($"Change {name}");
property.floatValue = ret;
}

3
Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader
View File

@@ -58,6 +58,9 @@ Shader "VRM10/MToon10"
// etc
_M_DebugMode ("_DebugMode", Float) = 0.0
// for Editor
_M_EditMode ("_EditMode", Float) = 0.0
}
// Shader Model 3.0

3
Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs
View File

@@ -55,5 +55,8 @@
UnityDstBlend,
UnityZWrite,
UnityAlphaToMask,
// for Editor
EditorEditMode,
}
}

2
Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs
View File

@@ -51,6 +51,8 @@ namespace VRMShaders.VRM10.MToon10.Runtime
[MToon10Prop.UnityDstBlend] = "_M_DstBlend",
[MToon10Prop.UnityZWrite] = "_M_ZWrite",
[MToon10Prop.UnityAlphaToMask] = "_M_AlphaToMask",
[MToon10Prop.EditorEditMode] = "_M_EditMode",
};
public static IReadOnlyDictionary<MToon10Prop, string> UnityShaderLabNames => _unityShaderLabNames;