Misaki/com.misaki.hdrp-toon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Folder clean up;

Browse Source 
Added Emissive;
This commit is contained in:
Misaki
2025-01-29 12:27:09 +09:00
parent 1a82022a6f
commit 018300e046
81 changed files with 120 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Editor/MeterialEditor/UTS3GUI.cs
View File

@@ -544,8 +544,8 @@ namespace UnityEditor.Rendering.Toon
angelRing_Sampler = FindProperty("_AngelRing_Sampler", props, false);
angelRing_Color = FindProperty("_AngelRing_Color", props, false);
emissive_Tex = FindProperty("_Emissive_Tex", props);
emissive_Color = FindProperty("_Emissive_Color", props);
emissive_Tex = FindProperty("_EmissiveColorMap", props);
emissive_Color = FindProperty("_EmissiveColor", props);
outline_Sampler = FindProperty(ShaderProp_Outline_Sampler, props, false);
@@ -1573,7 +1573,7 @@ namespace UnityEditor.Rendering.Toon
case ShadowMode.Normal:
{
material.SetFloat(ShaderPropShadowMode, (int)ShadowMode.Normal);
material.DisableKeyword(new LocalKeyword(material.shader, "_SDFShadow"));
material.DisableKeyword(new LocalKeyword(material.shader, "_SHADOW_MODE_SDF"));
GUI_RangeProperty(material, Styles.shaderProp1st_ShadeColor_StepText);
GUI_RangeProperty(material, Styles.shaderProp1st_ShadeColor_FeatherText);
@@ -1591,7 +1591,7 @@ namespace UnityEditor.Rendering.Toon
case ShadowMode.SDF:
{
material.SetFloat(ShaderPropShadowMode, (int)ShadowMode.SDF);
material.EnableKeyword(new LocalKeyword(material.shader, "_SDFShadow"));
material.EnableKeyword(new LocalKeyword(material.shader, "_SHADOW_MODE_SDF"));
m_MaterialEditor.TexturePropertySingleLine(Styles.SDFShadowText, SDFShadowMap);
GUI_RangeProperty(material, Styles.SDFShadowLevelText);
GUI_RangeProperty(material, Styles.SDFSmoothGammaText);
@@ -1707,13 +1707,14 @@ namespace UnityEditor.Rendering.Toon
SwitchKeywrod(material, PbrModeDefines[(int)m_pbrMode], PbrModeDefines);
m_MaterialEditor.TexturePropertySingleLine(Styles.normalMapText, normalMap, normalScale);
material.SetKeyword(new LocalKeyword(material.shader, "_NORMAL_MAP"), normalMap.textureValue != null);
if (m_pbrMode != PBRMode.Off)
{
m_MaterialEditor.TexturePropertySingleLine(Styles.MaskMapText, Mask);
if (Mask.textureValue == null)
{
material.DisableKeyword(new LocalKeyword(material.shader, "_MASKMAP"));
material.DisableKeyword(new LocalKeyword(material.shader, "_MASK_MAP"));
if (m_pbrMode != PBRMode.KKHair)
{
GUI_RangeProperty(material, Styles.MetallicText);
@@ -1722,7 +1723,7 @@ namespace UnityEditor.Rendering.Toon
}
else
{
material.EnableKeyword(new LocalKeyword(material.shader, "_MASKMAP"));
material.EnableKeyword(new LocalKeyword(material.shader, "_MASK_MAP"));
m_MaterialEditor.MinMaxShaderProperty(MetallicRemapMin, MetallicRemapMax, minLimit: 0, 1, Styles.MetallicRemap);
m_MaterialEditor.MinMaxShaderProperty(AORemapMin, AORemapMax, 0, 1, Styles.AORemap);
m_MaterialEditor.MinMaxShaderProperty(RoughnessRemapMin, RoughnessRemapMax, 0, 1, Styles.RoughnessRemap);
@@ -1730,9 +1731,9 @@ namespace UnityEditor.Rendering.Toon
}
else
{
material.DisableKeyword(new LocalKeyword(material.shader, "_MASKMAP"));
material.DisableKeyword(new LocalKeyword(material.shader, "_ANISOTROPYMAP"));
material.DisableKeyword(new LocalKeyword(material.shader, "_SPECULARCOLORMAP"));
material.DisableKeyword(new LocalKeyword(material.shader, "_MASK_MAP"));
material.DisableKeyword(new LocalKeyword(material.shader, "_ANISOTROPY_MAP"));
material.DisableKeyword(new LocalKeyword(material.shader, "_SPECULAR_COLOR_MAP"));
}
@@ -1751,11 +1752,11 @@ namespace UnityEditor.Rendering.Toon
if (AnisotropyMap.textureValue == null)
{
material.DisableKeyword(new LocalKeyword(material.shader, "_ANISOTROPYMAP"));
material.DisableKeyword(new LocalKeyword(material.shader, "_ANISOTROPY_MAP"));
}
else
{
material.EnableKeyword(new LocalKeyword(material.shader, "_ANISOTROPYMAP"));
material.EnableKeyword(new LocalKeyword(material.shader, "_ANISOTROPY_MAP"));
}
}
@@ -1764,11 +1765,11 @@ namespace UnityEditor.Rendering.Toon
m_MaterialEditor.TexturePropertySingleLine(new GUIContent("Specular Color Map"), SpecColorMap, SpecColor);
if (SpecColorMap.textureValue == null)
{
material.DisableKeyword(new LocalKeyword(material.shader, "_SPECULARCOLORMAP"));
material.DisableKeyword(new LocalKeyword(material.shader, "_SPECULAR_COLOR_MAP"));
}
else
{
material.EnableKeyword(new LocalKeyword(material.shader, "_SPECULARCOLORMAP"));
material.EnableKeyword(new LocalKeyword(material.shader, "_SPECULAR_COLOR_MAP"));
}
m_MaterialEditor.MinMaxShaderProperty(SpecFeather, SpecStep, 0, 1, Styles.SpecRemap);
}
@@ -2242,9 +2243,9 @@ namespace UnityEditor.Rendering.Toon
void GUI_Emissive(Material material)
{
m_MaterialEditor.TexturePropertySingleLine(Styles.emissiveTexText, emissive_Tex, emissive_Color);
m_MaterialEditor.TextureScaleOffsetProperty(emissive_Tex);
material.SetKeyword(new LocalKeyword(material.shader, "_EMISSIVE_COLOR_MAP"), emissive_Tex.textureValue != null);
var _EmissiveMode_Setting = MaterialGetInt(material, "_EMISSIVE");
if ((int)EmissionMode.SimpleEmissive == _EmissiveMode_Setting)