fly/fgdata
1
0
Fork 0
Code Activity

Cleanup:

Browse source 
- water.eff: technique 2: air_pollution uniform is not used by water-ALS-base.frag
- water.eff: ocean_flag is now a parameter
- water-inland.eff now inherits from water.eff as it's a copy, except for ocean_flag value
This commit is contained in:
Erik Hofman 2021-05-10 11:52:28 +02:00
parent 16f94fb20a
commit 55209d40b5
2 changed files with 33 additions and 1448 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1452
Effects/water-inland.eff
View file

File diff suppressed because it is too large Load diff

29
Effects/water.eff
View file

@ -75,6 +75,11 @@
<wrap-t>repeat</wrap-t> <wrap-t>repeat</wrap-t>
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<use_specified_water_shallowness type="int">0</use_specified_water_shallowness>
<water_shallowness type="float">0.7</water_shallowness>
<use_specified_floor_color type="int">0</use_specified_floor_color>
<floor_color type="vec3d">0.054 0.149 0.384</floor_color>
<ocean_flag>1</ocean_flag>
<normalmap_dds type="float">0.0</normalmap_dds> <normalmap_dds type="float">0.0</normalmap_dds>
<saturation> <saturation>
<use>/rendering/scene/saturation</use> <use>/rendering/scene/saturation</use>
@ -459,6 +464,26 @@
<type>sampler-2d</type> <type>sampler-2d</type>
<value type="int">8</value> <value type="int">8</value>
</uniform> </uniform>
<uniform>
<name>use_specified_water_shallowness</name>
<type>int</type>
<value><use>use_specified_water_shallowness</use></value>
</uniform>
<uniform>
<name>water_shallowness</name>
<type>float</type>
<value><use>water_shallowness</use></value>
</uniform>
<uniform>
<name>use_specified_floor_color</name>
<type>int</type>
<value><use>use_specified_floor_color</use></value>
</uniform>
<uniform>
<name>floor_color</name>
<type>float-vec3</type>
<value><use>floor_color</use></value>
</uniform>
<!-- normalmap is .dds--> <!-- normalmap is .dds-->
<uniform> <uniform>
<name>normalmap_dds</name> <name>normalmap_dds</name>
@ -976,7 +1001,7 @@
<uniform> <uniform>
<name>ocean_flag</name> <name>ocean_flag</name>
<type>int</type> <type>int</type>
<value>1</value> <value><use>ocean_flag</use></value>
</uniform> </uniform>
<!-- END fog include --> <!-- END fog include -->
</pass> </pass>
@ -1409,7 +1434,7 @@
<uniform> <uniform>
<name>ocean_flag</name> <name>ocean_flag</name>
<type>int</type> <type>int</type>
<value>1</value> <value><use>ocean_flag</use></value>
</uniform> </uniform>
<uniform> <uniform>
<name>display_xsize</name> <name>display_xsize</name>