From be4550c9e22aada0fcadbb57d3a0f03ac919c524 Mon Sep 17 00:00:00 2001 From: Sebastian Park Date: Fri, 10 May 2024 04:46:56 -0400 Subject: up resolution of skybox and add orange sun and better foam. --- resources/images/foam3.jpg | Bin 0 -> 10950140 bytes resources/images/foam3.png | Bin 4000051 -> 0 bytes resources/images/foam3old.png | Bin 0 -> 4000051 bytes resources/images/nx.png | Bin 393798 -> 5358669 bytes resources/images/ny.png | Bin 434286 -> 5818038 bytes resources/images/nz.png | Bin 357235 -> 4935625 bytes resources/images/px.png | Bin 377671 -> 5496181 bytes resources/images/py.png | Bin 272005 -> 4461744 bytes resources/images/pz.png | Bin 377237 -> 5445966 bytes .../images/skyboxes/the_sky_is_on_fire_8k.hdr | Bin 0 -> 92913392 bytes .../images/skyboxes/the_sky_is_on_fire_8k.png | Bin 0 -> 97160816 bytes resources/shaders/shader.frag | 3 ++- 12 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 resources/images/foam3.jpg delete mode 100644 resources/images/foam3.png create mode 100644 resources/images/foam3old.png create mode 100644 resources/images/skyboxes/the_sky_is_on_fire_8k.hdr create mode 100644 resources/images/skyboxes/the_sky_is_on_fire_8k.png (limited to 'resources') diff --git a/resources/images/foam3.jpg b/resources/images/foam3.jpg new file mode 100644 index 0000000..7adf3f4 Binary files /dev/null and b/resources/images/foam3.jpg differ diff --git a/resources/images/foam3.png b/resources/images/foam3.png deleted file mode 100644 index 1113912..0000000 Binary files a/resources/images/foam3.png and /dev/null differ diff --git a/resources/images/foam3old.png b/resources/images/foam3old.png new file mode 100644 index 0000000..1113912 Binary files /dev/null and b/resources/images/foam3old.png differ diff --git a/resources/images/nx.png b/resources/images/nx.png index d95f151..ddd6e49 100644 Binary files a/resources/images/nx.png and b/resources/images/nx.png differ diff --git a/resources/images/ny.png b/resources/images/ny.png index 631caa9..b3ad368 100644 Binary files a/resources/images/ny.png and b/resources/images/ny.png differ diff --git a/resources/images/nz.png b/resources/images/nz.png index 458d7b5..ab3f7c8 100644 Binary files a/resources/images/nz.png and b/resources/images/nz.png differ diff --git a/resources/images/px.png b/resources/images/px.png index 7c5dc87..6706de0 100644 Binary files a/resources/images/px.png and b/resources/images/px.png differ diff --git a/resources/images/py.png b/resources/images/py.png index 745687f..6780f72 100644 Binary files a/resources/images/py.png and b/resources/images/py.png differ diff --git a/resources/images/pz.png b/resources/images/pz.png index 2a36023..173aa18 100644 Binary files a/resources/images/pz.png and b/resources/images/pz.png differ diff --git a/resources/images/skyboxes/the_sky_is_on_fire_8k.hdr b/resources/images/skyboxes/the_sky_is_on_fire_8k.hdr new file mode 100644 index 0000000..0cb60f6 Binary files /dev/null and b/resources/images/skyboxes/the_sky_is_on_fire_8k.hdr differ diff --git a/resources/images/skyboxes/the_sky_is_on_fire_8k.png b/resources/images/skyboxes/the_sky_is_on_fire_8k.png new file mode 100644 index 0000000..6d2813e Binary files /dev/null and b/resources/images/skyboxes/the_sky_is_on_fire_8k.png differ diff --git a/resources/shaders/shader.frag b/resources/shaders/shader.frag index ef4e9c7..e9e3210 100755 --- a/resources/shaders/shader.frag +++ b/resources/shaders/shader.frag @@ -25,6 +25,7 @@ uniform sampler2D groundSampler; uniform sampler2D skySampler; uniform vec2 widthBounds; uniform vec2 lengthBounds; +uniform vec4 sunColor = vec4(1, 0.5f, 0, 1.f); //uniform float test = 0; // Random methods from https://gist.github.com/patriciogonzalezvivo/670c22f3966e662d2f83 @@ -82,7 +83,7 @@ void main() { // SOME OF IT WILL BE DIFFUSELY LIT, BUT THERE WILL BE SUBSURFACE SCATTERING, ESTIMATED BY THE AMBIENT TERM vec4 diffuse = vec4(red * d, green * d, blue * d, 1.0f); - vec4 specular = vec4(1, 1, 1, 1) * pow(spec, 10.f); + vec4 specular = sunColor * pow(spec, 10.f); // vec4 transmissive = vec4(vec3(refrUV, 1.f - refrUV.y), 1.f); float waterBlurriness = 0.f; vec2 refrUVBlurry = (1 - beerAtt) * vec2(rand(refrUV), rand(vec4(pos, d))) * waterBlurriness + refrUV; -- cgit v1.2.3-70-g09d2