X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=shaders%2Fscene_override.fs;fp=shaders%2Fscene_override.fs;h=f7dff2b6fc647a27ca8703ac07adbb75d41be7f3;hb=63fe317d7db724162561da52aa382c82ac3c29be;hp=6d10a408dd8cb6632ebcd90468c09dc2ebd17cb5;hpb=2c91a71533b4ce86b9e7fd708420ae05c74d8f52;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/shaders/scene_override.fs b/shaders/scene_override.fs
index 6d10a40..f7dff2b 100644
--- a/shaders/scene_override.fs
+++ b/shaders/scene_override.fs
@@ -31,7 +31,7 @@ void main(){
 
    compute_motion_vectors();
 
-   vec3 vfrag = vec3(0.6);
+   vec3 vfrag = vec3(0.7);
    vec3 qnorm = aNorm.xyz;
 
    qnorm = normalize(floor(aNorm.xyz*4.0)*0.25);
@@ -43,16 +43,13 @@ void main(){
          discard;
    }
    else{
-      if( !gl_FrontFacing ){
-         qnorm *= -1.0;
-      }
    }
 
-   vfrag = scene_compute_lighting( vfrag, qnorm, aCo );
+   vfrag = scene_compute_lighting( vfrag, qnorm, aWorldCo );
    
    // dots
-   float d0 = distance( aWorldCo, uPlayerPos.xyz )*2.0;
-   float d1 = distance( aWorldCo, uSpawnPos.xyz );
+   float d0 = distance( aCo, uPlayerPos.xyz )*2.0;
+   float d1 = distance( aCo, uSpawnPos.xyz );
 
    vec2 dm = smin( d0, d1, 10.0 );
    float dd = fract(dm.x*0.2-g_realtime*0.5) * 
@@ -62,11 +59,11 @@ void main(){
 
    // line
    vec3 v0 = (uSpawnPos.xyz-uPlayerPos.xyz)*uSpawnPos.w;
-   float t = clamp( dot(aWorldCo-uPlayerPos.xyz,v0), 0.0, uPlayerPos.w );
+   float t = clamp( dot(aCo-uPlayerPos.xyz,v0), 0.0, uPlayerPos.w );
    vec3 p0 = uPlayerPos.xyz + v0*t;
-   float d3 = distance(p0,aWorldCo);
+   float d3 = distance(p0,aCo);
    emit += vec3(fract(t*0.2-g_realtime+d3*0.2)*max(0.0,1.0-d3*0.2));
 
    oColour = vec4( vfrag+emit, 1.0 );
-   oColour = vec4( vfrag, 1.0 );
+   //oColour = vec4( vfrag, 1.0 );
 }