Skip to content

Commit

Permalink
Detail Normal Final Revisit
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rhyperi
Rhyperi committed Apr 25, 2020
1 parent 0dc614d commit 40f133b
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 10 deletions.
Binary file modified Lit + MMD Spheres.7z
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Lit + MMD Spheres/Editor/RhyFlatLitMMDEditor - Detail.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public override void OnGUI(MaterialEditor materialEditor, MaterialProperty[] pro
materialEditor.ShaderProperty(speedY, new GUIContent("Mask Y Scroll Speed"), 0);
EditorGUI.indentLevel -= 2;
GUILayout.Space(20);
GUILayout.Label("Version: " + shaderVariables.versionNumber + " - Detail");
GUILayout.Label("Version: " + shaderVariables.versionNumber + " - Detail Normals v2");
EditorGUI.BeginChangeCheck();


Expand Down
32 changes: 23 additions & 9 deletions Lit + MMD Spheres/Shader/Flat Lit Toon MMD Extra - Detail Normals.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ Shader "Rhy Custom Shaders/Flat Lit Toon + MMD/Detail Normals"
float2 emissionUV;
float2 emissionMovement;
LightContainer Lighting;
LightContainer Lighting2;
MatcapContainer Matcap;
MatcapContainer Matcap2;

Expand All @@ -98,42 +99,49 @@ Shader "Rhy Custom Shaders/Flat Lit Toon + MMD/Detail Normals"
float3x3 tangentTransform = float3x3(i.tangentDir, i.bitangentDir, i.normalDir);

float3 normalDirection = CalculateNormal(TRANSFORM_TEX(i.uv0, _BumpMap), _BumpMap, tangentTransform);
float3 _DetailMap_var = UnpackNormal(tex2D(_DetailMap, TRANSFORM_TEX(i.uv0, _DetailMap)));
//float3 _DetailMap_var = UnpackNormal(tex2D(_DetailMap, TRANSFORM_TEX(i.uv0, _DetailMap)));
float3 _DetailMap_var = CalculateNormal(TRANSFORM_TEX(i.uv0, _DetailMap), _DetailMap, tangentTransform);
float3 _DetailMapMask_var = tex2D(_DetailMapMask ,TRANSFORM_TEX(i.uv0, _DetailMapMask));
_DetailMap_var *= _DetailMapMask_var.rgb;
//float3 maskedNormalDirection = CalculateNormal(TRANSFORM_TEX(i.uv0, _DetailMap), _DetailMap, tangentTransform);
//maskedNormalDirection *= _DetailMapMask_var.rgb;
float3 maskedNormalDirection = normalize(mul(float3(normalDirection.xy*_DetailMap_var.z + _DetailMap_var.xy*normalDirection.z, normalDirection.z*_DetailMap_var.z), tangentTransform));
//float3 maskedNormalDirection = normalize(mul(float3(normalDirection.xy*_DetailMap_var.z + _DetailMap_var.xy*normalDirection.z, normalDirection.z*_DetailMap_var.z), tangentTransform));
float3 maskedNormalDirection = _DetailMap_var;

float4 baseColor = CalculateColor(_MainTex, TRANSFORM_TEX(i.uv0, _MainTex), _Color);

UNITY_LIGHT_ATTENUATION(attenuation, i, i.posWorld.xyz);
attenuation = FadeShadows(attenuation, i.posWorld.xyz);

Lighting = CalculateLight(_WorldSpaceLightPos0, _LightColor0, normalDirection, attenuation, _ClampMin, _ClampMax);
Lighting2 = CalculateLight(_WorldSpaceLightPos0, _LightColor0, maskedNormalDirection, attenuation, _ClampMin, _ClampMax);

float4 _EmissionMap_var = tex2D(_EmissionMap,TRANSFORM_TEX(i.uv0, _EmissionMap));
float4 emissionMask_var = tex2D(_EmissionMask,TRANSFORM_TEX(emissionUV, _EmissionMask));
float3 emissive = (_EmissionMap_var.rgb*_EmissionColor.rgb);
emissive.rgb *= emissionMask_var.rgb;
emissive.rgb *= _EmissionIntensity;

//Kill it;

float rampValue = smoothstep(0, Lighting.bw_lightDif, 0 - dot(ShadeSH9(float4(0, 0, 0, 1)), grayscale_vector));
float tempValue = (0.5 * dot(normalDirection, Lighting.lightDir.xyz) + 0.5);
float detailTempValue = (0.5 * dot(maskedNormalDirection, Lighting.lightDir.xyz) + 0.5);
float detailTempValue = (0.5 * dot(maskedNormalDirection, Lighting2.lightDir.xyz) + 0.5);

float3 toonTexColorDetail = tex2D( _ToonTex, detailTempValue);
float3 toonTexColor = tex2D(_ToonTex, tempValue);
float3 shadowTexColor = tex2D(_ShadowTex, rampValue);
float4 shadowMask_var = tex2D(_ShadowMask,TRANSFORM_TEX(i.uv0, _ShadowMask));

Lighting.indirectLit += (shadowTexColor * Lighting.lightCol) + shadowMask_var.rgb;
Lighting2.indirectLit += (shadowTexColor * Lighting2.lightCol) + shadowMask_var.rgb;
Matcap = CalculateSphere(normalDirection, i, _SphereAddTex, _SphereMulTex, _SphereMap, TRANSFORM_TEX(i.uv0, _SphereMap), _SpecularBleed, faceSign, attenuation);
Matcap2 = CalculateSphere(maskedNormalDirection, i, _SphereAddTex, _SphereMulTex, _SphereMap, TRANSFORM_TEX(i.uv0, _SphereMap), _SpecularBleed, faceSign, attenuation);

Matcap.Add.rgb *= (Matcap.Mask * _SphereAddIntensity) * Matcap.Shadow;
Matcap.Mul.rgb *= _SphereMulIntensity;
Matcap2.Add.rgb *= (Matcap2.Mask * _SphereAddIntensity) * Matcap2.Shadow;
Matcap2.Mul.rgb *= _SphereMulIntensity;

float finalAlpha = baseColor.a;

Expand All @@ -142,7 +150,7 @@ Shader "Rhy Custom Shaders/Flat Lit Toon + MMD/Detail Normals"
if(_Mode == 3)
finalAlpha -= _Opacity;

float3 finalColor = emissive + ((Matcap.Add.rgb + Matcap2.Add.rgb) + ((_ColorIntensity / 2) * (baseColor.rgb * (toonTexColor * toonTexColorDetail))) * (Matcap.Mul)) * (lerp(Lighting.indirectLit, Lighting.directLit, attenuation));
float3 finalColor = emissive + (((Matcap.Add.rgb + Matcap2.Add.rgb)/2) + ((_ColorIntensity / 2) * (baseColor.rgb * ((toonTexColor * toonTexColorDetail) / 2))) * (Matcap.Mul * Matcap2.Mul)) * (lerp((Lighting.indirectLit * Lighting2.indirectLit), (Lighting.directLit * Lighting2.directLit), attenuation));

fixed4 finalRGBA = fixed4(finalColor, finalAlpha);
UNITY_APPLY_FOG(i.fogCoord, finalRGBA);
Expand Down Expand Up @@ -180,6 +188,7 @@ Shader "Rhy Custom Shaders/Flat Lit Toon + MMD/Detail Normals"
#pragma multi_compile_fog

LightContainer Lighting;
LightContainer Lighting2;
MatcapContainer Matcap;
MatcapContainer Matcap2;

Expand All @@ -196,10 +205,13 @@ Shader "Rhy Custom Shaders/Flat Lit Toon + MMD/Detail Normals"
float3x3 tangentTransform = float3x3(i.tangentDir, i.bitangentDir, i.normalDir);

float3 normalDirection = CalculateNormal(TRANSFORM_TEX(i.uv0, _BumpMap), _BumpMap, tangentTransform);
float3 _DetailMap_var = UnpackNormal(tex2D(_DetailMap, TRANSFORM_TEX(i.uv0, _DetailMap)));
float3 _DetailMap_var = CalculateNormal(TRANSFORM_TEX(i.uv0, _DetailMap), _DetailMap, tangentTransform);
float3 _DetailMapMask_var = tex2D(_DetailMapMask ,TRANSFORM_TEX(i.uv0, _DetailMapMask));
_DetailMap_var *= _DetailMapMask_var.rgb;
float3 maskedNormalDirection = normalize(mul(float3(normalDirection.xy*_DetailMap_var.z + _DetailMap_var.xy*normalDirection.z, normalDirection.z*_DetailMap_var.z), tangentTransform));
//float3 maskedNormalDirection = CalculateNormal(TRANSFORM_TEX(i.uv0, _DetailMap), _DetailMap, tangentTransform);
//maskedNormalDirection *= _DetailMapMask_var.rgb;
//float3 maskedNormalDirection = normalize(mul(float3(normalDirection.xy*_DetailMap_var.z + _DetailMap_var.xy*normalDirection.z, normalDirection.z*_DetailMap_var.z), tangentTransform));
float3 maskedNormalDirection = _DetailMap_var;

float4 baseColor = CalculateColor(_MainTex, TRANSFORM_TEX(i.uv0, _MainTex), _Color);

Expand All @@ -208,17 +220,19 @@ Shader "Rhy Custom Shaders/Flat Lit Toon + MMD/Detail Normals"
float light_Env = float(any(_WorldSpaceLightPos0.xyz));

Lighting = CalculateLight(_WorldSpaceLightPos0, _LightColor0, normalDirection, attenuation, _ClampMin, _ClampMax);
Lighting2 = CalculateLight(_WorldSpaceLightPos0, _LightColor0, maskedNormalDirection, attenuation, _ClampMin, _ClampMax);

float rampValue = smoothstep(0, Lighting.bw_lightDif, 0 - dot(ShadeSH9(float4(0, 0, 0, 1)), grayscale_vector));
float tempValue = (0.5 * dot(normalDirection, Lighting.lightDir.xyz) + 0.5);
float detailTempValue = (0.5 * dot(maskedNormalDirection, Lighting.lightDir.xyz) + 0.5);
float detailTempValue = (0.5 * dot(maskedNormalDirection, Lighting2.lightDir.xyz) + 0.5);

float3 toonTexColorDetail = tex2D( _ToonTex, detailTempValue);
float3 toonTexColor = tex2D(_ToonTex, tempValue);
float3 shadowTexColor = tex2D(_ShadowTex, rampValue);
float4 shadowMask_var = tex2D(_ShadowMask,TRANSFORM_TEX(i.uv0, _ShadowMask));

Lighting.indirectLit += (shadowTexColor * Lighting.lightCol) + shadowMask_var.rgb;
Lighting2.indirectLit += (shadowTexColor * Lighting2.lightCol) + shadowMask_var.rgb;
Matcap = CalculateSphere(normalDirection, i, _SphereAddTex, _SphereMulTex, _SphereMap, TRANSFORM_TEX(i.uv0, _SphereMap), _SpecularBleed, faceSign, attenuation);
Matcap2 = CalculateSphere(maskedNormalDirection, i, _SphereAddTex, _SphereMulTex, _SphereMap, TRANSFORM_TEX(i.uv0, _SphereMap), _SpecularBleed, faceSign, attenuation);

Expand All @@ -232,10 +246,10 @@ Shader "Rhy Custom Shaders/Flat Lit Toon + MMD/Detail Normals"
if(_Mode == 3)
finalAlpha -= _Opacity;

float3 finalColor = ((Matcap.Add.rgb + Matcap2.Add.rgb) + ((_ColorIntensity / 2) * (baseColor.rgb * (toonTexColor))) * (Matcap.Mul)) * (lerp(0, Lighting.directLit, attenuation));
float3 finalColor = (((Matcap.Add.rgb + Matcap2.Add.rgb)/2) + ((_ColorIntensity / 2) * (baseColor.rgb * ((toonTexColor * toonTexColorDetail) / 2))) * (Matcap.Mul * Matcap2.Mul)) * lerp(0, (Lighting.directLit * Lighting2.directLit), attenuation);

if(light_Env != 1)
finalColor = ((Matcap.Add.rgb + Matcap2.Add.rgb) + ((_ColorIntensity / 2) * (baseColor.rgb * (toonTexColor))) * (Matcap.Mul)) * (lerp(Lighting.indirectLit, Lighting.directLit, attenuation));
finalColor = (((Matcap.Add.rgb + Matcap2.Add.rgb)/2) + ((_ColorIntensity / 2) * (baseColor.rgb * ((toonTexColor * toonTexColorDetail) / 2))) * (Matcap.Mul * Matcap2.Mul)) * (lerp((Lighting.indirectLit * Lighting2.indirectLit), (Lighting.directLit * Lighting2.directLit), attenuation));

fixed4 finalRGBA = fixed4(finalColor, finalAlpha);
UNITY_APPLY_FOG(i.fogCoord, finalRGBA);
Expand Down

0 comments on commit 40f133b

Please sign in to comment.