X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fscene_route.h;h=f136afe45d12abf3410ebf40a02ed40d56d33a89;hb=38514b4ba03412ad51df02dc2ba345e1be41005d;hp=8e3cc10385942f9d1d493c01e15e158e0a78ebcf;hpb=1a7f4a35e88698bdb45c90f646f1645589d5511c;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/shaders/scene_route.h b/shaders/scene_route.h
index 8e3cc10..f136afe 100644
--- a/shaders/scene_route.h
+++ b/shaders/scene_route.h
@@ -7,7 +7,7 @@ static struct vg_shader _shader_scene_route = {
    .link = shader_scene_route_link,
    .vs = 
 {
-.orig_file = "shaders/scene.vs",
+.orig_file = "shaders/scene_override.vs",
 .static_src = 
 "layout (location=0) in vec3  a_co;\n"
 "layout (location=1) in vec4  a_norm;\n"
@@ -36,6 +36,7 @@ static struct vg_shader _shader_scene_route = {
 "uniform mat4x3 uMdl;\n"
 "uniform mat4   uPv;\n"
 "uniform mat4   uPvmPrev;\n"
+"uniform mat3   uNormalMtx;\n"
 "\n"
 "out vec2 aUv;\n"
 "out vec4 aNorm;\n"
@@ -53,7 +54,7 @@ static struct vg_shader _shader_scene_route = {
 "   gl_Position = vproj0;\n"
 "\n"
 "   aUv = a_uv;\n"
-"   aNorm = vec4( mat3(uMdl) * a_norm.xyz, a_norm.w );\n"
+"   aNorm = vec4( uNormalMtx * a_norm.xyz, a_norm.w );\n"
 "   aCo = a_co;\n"
 "   aWorldCo = world_pos0;\n"
 "}\n"
@@ -69,6 +70,11 @@ static struct vg_shader _shader_scene_route = {
 "\n"
 "#line       1        1 \n"
 "// :D\n"
+"const float CLEARSKIES_LIGHT_DOT_MIN = 0.0;\n"
+"\n"
+"#line      7        0 \n"
+"#line       1        2 \n"
+"// :D\n"
 "\n"
 "in vec2 aUv;\n"
 "in vec4 aNorm;\n"
@@ -228,8 +234,9 @@ static struct vg_shader _shader_scene_route = {
 "                               g_sunset_phase );\n"
 "\n"
 "   vec3  sky_reflection = 0.5 * fresnel * reflect_colour;\n"
-"   vec3  light_sun      = max(0.0,dot(normal,g_sun_dir.xyz)*0.75+0.25) \n"
-"                           * g_sun_colour.rgb * g_day_phase;\n"
+"   vec3  light_sun      = max( CLEARSKIES_LIGHT_DOT_MIN, \n"
+"                               dot(normal,g_sun_dir.xyz)*0.75+0.25\n"
+"                           ) * g_sun_colour.rgb * g_day_phase;\n"
 "\n"
 "   float scaled_shadow = max( shadow, 1.0 - max(g_sun_dir.y,0.0) );\n"
 "   vec3 ambient = mix( g_ambient_colour.rgb, g_sunset_ambient.rgb, \n"
@@ -434,8 +441,8 @@ static struct vg_shader _shader_scene_route = {
 "   return world_compute_lighting( diffuse, normal, co, compute_board_shadow() );\n"
 "}\n"
 "\n"
-"#line      7        0 \n"
-"#line       1        2 \n"
+"#line      8        0 \n"
+"#line       1        3 \n"
 "const float k_motion_lerp_amount = 0.01;\n"
 "\n"
 "#line      2        0 \n"
@@ -454,7 +461,7 @@ static struct vg_shader _shader_scene_route = {
 "   oMotionVec = (vmotion1-vmotion0) * (1.0/k_motion_lerp_amount);\n"
 "}\n"
 "\n"
-"#line      8        0 \n"
+"#line      9        0 \n"
 "\n"
 "float filtered_stripe( in float p, in float ddx, in float ddy )\n"
 "{\n"
@@ -508,6 +515,7 @@ static struct vg_shader _shader_scene_route = {
 static GLuint _uniform_scene_route_uMdl;
 static GLuint _uniform_scene_route_uPv;
 static GLuint _uniform_scene_route_uPvmPrev;
+static GLuint _uniform_scene_route_uNormalMtx;
 static GLuint _uniform_scene_route_uTexGarbage;
 static GLuint _uniform_scene_route_uTexGradients;
 static GLuint _uniform_scene_route_uCamera;
@@ -524,6 +532,9 @@ static void shader_scene_route_uPv(m4x4f m){
 static void shader_scene_route_uPvmPrev(m4x4f m){
    glUniformMatrix4fv(_uniform_scene_route_uPvmPrev,1,GL_FALSE,(float*)m);
 }
+static void shader_scene_route_uNormalMtx(m3x3f m){
+   glUniformMatrix3fv(_uniform_scene_route_uNormalMtx,1,GL_FALSE,(float*)m);
+}
 static void shader_scene_route_uTexGarbage(int i){
    glUniform1i(_uniform_scene_route_uTexGarbage,i);
 }
@@ -547,6 +558,7 @@ static void shader_scene_route_link(void){
    _uniform_scene_route_uMdl = glGetUniformLocation( _shader_scene_route.id, "uMdl" );
    _uniform_scene_route_uPv = glGetUniformLocation( _shader_scene_route.id, "uPv" );
    _uniform_scene_route_uPvmPrev = glGetUniformLocation( _shader_scene_route.id, "uPvmPrev" );
+   _uniform_scene_route_uNormalMtx = glGetUniformLocation( _shader_scene_route.id, "uNormalMtx" );
    _uniform_scene_route_uTexGarbage = glGetUniformLocation( _shader_scene_route.id, "uTexGarbage" );
    _uniform_scene_route_uTexGradients = glGetUniformLocation( _shader_scene_route.id, "uTexGradients" );
    _uniform_scene_route_uCamera = glGetUniformLocation( _shader_scene_route.id, "uCamera" );