Opened 8 years ago

Closed 7 years ago

Last modified 7 years ago

#4288 closed defect (fixed)

[PATCH] Wrong water colors on some maps

Reported by: elexis Owned by: elexis
Priority: Release Blocker Milestone: Alpha 21
Component: Maps Keywords:
Cc: Patch:

Description

Some maps had light blue water in alpha 20 but have dark green water in alpha 21. This is very visible when water reflections are disabled. But even when they are enabled, the tendency is still towards green. This looks nice for many maps, but not suited for some.

Affected maps:

  • Random:
    • Latium: dark green
    • Guadalic River: gray
    • Lorraine Plain: dark gray4
    • Northern Lights: grey water, refractions seem too strong in both svn and a20)
    • Pyrannean Sierra: dark blue. Also #4287: The waves were very clearly seen in a20, now one can't notice any surface features at all after disabling shadows on water
  • Skirmish: None seem affected
  • Scenario:
    • Siwa Oasis: too saturated water color in both releases and #4287

Should probably be fixed with setWaterColor, setWaterTint from environment.js for the random maps.

Refs r18443

Attachments (1)

4288_water_v2.patch (4.1 KB ) - added by Imarok 8 years ago.
Improved patch based on elexis' critique

Download all attachments as: .zip

Change History (11)

comment:1 by elexis, 8 years ago

Water colors:

aegean_sea.js
alpine_lakes.js
alpine_valley.js
amazon.js
bahrain.js
cantabrian_highlands.js
corinthian_isthmus.js
corsica.js
cycladic_archipelago.js
english_channel.js
fortress.js
guadalquivir_river.js
gulf_of_bothnia.js
howe_sound.js
hyrcanian_shores.js
kerala.js
latium.js
lorraine_plain.js
marmara.js
mediterranean.js
neareastern_badlands.js
ngorongoro.js
northern_lights.js
oasis.js
phoenician_levant.js
pompeii.js
pyrenean_sierra.js
red_sea.js
rhine_marshlands.js
rmgen/randombiome.js // Temperate
rmgen/randombiome.js // Snowy
rmgen/randombiome.js // Desert
rmgen/randombiome.js //Alpine
rmgen/randombiome.js //Mediterranean
rmgen/randombiome.js //Savanna
rmgen/randombiome.js //Tropic
rmgen/randombiome.js //Autumn
rouen.js
saharan_oases.js
sahel.js
sahel_watering_holes.js
schwarzwald.js
syria.js
the_nile.js
Last edited 8 years ago by elexis (previous) (diff)

comment:2 by elexis, 8 years ago

Water colors + water tint:

aegean_sea.js
alpine_lakes.js
alpine_valley.js
amazon.js
bahrain.js
cantabrian_highlands.js
corinthian_isthmus.js
corsica.js
cycladic_archipelago.js
english_channel.js
fortress.js
guadalquivir_river.js
gulf_of_bothnia.js
howe_sound.js
hyrcanian_shores.js
kerala.js
latium.js
lorraine_plain.js
marmara.js
mediterranean.js
neareastern_badlands.js
ngorongoro.js
northern_lights.js
oasis.js
phoenician_levant.js
pompeii.js
pyrenean_sierra.js
red_sea.js
rhine_marshlands.js
rmgen/randombiome.js //Temperate
rmgen/randombiome.js //Snowy
rmgen/randombiome.js //Desert
rmgen/randombiome.js //Alpine
rmgen/randombiome.js //Mediterranean
rmgen/randombiome.js //Savanna
rmgen/randombiome.js //Tropic
rmgen/randombiome.js //Autumn
rouen.js
saharan_oases.js
sahel.js
sahel_watering_holes.js
schwarzwald.js
syria.js
the_nile.js
Last edited 8 years ago by elexis (previous) (diff)

comment:3 by elexis, 8 years ago

Cantabrian Highlands was light blue before despite not only muddy gray water color and tint definied.

Independent from that, the shader should not render fog if GLSL is disabled, as it looks very weird if only the water is fogged.

by Imarok, 8 years ago

Attachment: 4288_water_v2.patch added

Improved patch based on elexis' critique

comment:4 by Imarok, 8 years ago

Keywords: rfc patch added
Summary: Wrong water colors on some maps[PATCH] Wrong water colors on some maps

comment:5 by Stan, 7 years ago

Is there any reason for the sudden change on water color ? Is that the r18443 commit or is it linked to the skybox now being too small since height elevation can no outreach it ?

comment:6 by elexis, 7 years ago

The new water shader in that revision made the wrong colors specified in those maps more visible.

comment:7 by elexis, 7 years ago

Owner: set to elexis
Resolution: fixed
Status: newclosed

In 18897:

Fix some weird water colors on some maps (like green on latium) that were revealed by the new water shader in r18443. Patch by Imarok, reviewed by Stan, fixes #4288.

comment:8 by elexis, 7 years ago

Keywords: patch removed

Thanks for the patch! I removed the comments that described the old color and I switched tint and color on pyrennean sierra, as the water color seemed too saturated. Stan has uploaded screenshots yesterday on irc.

comment:9 by elexis, 7 years ago

https://imgur.com/a/D2fea

comment:10 by elexis, 7 years ago

Keywords: rfc removed
Note: See TracTickets for help on using tickets.