1
0
Fork 0
Commit graph

15 commits

Author SHA1 Message Date
Stuart Buchanan
98fda02e65 WS30: Combined land and water shader
Previously the water shader was separate and executed on a
different mesh.

This adds the water shader as a separate fragment function
(ws30-water.frag) and uses a material parameter passed in
as a Uniform to use it in preference to the usual texel
lookup.

Performance testing found a slight performance improvement
from having a single mesh, but a slight performance impact
from the extra fragment shader complexity.
2022-02-05 15:24:02 +00:00
Edward d'Auvergne
3bf57db6b4 Fixes for all PNG files with corrupted ICC color profiles.
The files were identified using the pngcrush software and repaired by stripping
out the PNG header including the ICC profile using the command:

$ pngcrush -fix -force old.png new.png; mv -f new.png old.png

Each file was manually checked in an image viewer to look for any corruptions.

This follows from the threads
http://thread.gmane.org/gmane.games.flightgear.devel/79895 and
http://thread.gmane.org/gmane.games.flightgear.devel/79898 .
2016-01-06 21:38:13 +01:00
Rebecca Palmer
7a540ca6d6 Remove/move unused textures
Unused duplicate/downsampled and .dds-only textures are deleted,
unused unique .png are moved to Unused for possible future use
2014-06-12 23:53:24 +01:00
Emilian Huminiuc
6ef4f5eca0 Make water efect use png textures by default, and rely on their dds counterparts only when using the dds materials file.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-06-16 18:57:14 +03:00
Vivian Meazza
505ce42582 Bring grey texture into line with blue
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-05-07 16:39:29 +01:00
Vivian Meazza
9657518663 Optimise water shaders after ideas and suggestions by Thorsten Renk
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-05-05 19:59:22 +01:00
Emilian Huminiuc
d43770ab58 Effects/model-default.eff move skydome to technique 5 to provide more headroom
Effects/model-combined.eff fix techniques numbering. Make active under rembrandt too. add model-combined-deferred as a stub for now for specific
Rembrandt use.
Users of model-combined with normalmaps should change the technique number to 9, and duplicate that entry for technique 8.
Fix some longstanding png warnings. Provide null_reflectdir.png for model-combined
This should fix part of bug #726
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-03-31 15:00:36 +03:00
Vivian Meazza
86f9ffac79 add texture
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-12-01 23:01:20 +00:00
Vivian Meazza
7020a95698 Add bow-wave textures
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-12-01 22:06:40 +00:00
Vivian Meazza
f7b832d68a Add texture.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-10-07 14:29:46 +01:00
Vivian Meazza
d45670baa8 Water shader PhaseII improvements.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-10-07 12:46:01 +01:00
Vivian Meazza
e758deced1 Add foam to water effect. Based on work by Emilian Huminuc. 2011-09-26 23:35:20 +01:00
Vivian Meazza
fd954315d0 Add grey sea texture
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-09-22 15:41:47 +01:00
Vivian Meazza
5c422acadc Fourth tranche of .dds textures
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-09-05 13:58:46 +01:00
gral@who.net
d10a9b8eff Adding files 2010-09-30 01:29:41 +02:00