Diffusion 0 A.D. Public Repository rP15473

Change the water texture to a new, bigger one, created in Blender (thanks to…
rP15473
Actions

Description

Change the water texture to a new, bigger one, created in Blender (thanks to Enrique). Change settings so that they are more logical, yet allow reverting back to an even lower quality setting. Add a WIP high setting (with foam) which isn't finished yet.
Change the shader itself so that the effects look nicer and are more consistent across settings.
Rework the water mesh generation (simpler system). Fix a few issues.

May work oddly with Atlas since I haven't been able to compile yet.

Refs #1875 (maybe fix), Fixes #2077 (I'll assume it does), Fixes #2114 (assumption again), refs #48.

Details

Committed

wraitii

Jul 1 2014, 6:05 PM

Parents

rP15472: Automated build.

Branches

Unknown

Tags

Unknown

Event Timeline

wraitii committed rP15473: Change the water texture to a new, bigger one, created in Blender (thanks to….Jul 1 2014, 6:05 PM

Sandarac mentioned this in D536: Fix Valgrind complaints in CRenderer.May 22 2017, 3:24 PM

temple mentioned this in D1379: Add ceasefirecounter to default.cfg, rename watershadows to shadowsonwater.Mar 11 2018, 11:52 PM

elexis mentioned this in rP22006: Clean up and speed up the water manager distance computations.Jun 21 2019, 8:14 PM

elexis mentioned this in rP15484: Further WIP water improvements. Add 3 different textures for different looks..

wraitii mentioned this in D3447: Fix a crash in WaterRenderer.cpp.Jan 21 2021, 10:29 PM

Changes (92)

Path

Size

ps/

trunk/

binaries/

data/

config/

default.cfg

mods/

public/

art/

textures/

animated/

water/

gui/

options/

options.js

hwdetect/

hwdetect.js

test.js

shaders/

glsl/

build/

svn_revision/

svn_revision.txt

source/

ps/

GameSetup/

renderer/

scripting/

JSInterface_Renderer.cpp

JSInterface_Renderer.h

simulation2/

components/

Change the water texture to a new, bigger one, created in Blender (thanks to…rP15473Actions

Description

Details

Event Timeline

Changes (92)

rP15473

ps/trunk/binaries/data/config/default.cfg

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0001.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0002.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0003.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0004.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0005.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0006.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0007.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0008.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0009.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0010.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0011.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0012.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0013.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0014.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0015.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0016.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0017.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0018.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0019.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0020.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0021.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0022.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0023.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0024.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0025.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0026.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0027.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0028.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0029.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0030.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0031.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0032.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0033.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0034.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0035.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0036.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0037.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0038.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0039.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0040.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0041.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0042.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0043.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0044.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0045.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0046.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0047.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0048.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0049.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0050.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0051.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0052.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0053.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0054.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0055.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0056.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0057.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0058.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0059.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/ocean/normal0060.png

ps/trunk/binaries/data/mods/public/art/textures/animated/water/textures.xml

ps/trunk/binaries/data/mods/public/gui/options/options.js

ps/trunk/binaries/data/mods/public/hwdetect/hwdetect.js

ps/trunk/binaries/data/mods/public/hwdetect/test.js

ps/trunk/binaries/data/mods/public/shaders/glsl/model_common.fs

ps/trunk/binaries/data/mods/public/shaders/glsl/model_common.vs

ps/trunk/binaries/data/mods/public/shaders/glsl/water_effects.fs

ps/trunk/binaries/data/mods/public/shaders/glsl/water_effects.vs

ps/trunk/binaries/data/mods/public/shaders/glsl/water_effects.xml

ps/trunk/binaries/data/mods/public/shaders/glsl/water_high.fs

ps/trunk/binaries/data/mods/public/shaders/glsl/water_high.vs

ps/trunk/binaries/data/mods/public/shaders/glsl/waves.fs

Change the water texture to a new, bigger one, created in Blender (thanks to…
rP15473
Actions