diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal01.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal01.tga new file mode 100644 index 0000000000..5bc8a60619 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal01.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal02.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal02.tga new file mode 100644 index 0000000000..15dff36ed2 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal02.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal03.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal03.tga new file mode 100644 index 0000000000..ecfcc75947 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal03.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal04.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal04.tga new file mode 100644 index 0000000000..60b96f1caf Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal04.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal05.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal05.tga new file mode 100644 index 0000000000..ac12c56468 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal05.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal06.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal06.tga new file mode 100644 index 0000000000..af61c34b0c Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal06.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal07.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal07.tga new file mode 100644 index 0000000000..235b642489 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal07.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal08.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal08.tga new file mode 100644 index 0000000000..d49b60f156 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal08.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal09.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal09.tga new file mode 100644 index 0000000000..e20b6fa23b Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal09.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal10.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal10.tga new file mode 100644 index 0000000000..6dfb67a327 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal10.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal11.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal11.tga new file mode 100644 index 0000000000..3162da85db Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal11.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal12.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal12.tga new file mode 100644 index 0000000000..4da8d4f642 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal12.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal13.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal13.tga new file mode 100644 index 0000000000..2b20cad615 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal13.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal14.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal14.tga new file mode 100644 index 0000000000..e6bb2c7f19 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal14.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal15.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal15.tga new file mode 100644 index 0000000000..f4639299ba Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal15.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal16.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal16.tga new file mode 100644 index 0000000000..b2fac17468 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal16.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal17.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal17.tga new file mode 100644 index 0000000000..b60b198ad0 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal17.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal18.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal18.tga new file mode 100644 index 0000000000..c683c409fc Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal18.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal19.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal19.tga new file mode 100644 index 0000000000..433dea8531 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal19.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal20.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal20.tga new file mode 100644 index 0000000000..f9cd299d96 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal20.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal21.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal21.tga new file mode 100644 index 0000000000..e735030ef2 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal21.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal22.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal22.tga new file mode 100644 index 0000000000..ae58ae4fdf Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal22.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal23.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal23.tga new file mode 100644 index 0000000000..cb289dc6b3 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal23.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal24.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal24.tga new file mode 100644 index 0000000000..f686455b47 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal24.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal25.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal25.tga new file mode 100644 index 0000000000..dfabf4e585 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal25.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal26.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal26.tga new file mode 100644 index 0000000000..b0c57c0bb6 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal26.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal27.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal27.tga new file mode 100644 index 0000000000..987ec7aba9 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal27.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal28.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal28.tga new file mode 100644 index 0000000000..426e61e62c Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal28.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal29.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal29.tga new file mode 100644 index 0000000000..5bfa3223a5 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal29.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal30.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal30.tga new file mode 100644 index 0000000000..da76e66752 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal30.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal31.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal31.tga new file mode 100644 index 0000000000..ae56220dd5 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal31.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal32.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal32.tga new file mode 100644 index 0000000000..e977b2e0e5 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal32.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal33.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal33.tga new file mode 100644 index 0000000000..bebdb32e02 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal33.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal34.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal34.tga new file mode 100644 index 0000000000..5df932df1e Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal34.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal35.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal35.tga new file mode 100644 index 0000000000..4cd1082aca Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal35.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal36.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal36.tga new file mode 100644 index 0000000000..e32d6fe780 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal36.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal37.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal37.tga new file mode 100644 index 0000000000..c2da25183c Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal37.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal38.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal38.tga new file mode 100644 index 0000000000..7d57c729f6 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal38.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal39.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal39.tga new file mode 100644 index 0000000000..c6078be1b9 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal39.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal40.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal40.tga new file mode 100644 index 0000000000..66f797b099 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal40.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal41.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal41.tga new file mode 100644 index 0000000000..6ccc10bbd3 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal41.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal42.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal42.tga new file mode 100644 index 0000000000..0685aa0246 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal42.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal43.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal43.tga new file mode 100644 index 0000000000..9e6e905f5a Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal43.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal44.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal44.tga new file mode 100644 index 0000000000..e4804c466a Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal44.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal45.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal45.tga new file mode 100644 index 0000000000..66e90d4976 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal45.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal46.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal46.tga new file mode 100644 index 0000000000..25927bebec Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal46.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal47.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal47.tga new file mode 100644 index 0000000000..cce186052f Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal47.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal48.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal48.tga new file mode 100644 index 0000000000..dbe7989438 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal48.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal49.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal49.tga new file mode 100644 index 0000000000..d44894e8b1 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal49.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal50.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal50.tga new file mode 100644 index 0000000000..7aad87d919 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal50.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal51.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal51.tga new file mode 100644 index 0000000000..439f5f5e5a Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal51.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal52.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal52.tga new file mode 100644 index 0000000000..e2b3e114cb Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal52.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal53.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal53.tga new file mode 100644 index 0000000000..e623b18f90 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal53.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal54.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal54.tga new file mode 100644 index 0000000000..d055b28403 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal54.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal55.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal55.tga new file mode 100644 index 0000000000..d334a2c4ac Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal55.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal56.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal56.tga new file mode 100644 index 0000000000..ab78ab8b45 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal56.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal57.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal57.tga new file mode 100644 index 0000000000..cea362be0a Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal57.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal58.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal58.tga new file mode 100644 index 0000000000..2610e7627f Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal58.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal59.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal59.tga new file mode 100644 index 0000000000..bfdf7b5dd6 Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal59.tga differ diff --git a/binaries/data/mods/official/art/textures/animated/water/default/normal60.tga b/binaries/data/mods/official/art/textures/animated/water/default/normal60.tga new file mode 100644 index 0000000000..56a849750d Binary files /dev/null and b/binaries/data/mods/official/art/textures/animated/water/default/normal60.tga differ diff --git a/binaries/data/mods/official/shaders/water_high.fs b/binaries/data/mods/official/shaders/water_high.fs index 3c7ef5c6a1..2fc27975c5 100644 --- a/binaries/data/mods/official/shaders/water_high.fs +++ b/binaries/data/mods/official/shaders/water_high.fs @@ -33,12 +33,12 @@ void main() fresnel = pow(1.0 - ndotv, 0.8); // A rather arbitrary Fresnel approximation reflCoords = 0.5 * (gl_TexCoord[1].xy / gl_TexCoord[1].w) + 0.5; - reflCoords += 2.8 * n.xz / w; // The 2.8 can be tweaked to make reflections "wavier" + reflCoords += 2.9 * n.xz / w; // The 2.9 can be tweaked to make reflections "wavier" refrCoords = 0.5 * (gl_TexCoord[2].xy / gl_TexCoord[2].w) + 0.5; refrCoords -= 2.6 * n.xz / w; // The 2.6 can be tweaked to make refractions "wavier" - reflCol = mix(0.7, 1.0, ndotl) * texture2D(reflectionMap, reflCoords).rgb; + reflCol = (0.8 + 0.2*ndotl) * texture2D(reflectionMap, reflCoords).rgb; refrCol = (ambient + ndotl * sunColor) * mix(texture2D(refractionMap, refrCoords).rgb, waterColor, 0.3);