DeMuenu/MoonlightVRC
1
0
Fork 0
mirror of https://github.com/DeMuenu/MoonlightVRC.git synced 2025-12-13 11:33:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from DeMuenu/normal-maps-main-shader

Browse Source 
Fixed false Normal logic for water shader
This commit is contained in:
DeMuenu
2025-10-01 02:15:42 +02:00
committed by GitHub
parent a5a4b16527 ca28f1078b
commit a4b70d0dee
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Shader/Water.shader
View File

@@ -61,6 +61,7 @@ Shader "DeMuenu/World/Hoppou/Water"
float4 vertex : POSITION; float4 vertex : POSITION;
float2 uv : TEXCOORD0; float2 uv : TEXCOORD0;
float3 normal : NORMAL; float3 normal : NORMAL;
float4 tangent: TANGENT;
}; };
struct v2f struct v2f
@@ -73,6 +74,9 @@ Shader "DeMuenu/World/Hoppou/Water"
float3 worldPos : TEXCOORD2; float3 worldPos : TEXCOORD2;
float3 worldNormal: TEXCOORD3; float3 worldNormal: TEXCOORD3;
//Moonlight END //Moonlight END
float3 worldTangent : TEXCOORD4;
float3 worldBitangent : TEXCOORD5;
}; };
sampler2D _MainTex; sampler2D _MainTex;
@@ -125,6 +129,12 @@ Shader "DeMuenu/World/Hoppou/Water"
o.worldPos = wp.xyz; o.worldPos = wp.xyz;
o.worldNormal = UnityObjectToWorldNormal(v.normal); o.worldNormal = UnityObjectToWorldNormal(v.normal);
//Moonlight Vertex END //Moonlight Vertex END
float3 tWS = normalize(UnityObjectToWorldDir(v.tangent.xyz));
float3 bWS = normalize(cross(o.worldNormal, tWS) * v.tangent.w);
o.worldTangent = tWS;
o.worldBitangent= bWS;
return o; return o;
} }
@@ -140,7 +150,23 @@ Shader "DeMuenu/World/Hoppou/Water"
//Moonlight //Moonlight
float3 N = normalize(i.worldNormal + NormalOffset1 * _NormalMapStrength1 + NormalOffset2 * _NormalMapStrength2); //for lambertian diffuse
half3 n1 = UnpackNormal(norm);
half3 n2 = UnpackNormal(norm2);
n1.xy *= _NormalMapStrength1;
n2.xy *= _NormalMapStrength2;
n1 = normalize(n1);
n2 = normalize(n2);
// combine two tangent-space normals (whiteout mix; good enough for water)
half3 nTS = normalize(half3(n1.xy + n2.xy, n1.z * n2.z));
// rotate TS -> WS with the TBN (linear combo is cheaper than a matrix mul)
half3 N = normalize(
i.worldTangent * nTS.x +
i.worldBitangent * nTS.y +
i.worldNormal * nTS.z);
//Waterspecific //Waterspecific
@@ -163,7 +189,6 @@ Shader "DeMuenu/World/Hoppou/Water"
//Watershader specific //Watershader specific
//float fres = Schlick(saturate(dot(N, V)), _F0, _FresnelPower); //float fres = Schlick(saturate(dot(N, V)), _F0, _FresnelPower);
float3 R = reflect(-V, N);
float spec = pow(saturate(dot(R, L)), _SpecPower); float spec = pow(saturate(dot(R, L)), _SpecPower);
//return float4(spec, spec, spec,1); //return float4(spec, spec, spec,1);
dmax.rgb += _Udon_LightColors[LightCounter].rgb * contrib + _Udon_LightColors[LightCounter].rgb * _SpecIntensity * spec * contrib; dmax.rgb += _Udon_LightColors[LightCounter].rgb * contrib + _Udon_LightColors[LightCounter].rgb * _SpecIntensity * spec * contrib;