" gl_Position = vproj0;\n"
"\n"
" aUv = a_uv;\n"
-" aNorm = vec4( 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"
"uniform vec4 uPlayerPos; /* w: distance to uSpawnPos */\n"
"uniform vec4 uSpawnPos; /* w: inverse distance to uPlayerPos */\n"
"uniform bool uAlphatest;\n"
+"uniform vec4 uMapInfo; /* x: min, y: max, z: iso line amount */\n"
"\n"
"#line 1 1 \n"
"// :D\n"
+"const float CLEARSKIES_LIGHT_DOT_MIN = 0.0;\n"
+"\n"
+"#line 12 0 \n"
+"#line 1 2 \n"
+"// :D\n"
"\n"
"in vec2 aUv;\n"
"in vec4 aNorm;\n"
"//const vec3 SUN_COLOUR = vec3( 1.10, 0.89, 0.35 );\n"
"\n"
"const float SUN_ANGLE = 0.0001;\n"
-"const float PI = 3.14159265;\n"
+"const float PI = 3.14159265358979323846264;\n"
"\n"
"//struct world_info\n"
"//{\n"
"// vec3 sun_dir;\n"
"//};\n"
"\n"
+"vec3 rand33(vec3 p3)\n"
+"{\n"
+" p3 = fract(p3 * vec3(.1031, .1030, .0973));\n"
+" p3 += dot(p3, p3.yxz+33.33);\n"
+" return fract((p3.xxy + p3.yxx)*p3.zyx);\n"
+"}\n"
+"\n"
+"float stars( vec3 rd, float rr, float size ){\n"
+" vec3 co = rd * rr;\n"
+"\n"
+" float a = atan(co.y, length(co.xz)) + 4.0 * PI;\n"
+"\n"
+" float spaces = 1.0 / rr;\n"
+" size = (rr * 0.0015) * fwidth(a) * 1000.0 * size;\n"
+" a -= mod(a, spaces) - spaces * 0.5;\n"
+"\n"
+" float count = floor(sqrt(pow(rr, 2.0) * (1.0 - pow(sin(a), 2.0))) * 3.0);\n"
+" \n"
+" float plane = atan(co.z, co.x) + 4.0 * PI;\n"
+" plane = plane - mod(plane, PI / count);\n"
+"\n"
+" vec2 delta = rand33(vec3(plane, a, 0.0)).xy;\n"
+"\n"
+" float level = sin(a + spaces * (delta.y - 0.5) * (1.0 - size)) * rr;\n"
+" float ydist = sqrt(rr * rr - level * level);\n"
+" float angle = plane + (PI * (delta.x * (1.0-size) + size * 0.5) / count);\n"
+" vec3 center = vec3(cos(angle) * ydist, level, sin(angle) * ydist);\n"
+" float star = smoothstep(size, 0.0, distance(center, co));\n"
+" return star;\n"
+"}\n"
+"\n"
"float luminance( vec3 v )\n"
"{\n"
" return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
" \n"
" vec3 sun_colour = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
" sun_colour *= sun_shape;\n"
+"\n"
" \n"
-" vec3 composite = sky_colour + sun_colour;\n"
+" float star = 0.0;\n"
+" float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+" if( star_blend > 0.001 ){\n"
+" for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+" float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+" star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+" }\n"
+" }\n"
+" \n"
+" vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
" return composite;\n"
"}\n"
"\n"
" 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"
" return pow(max(dot( halfview, specdir ), 0.0), exponent);\n"
"}\n"
"\n"
-"vec3 scene_apply_fog( vec3 vfrag, vec3 colour, float fdist )\n"
-"{\n"
+"vec3 scene_apply_fog( vec3 vfrag, vec3 colour, float fdist ){\n"
" float dist = pow(fdist*0.0010,0.78);\n"
" return mix( vfrag, colour, min( 1.0, dist ) );\n"
"}\n"
"\n"
-"vec3 rand33(vec3 p3)\n"
-"{\n"
-" p3 = fract(p3 * vec3(.1031, .1030, .0973));\n"
-" p3 += dot(p3, p3.yxz+33.33);\n"
-" return fract((p3.xxy + p3.yxx)*p3.zyx);\n"
-"}\n"
-"\n"
"vec3 scene_calculate_light( int light_index, \n"
" vec3 halfview, vec3 co, vec3 normal )\n"
"{\n"
" return world_compute_lighting( diffuse, normal, co, compute_board_shadow() );\n"
"}\n"
"\n"
-"#line 11 0 \n"
-"#line 1 2 \n"
+"#line 13 0 \n"
+"#line 1 3 \n"
"const float k_motion_lerp_amount = 0.01;\n"
"\n"
"#line 2 0 \n"
" oMotionVec = (vmotion1-vmotion0) * (1.0/k_motion_lerp_amount);\n"
"}\n"
"\n"
-"#line 12 0 \n"
+"#line 14 0 \n"
"\n"
"vec2 smin( float a, float b, float k ){\n"
" float h = max( k-abs(a-b), 0.0 )/k;\n"
" float dither = fract( vDither.g / 71.0 ) - 0.5;\n"
"\n"
" float dcam = (-8.0+distance( aCo, uCamera ))/4.0;\n"
-" if( min(aCo.y*0.5 + dither, dcam + dither) < 0.51 ) discard;\n"
+" float dy0 = aCo.y - uMapInfo.x;\n"
+" float dy1 = uMapInfo.y - aCo.y;\n"
+"\n"
+" if( min(min(dy0,dy1)*0.5, dcam) + dither < 0.51 ) \n"
+" discard;\n"
"\n"
" compute_motion_vectors();\n"
"\n"
-" vec3 vfrag = vec3(0.6);\n"
+" vec3 vfrag = vec3(0.898,0.811,0.716);\n"
" vec3 qnorm = aNorm.xyz;\n"
"\n"
" qnorm = normalize(floor(aNorm.xyz*4.0)*0.25);\n"
" discard;\n"
" }\n"
" else{\n"
-" if( !gl_FrontFacing ){\n"
-" qnorm *= -1.0;\n"
-" }\n"
" }\n"
"\n"
-" vfrag = scene_compute_lighting( vfrag, qnorm, aCo );\n"
+" vfrag = scene_compute_lighting( vfrag, qnorm, aWorldCo );\n"
" \n"
" // dots\n"
-" float d0 = distance( aWorldCo, uPlayerPos.xyz )*2.0;\n"
-" float d1 = distance( aWorldCo, uSpawnPos.xyz );\n"
+" float d0 = distance( aCo, uPlayerPos.xyz )*2.0;\n"
+" float d1 = distance( aCo, uSpawnPos.xyz );\n"
"\n"
" vec2 dm = smin( d0, d1, 10.0 );\n"
" float dd = fract(dm.x*0.2-g_realtime*0.5) * \n"
"\n"
" // line\n"
" vec3 v0 = (uSpawnPos.xyz-uPlayerPos.xyz)*uSpawnPos.w;\n"
-" float t = clamp( dot(aWorldCo-uPlayerPos.xyz,v0), 0.0, uPlayerPos.w );\n"
+" float t = clamp( dot(aCo-uPlayerPos.xyz,v0), 0.0, uPlayerPos.w );\n"
" vec3 p0 = uPlayerPos.xyz + v0*t;\n"
-" float d3 = distance(p0,aWorldCo);\n"
+" float d3 = distance(p0,aCo);\n"
" emit += vec3(fract(t*0.2-g_realtime+d3*0.2)*max(0.0,1.0-d3*0.2));\n"
"\n"
-" oColour = vec4( vfrag+emit, 1.0 );\n"
+" vfrag += emit;\n"
+"\n"
+" if( uMapInfo.z > 0.0 ){\n"
+" float height = fract( aCo.y * 0.1 );\n"
+" float lg = 2.0*length(vec2(dFdx(height), dFdy(height)));\n"
+" vfrag *= 1.0f+(lg*0.2*uMapInfo.z);\n"
+" }\n"
+"\n"
" oColour = vec4( vfrag, 1.0 );\n"
+" //oColour = vec4( vfrag, 1.0 );\n"
"}\n"
""},
};
static GLuint _uniform_scene_override_uPlayerPos;
static GLuint _uniform_scene_override_uSpawnPos;
static GLuint _uniform_scene_override_uAlphatest;
+static GLuint _uniform_scene_override_uMapInfo;
static GLuint _uniform_scene_override_g_world_depth;
static GLuint _uniform_scene_override_uLightsArray;
static GLuint _uniform_scene_override_uLightsIndex;
static void shader_scene_override_uAlphatest(int b){
glUniform1i(_uniform_scene_override_uAlphatest,b);
}
+static void shader_scene_override_uMapInfo(v4f v){
+ glUniform4fv(_uniform_scene_override_uMapInfo,1,v);
+}
static void shader_scene_override_g_world_depth(int i){
glUniform1i(_uniform_scene_override_g_world_depth,i);
}
_uniform_scene_override_uPlayerPos = glGetUniformLocation( _shader_scene_override.id, "uPlayerPos" );
_uniform_scene_override_uSpawnPos = glGetUniformLocation( _shader_scene_override.id, "uSpawnPos" );
_uniform_scene_override_uAlphatest = glGetUniformLocation( _shader_scene_override.id, "uAlphatest" );
+ _uniform_scene_override_uMapInfo = glGetUniformLocation( _shader_scene_override.id, "uMapInfo" );
_uniform_scene_override_g_world_depth = glGetUniformLocation( _shader_scene_override.id, "g_world_depth" );
_uniform_scene_override_uLightsArray = glGetUniformLocation( _shader_scene_override.id, "uLightsArray" );
_uniform_scene_override_uLightsIndex = glGetUniformLocation( _shader_scene_override.id, "uLightsIndex" );
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff