mini world rendering adjustments

[carveJwlIkooP6JGAAIwe30JlM.git] / shaders / scene_override.h

diff --git a/shaders/scene_override.h b/shaders/scene_override.h
index 8bea02e01096ce463882e52287d34a316df37375..fb5367148cb095043f21aab4eea7e53bc4d6ec9c 100644 (file)
--- a/shaders/scene_override.h
+++ b/shaders/scene_override.h
@@ -54,7 +54,7 @@ static struct vg_shader _shader_scene_override = {
 "   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"
@@ -132,7 +132,7 @@ static struct vg_shader _shader_scene_override = {
 "//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"
@@ -144,6 +144,37 @@ static struct vg_shader _shader_scene_override = {
 "//   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"
@@ -178,8 +209,15 @@ static struct vg_shader _shader_scene_override = {
 "         \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"
+"   float star = 0.0;\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"
-"   vec3 composite   = sky_colour + sun_colour;\n"
+"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -250,19 +288,11 @@ static struct vg_shader _shader_scene_override = {
 "   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"
@@ -448,7 +478,7 @@ static struct vg_shader _shader_scene_override = {
 "\n"
 "   compute_motion_vectors();\n"
 "\n"
-"   vec3 vfrag = vec3(0.6);\n"
+"   vec3 vfrag = vec3(0.5);\n"
 "   vec3 qnorm = aNorm.xyz;\n"
 "\n"
 "   qnorm = normalize(floor(aNorm.xyz*4.0)*0.25);\n"
@@ -460,16 +490,13 @@ static struct vg_shader _shader_scene_override = {
 "         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"
@@ -479,13 +506,13 @@ static struct vg_shader _shader_scene_override = {
 "\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"
-"   oColour = vec4( vfrag, 1.0 );\n"
+"   //oColour = vec4( vfrag, 1.0 );\n"
 "}\n"
 ""},
 };