diff --git a/Models/Astro/Textures/clouds_N1.png b/Models/Astro/Textures/clouds_N1.png index 86d6e9348..c08684da4 100644 Binary files a/Models/Astro/Textures/clouds_N1.png and b/Models/Astro/Textures/clouds_N1.png differ diff --git a/Models/Astro/Textures/clouds_N2.png b/Models/Astro/Textures/clouds_N2.png index 0d9fdcd81..e36b157be 100644 Binary files a/Models/Astro/Textures/clouds_N2.png and b/Models/Astro/Textures/clouds_N2.png differ diff --git a/Models/Astro/Textures/clouds_N3.png b/Models/Astro/Textures/clouds_N3.png index 2de03bfb6..ab6f6088e 100644 Binary files a/Models/Astro/Textures/clouds_N3.png and b/Models/Astro/Textures/clouds_N3.png differ diff --git a/Models/Astro/Textures/clouds_N4.png b/Models/Astro/Textures/clouds_N4.png index f1033fc4f..7f2b56b3f 100644 Binary files a/Models/Astro/Textures/clouds_N4.png and b/Models/Astro/Textures/clouds_N4.png differ diff --git a/Models/Astro/Textures/clouds_S1.png b/Models/Astro/Textures/clouds_S1.png index 8d7e821d3..ca7ffd1cb 100644 Binary files a/Models/Astro/Textures/clouds_S1.png and b/Models/Astro/Textures/clouds_S1.png differ diff --git a/Models/Astro/Textures/clouds_S2.png b/Models/Astro/Textures/clouds_S2.png index ad0d5dcf1..4c8b3438d 100644 Binary files a/Models/Astro/Textures/clouds_S2.png and b/Models/Astro/Textures/clouds_S2.png differ diff --git a/Models/Astro/Textures/clouds_S3.png b/Models/Astro/Textures/clouds_S3.png index c2ef257d4..37f353256 100644 Binary files a/Models/Astro/Textures/clouds_S3.png and b/Models/Astro/Textures/clouds_S3.png differ diff --git a/Models/Astro/Textures/clouds_S4.png b/Models/Astro/Textures/clouds_S4.png index 64a90ea55..c6a35e92f 100644 Binary files a/Models/Astro/Textures/clouds_S4.png and b/Models/Astro/Textures/clouds_S4.png differ diff --git a/Models/Astro/Textures/normalmap_earth_N1.png b/Models/Astro/Textures/normalmap_earth_N1.png index 5526255b8..58ecae444 100644 Binary files a/Models/Astro/Textures/normalmap_earth_N1.png and b/Models/Astro/Textures/normalmap_earth_N1.png differ diff --git a/Models/Astro/Textures/normalmap_earth_N2.png b/Models/Astro/Textures/normalmap_earth_N2.png index e10d6c83b..4280101ff 100644 Binary files a/Models/Astro/Textures/normalmap_earth_N2.png and b/Models/Astro/Textures/normalmap_earth_N2.png differ diff --git a/Models/Astro/Textures/normalmap_earth_N3.png b/Models/Astro/Textures/normalmap_earth_N3.png index 32f70bece..7efa716c9 100644 Binary files a/Models/Astro/Textures/normalmap_earth_N3.png and b/Models/Astro/Textures/normalmap_earth_N3.png differ diff --git a/Models/Astro/Textures/normalmap_earth_N4.png b/Models/Astro/Textures/normalmap_earth_N4.png index fef60d145..980ba85ae 100644 Binary files a/Models/Astro/Textures/normalmap_earth_N4.png and b/Models/Astro/Textures/normalmap_earth_N4.png differ diff --git a/Models/Astro/Textures/normalmap_earth_S1.png b/Models/Astro/Textures/normalmap_earth_S1.png index d932be8fc..a82c53a1c 100644 Binary files a/Models/Astro/Textures/normalmap_earth_S1.png and b/Models/Astro/Textures/normalmap_earth_S1.png differ diff --git a/Models/Astro/Textures/normalmap_earth_S2.png b/Models/Astro/Textures/normalmap_earth_S2.png index d80e0c0a8..dcde79a0b 100644 Binary files a/Models/Astro/Textures/normalmap_earth_S2.png and b/Models/Astro/Textures/normalmap_earth_S2.png differ diff --git a/Models/Astro/Textures/normalmap_earth_S3.png b/Models/Astro/Textures/normalmap_earth_S3.png index 37e1fd2bf..3adfb17c5 100644 Binary files a/Models/Astro/Textures/normalmap_earth_S3.png and b/Models/Astro/Textures/normalmap_earth_S3.png differ diff --git a/Models/Astro/Textures/normalmap_earth_S4.png b/Models/Astro/Textures/normalmap_earth_S4.png index 41807bea8..e90cfd2d0 100644 Binary files a/Models/Astro/Textures/normalmap_earth_S4.png and b/Models/Astro/Textures/normalmap_earth_S4.png differ diff --git a/Models/Astro/Textures/world_N1.png b/Models/Astro/Textures/world_N1.png index 5e0c066a0..7657ab996 100644 Binary files a/Models/Astro/Textures/world_N1.png and b/Models/Astro/Textures/world_N1.png differ diff --git a/Models/Astro/Textures/world_N2.png b/Models/Astro/Textures/world_N2.png index 16124396f..d33a31185 100644 Binary files a/Models/Astro/Textures/world_N2.png and b/Models/Astro/Textures/world_N2.png differ diff --git a/Models/Astro/Textures/world_N3.png b/Models/Astro/Textures/world_N3.png index 399e0a9f5..93a99a63c 100644 Binary files a/Models/Astro/Textures/world_N3.png and b/Models/Astro/Textures/world_N3.png differ diff --git a/Models/Astro/Textures/world_N4.png b/Models/Astro/Textures/world_N4.png index f70c9d849..c1c3744e0 100644 Binary files a/Models/Astro/Textures/world_N4.png and b/Models/Astro/Textures/world_N4.png differ diff --git a/Models/Astro/Textures/world_S1.png b/Models/Astro/Textures/world_S1.png index 92c7da1e9..79e38c7d6 100644 Binary files a/Models/Astro/Textures/world_S1.png and b/Models/Astro/Textures/world_S1.png differ diff --git a/Models/Astro/Textures/world_S2.png b/Models/Astro/Textures/world_S2.png index 4cfc01812..c54f38fdd 100644 Binary files a/Models/Astro/Textures/world_S2.png and b/Models/Astro/Textures/world_S2.png differ diff --git a/Models/Astro/Textures/world_S3.png b/Models/Astro/Textures/world_S3.png index 81759ccbe..ed9d3a791 100644 Binary files a/Models/Astro/Textures/world_S3.png and b/Models/Astro/Textures/world_S3.png differ diff --git a/Models/Astro/Textures/world_S4.png b/Models/Astro/Textures/world_S4.png index 5832d6f57..d6f23d02b 100644 Binary files a/Models/Astro/Textures/world_S4.png and b/Models/Astro/Textures/world_S4.png differ diff --git a/Shaders/planet-high.frag b/Shaders/planet-high.frag index 9852493d9..8ecdc124d 100644 --- a/Shaders/planet-high.frag +++ b/Shaders/planet-high.frag @@ -61,8 +61,9 @@ void main() float hmap = 1.0 - nmap.a; nmap = texture2D(normal_texture, gl_TexCoord[0].st - 0.0005 * grad_dir * hmap * 2.0 * parallaxFactor); - // sanity processing for normal map when alpha is close to zero - nmap.rgb = normalize(nmap.rgb); + + // nmap.rgb should not be normalized, it adversely modifies N = 2 nmap - 1 + // nmap.rgb = normalize(nmap.rgb); //if (nmap.b < 0.0) {nmap.b = -nmap.b;} vec3 N = nmap.rgb * 2.0 - 1.0; @@ -125,8 +126,8 @@ void main() - - if (NdotL > 0.0) { + // strictly positive produces visible hard cut + if (NdotL >= 0.0) { color += diff_term * NdotL * (1.0-shadowTexel.a); NdotHV = max(dot(n, halfVector), 0.0); if (gl_FrontMaterial.shininess > 0.0) diff --git a/Shaders/planet.frag b/Shaders/planet.frag index 6c42d5421..fb313be4b 100644 --- a/Shaders/planet.frag +++ b/Shaders/planet.frag @@ -95,8 +95,8 @@ void main() - - if (NdotL > 0.0) { + // strictly positive produces visible hard cut + if (NdotL >= 0.0) { color += diff_term * NdotL * (1.0-shadowTexel.a); NdotHV = max(dot(n, halfVector), 0.0); if (gl_FrontMaterial.shininess > 0.0)