From e4e07075c58d6d9b57376bc410921c034965ead0 Mon Sep 17 00:00:00 2001 From: Harald Christian Joachim Wolff Date: Mon, 1 May 2017 12:36:11 +0200 Subject: [PATCH] Default Shader: move shading to fragment shader, add normal map painting for debug --- org.niclasundharald.engine/graphics/GlobalDefaults.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.niclasundharald.engine/graphics/GlobalDefaults.cs b/org.niclasundharald.engine/graphics/GlobalDefaults.cs index 54f5161..860405c 100644 --- a/org.niclasundharald.engine/graphics/GlobalDefaults.cs +++ b/org.niclasundharald.engine/graphics/GlobalDefaults.cs @@ -85,10 +85,9 @@ void main() float distance = length(camray); float idist = 25000 / distance; float sight = clamp( idist * idist * idist, 0.1, 1.0); - //sight = 1; - shading = clamp(0.3 + (cosTheta * 0.7), 0.1, 0.9); - color = clamp( vec4( iv_color.xyz * shading * sight, fading ), 0, 1); + shading = clamp(0.3 + (cosTheta * 0.7), 0.1, 0.9) * sight; + color = clamp( vec4( iv_color.xyz, fading ), 0, 1); coord = camray; } @@ -113,7 +112,8 @@ void main() discard; }; - _color = color; + _color = vec4( color.xyz * shading, color.w ); + //_color = vec4( (vec3( 1,1,1 ) + norm)/2 , 1 ); } ";