From 274f601c9c49f69e4acef24b56982190b5b0bf93 Mon Sep 17 00:00:00 2001 From: yum Date: Tue, 25 Mar 2025 19:12:49 -0700 Subject: Continue work on tessellation --- 2ner.cginc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to '2ner.cginc') diff --git a/2ner.cginc b/2ner.cginc index e8d6ae3..1c2743c 100644 --- a/2ner.cginc +++ b/2ner.cginc @@ -66,17 +66,13 @@ v2f vert(appdata v) { UNITY_TRANSFER_INSTANCE_ID(v, o); UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); -#if defined(_SHATTER_WAVE) - shatterWaveVert(v.vertex.xyz, v.normal, v.tangent); -#endif - #if defined(_SPHERIZE) { - float3 tgt_normal = normalize(v.vertex.xyz); + float3 tgt_normal = normalize(o.objPos.xyz); float3 tgt_tangent = normalize(float3(tgt_normal.y, -tgt_normal.x, 0)); float3 tgt_pos = tgt_normal * _Spherize_Radius; - v.normal = normalize(lerp(v.normal, tgt_normal, _Spherize_Strength)); - v.vertex.xyz = lerp(v.vertex.xyz, tgt_pos, _Spherize_Strength); + o.normal = normalize(lerp(o.normal, tgt_normal, _Spherize_Strength)); + o.objPos.xyz = lerp(o.objPos.xyz, tgt_pos, _Spherize_Strength); } #endif @@ -184,6 +180,7 @@ float4 frag(v2f i i.normal = normalize(i.normal); #if defined(_SHATTER_WAVE) + shatterWaveFrag(i.normal, i.objPos); { float4 clip_pos = mul(UNITY_MATRIX_VP, float4(i.worldPos, 1.0)); depth = clip_pos.z / clip_pos.w; -- cgit v1.2.3