diff --git a/Effects/water-inland.eff b/Effects/water-inland.eff index bfa08013d..d179bd2f7 100644 --- a/Effects/water-inland.eff +++ b/Effects/water-inland.eff @@ -1,1452 +1,12 @@ Effects/water-inland - Effects/terrain-default + Effects/water - - Textures/Water/water-reflection.png - 2d - linear-mipmap-linear - repeat - repeat - normalized - - - Textures/Water/waves-ver10-nm.png - 2d - linear-mipmap-linear - repeat - repeat - normalized - - - Textures/Water/water_sine_nmap.png - 2d - linear-mipmap-linear - repeat - repeat - normalized - - - Textures/Water/water-reflection-grey.png - 2d - linear-mipmap-linear - repeat - repeat - normalized - - - Textures/Water/sea_foam.png - 2d - linear-mipmap-linear - repeat - repeat - normalized - - - Textures/Water/perlin-noise-nm.png - 2d - linear-mipmap-linear - repeat - repeat - normalized - - - Textures/Globe/ocean_depth_1.png - 2d - linear-mipmap-linear - repeat - repeat - normalized - - - Textures/Globe/globe_colors.jpg - 2d - linear-mipmap-linear - repeat - repeat - normalized - - - Textures/Terrain/packice-overlay.png - 2d - linear-mipmap-linear - repeat - repeat - normalized - - 0.0 - - /rendering/scene/saturation - - - /environment/config/enabled - - - /rendering/scene/overcast - - - /environment/clouds/layer[0]/coverage-type - - - /environment/clouds/layer[1]/coverage-type - - - /environment/clouds/layer[2]/coverage-type - - - /environment/clouds/layer[3]/coverage-type - - - /environment/clouds/layer[4]/coverage-type - - - /environment/sea/surface/wind-from-east-fps - - - /environment/sea/surface/wind-from-north-fps - - - /environment/wave/freq - - - /environment/wave/amp - - - /environment/wave/sharp - - - /environment/wave/angle - - - /environment/wave/factor - - - /environment/wave/dangle - - - - /environment/ground-visibility-m - /environment/visibility-m - /environment/ground-haze-thickness-m - /rendering/scene/scattering - /environment/surface/scattering - /environment/terminator-relative-position-m - /environment/mean-terrain-elevation-m - /rendering/scene/overcast - /sim/rendering/eye-altitude-m - /environment/cloud-self-shading - /environment/moonlight - /sim/rendering/shaders/skydome - /environment/fog-structure - /environment/air-pollution-norm - /environment/sea/surface/ice-cover - /sim/rendering/shaders/landmass - - - /environment/aircraft-effects/wash-x - /environment/aircraft-effects/wash-y - /environment/aircraft-effects/wash-strength - - - /sim/rendering/als-filters/use-filtering - /sim/rendering/als-filters/gamma - /sim/rendering/als-filters/brightness - /sim/rendering/als-filters/use-night-vision - /sim/rendering/als-filters/use-IR-vision - /environment/surface/delta-T-water - - /local-weather/cloud-shadows/cloudpos-x[0] - /local-weather/cloud-shadows/cloudpos-y[0] - /local-weather/cloud-shadows/cloudpos-x[1] - /local-weather/cloud-shadows/cloudpos-y[1] - /local-weather/cloud-shadows/cloudpos-x[2] - /local-weather/cloud-shadows/cloudpos-y[2] - /local-weather/cloud-shadows/cloudpos-x[3] - /local-weather/cloud-shadows/cloudpos-y[3] - /local-weather/cloud-shadows/cloudpos-x[4] - /local-weather/cloud-shadows/cloudpos-y[4] - /local-weather/cloud-shadows/cloudpos-x[5] - /local-weather/cloud-shadows/cloudpos-y[5] - /local-weather/cloud-shadows/cloudpos-x[6] - /local-weather/cloud-shadows/cloudpos-y[6] - /local-weather/cloud-shadows/cloudpos-x[7] - /local-weather/cloud-shadows/cloudpos-y[7] - /local-weather/cloud-shadows/cloudpos-x[8] - /local-weather/cloud-shadows/cloudpos-y[8] - /local-weather/cloud-shadows/cloudpos-x[9] - /local-weather/cloud-shadows/cloudpos-y[9] - /local-weather/cloud-shadows/cloudpos-x[10] - /local-weather/cloud-shadows/cloudpos-y[10] - /local-weather/cloud-shadows/cloudpos-x[11] - /local-weather/cloud-shadows/cloudpos-y[11] - /local-weather/cloud-shadows/cloudpos-x[12] - /local-weather/cloud-shadows/cloudpos-y[12] - /local-weather/cloud-shadows/cloudpos-x[13] - /local-weather/cloud-shadows/cloudpos-y[13] - /local-weather/cloud-shadows/cloudpos-x[14] - /local-weather/cloud-shadows/cloudpos-y[14] - /local-weather/cloud-shadows/cloudpos-x[15] - /local-weather/cloud-shadows/cloudpos-y[15] - /local-weather/cloud-shadows/cloudpos-x[16] - /local-weather/cloud-shadows/cloudpos-y[16] - /local-weather/cloud-shadows/cloudpos-x[17] - /local-weather/cloud-shadows/cloudpos-y[17] - /local-weather/cloud-shadows/cloudpos-x[18] - /local-weather/cloud-shadows/cloudpos-y[18] - /local-weather/cloud-shadows/cloudpos-x[19] - /local-weather/cloud-shadows/cloudpos-y[19] - /local-weather/cloud-shadows/cloud-shadow-flag - - - /environment/sea/color_r - - - /environment/sea/color_g - - - /environment/sea/color_b - - - + 0 + 1.0 + 0 + 0.1608 0.2588 0.1765 + 0 - - - 6 - 7 - - - - - - /sim/rendering/shaders/skydome - - 5.0 - /sim/rendering/shaders/water - - - - 2.0 - - - - GL_ARB_shader_objects - GL_ARB_shading_language_100 - GL_ARB_vertex_shader - GL_ARB_fragment_shader - - - - - - - true - - - material/ambient - - - material/diffuse - - - material/specular - - ambient-and-diffuse - - - transparent - - - transparent - - smooth - back - - - render-bin/bin-number - - - render-bin/bin-name - - - - - 2 - - texture[2]/image - - - texture[2]/type - - - texture[2]/filter - - - texture[2]/wrap-s - - - texture[2]/wrap-t - - - texture[2]/internal-format - - - - 3 - - texture[3]/image - - - texture[3]/type - - - texture[3]/filter - - - texture[3]/wrap-s - - - texture[3]/wrap-t - - - texture[3]/internal-format - - - - 4 - - texture[7]/image - - - texture[7]/type - - - texture[7]/filter - - - texture[7]/wrap-s - - - texture[7]/wrap-t - - - texture[7]/internal-format - - - - 5 - - texture[5]/image - - - texture[5]/type - - - texture[5]/filter - - - texture[5]/wrap-s - - - texture[5]/wrap-t - - - texture[5]/internal-format - - - - 6 - - texture[6]/image - - - texture[6]/type - - - texture[6]/filter - - - texture[6]/wrap-s - - - texture[6]/wrap-t - - - texture[6]/internal-format - - - - 7 - - texture[10]/image - - - texture[10]/type - - - texture[10]/filter - - - texture[10]/wrap-s - - - texture[10]/wrap-t - - - texture[10]/internal-format - - - - 8 - - texture[8]/image - - - texture[8]/type - - - texture[8]/filter - - - texture[8]/wrap-s - - - texture[8]/wrap-t - - - texture[8]/internal-format - - - - - - Shaders/water-ALS.vert - Shaders/water-ALS-high.frag - Shaders/noise.frag - Shaders/cloud-shadowfunc.frag - Shaders/hazes.frag - Shaders/secondary_lights.frag - Shaders/filters-ALS.frag - - - - water_normalmap - sampler-2d - 2 - - - water_dudvmap - sampler-2d - 3 - - - topo_map - sampler-2d - 4 - - - sea_foam - sampler-2d - 5 - - - perlin_normalmap - sampler-2d - 6 - - - ice_texture - sampler-2d - 7 - - - - normalmap_dds - float - - normalmap_dds - - - - saturation - float - - - saturation - - - - WindE - float - - windE - - - - WindN - float - - windN - - - - wash_x - float - - wash-x - - - - wash_y - float - - wash-y - - - - wash_strength - float - - wash-strength - - - - WaveFreq - float - - WaveFreq - - - - WaveAmp - float - - WaveAmp - - - - WaveSharp - float - - WaveSharp - - - - WaveAngle - float - - WaveAngle - - - - WaveFactor - float - - WaveFactor - - - - WaveDAngle - float - - WaveDAngle - - - - - - - - visibility - float - - visibility - - - - avisibility - float - - avisibility - - - - hazeLayerAltitude - float - - lthickness - - - - scattering - float - - scattering - - - - ground_scattering - float - - ground_scattering - - - - terminator - float - - terminator - - - - terrain_alt - float - - terrain_alt - - - - overcast - float - - overcast - - - - eye_alt - float - - eye_alt - - - - cloud_self_shading - float - cloud_self_shading - - - fogstructure - float - fogstructure - - - air_pollution - float - air_pollution - - - ice_cover - float - ice_cover - - - view_pitch_offset - float - view_pitch_offset - - - view_heading_offset - float - view_heading_offset - - - field_of_view - float - view_fov - - - landing_light1_offset - float - landing_light1_offset - - - landing_light2_offset - float - landing_light2_offset - - - landing_light3_offset - float - landing_light3_offset - - - gamma - float - gamma - - - brightness - float - brightness - - - use_filtering - bool - use_filtering - - - use_night_vision - bool - use_night_vision - - - use_IR_vision - bool - use_IR_vision - - - delta_T - float - delta_T - - - fact_grey - float - fact_grey - - - fact_black - float - fact_black - - - - cloudpos1_x - float - cloudpos1_x - - - cloudpos1_y - float - cloudpos1_y - - - cloudpos2_x - float - cloudpos2_x - - - cloudpos2_y - float - cloudpos2_y - - - cloudpos3_x - float - cloudpos3_x - - - cloudpos3_y - float - cloudpos3_y - - - cloudpos4_x - float - cloudpos4_x - - - cloudpos4_y - float - cloudpos4_y - - - cloudpos5_x - float - cloudpos5_x - - - cloudpos5_y - float - cloudpos5_y - - - cloudpos6_x - float - cloudpos6_x - - - cloudpos6_y - float - cloudpos6_y - - - cloudpos7_x - float - cloudpos7_x - - - cloudpos7_y - float - cloudpos7_y - - - cloudpos8_x - float - cloudpos8_x - - - cloudpos8_y - float - cloudpos8_y - - - cloudpos9_x - float - cloudpos9_x - - - cloudpos9_y - float - cloudpos9_y - - - cloudpos10_x - float - cloudpos10_x - - - cloudpos10_y - float - cloudpos10_y - - - cloudpos11_x - float - cloudpos11_x - - - cloudpos11_y - float - cloudpos11_y - - - cloudpos12_x - float - cloudpos12_x - - - cloudpos12_y - float - cloudpos12_y - - - cloudpos13_x - float - cloudpos13_x - - - cloudpos13_y - float - cloudpos13_y - - - cloudpos14_x - float - cloudpos14_x - - - cloudpos14_y - float - cloudpos14_y - - - cloudpos15_x - float - cloudpos15_x - - - cloudpos15_y - float - cloudpos15_y - - - cloudpos16_x - float - cloudpos16_x - - - cloudpos16_y - float - cloudpos16_y - - - cloudpos17_x - float - cloudpos17_x - - - cloudpos17_y - float - cloudpos17_y - - - cloudpos18_x - float - cloudpos18_x - - - cloudpos18_y - float - cloudpos18_y - - - cloudpos19_x - float - cloudpos19_x - - - cloudpos19_y - float - cloudpos19_y - - - cloudpos20_x - float - cloudpos20_x - - - cloudpos20_y - float - cloudpos20_y - - - cloud_shadow_flag - int - cloud_shadow_flag - - - - sea_r - float - - sea_r - - - - sea_g - float - - sea_g - - - - sea_b - float - - sea_b - - - - use_searchlight - int - use_searchlight - - - use_landing_light - int - use_landing_light - - - use_alt_landing_light - int - use_alt_landing_light - - - display_xsize - int - display_xsize - - - display_ysize - int - display_ysize - - - quality_level - int - quality_level - - - tquality_level - int - tquality_level - - - ocean_flag - int - 0 - - - - - - - - - - /sim/rendering/shaders/skydome - - 4.0 - /sim/rendering/shaders/water - - - - 2.0 - - - - GL_ARB_shader_objects - GL_ARB_shading_language_100 - GL_ARB_vertex_shader - GL_ARB_fragment_shader - - - - - - - true - - - material/ambient - - - material/diffuse - - - material/specular - - ambient-and-diffuse - - - transparent - - - transparent - - smooth - back - - - render-bin/bin-number - - - render-bin/bin-name - - - - - 2 - - texture[2]/image - - - texture[2]/type - - - texture[2]/filter - - - texture[2]/wrap-s - - - texture[2]/wrap-t - - - texture[2]/internal-format - - - - 3 - - texture[3]/image - - - texture[3]/type - - - texture[3]/filter - - - texture[3]/wrap-s - - - texture[3]/wrap-t - - - texture[3]/internal-format - - - - - 5 - - texture[5]/image - - - texture[5]/type - - - texture[5]/filter - - - texture[5]/wrap-s - - - texture[5]/wrap-t - - - texture[5]/internal-format - - - - 6 - - texture[6]/image - - - texture[6]/type - - - texture[6]/filter - - - texture[6]/wrap-s - - - texture[6]/wrap-t - - - texture[6]/internal-format - - - - - Shaders/water-ALS.vert - Shaders/water-ALS-base.frag - Shaders/hazes.frag - Shaders/noise.frag - Shaders/filters-ALS.frag - - - - water_normalmap - sampler-2d - 2 - - - water_dudvmap - sampler-2d - 3 - - - sea_foam - sampler-2d - 5 - - - perlin_normalmap - sampler-2d - 6 - - - water_colormap - sampler-2d - 8 - - - - normalmap_dds - float - - normalmap_dds - - - - saturation - float - - - saturation - - - - WindE - float - - windE - - - - WindN - float - - windN - - - - WaveFreq - float - - WaveFreq - - - - WaveAmp - float - - WaveAmp - - - - WaveSharp - float - - WaveSharp - - - - WaveAngle - float - - WaveAngle - - - - WaveFactor - float - - WaveFactor - - - - WaveDAngle - float - - WaveDAngle - - - - - - - - visibility - float - - visibility - - - - avisibility - float - - avisibility - - - - hazeLayerAltitude - float - - lthickness - - - - scattering - float - - scattering - - - - ground_scattering - float - - ground_scattering - - - - terminator - float - - terminator - - - - terrain_alt - float - - terrain_alt - - - - overcast - float - - overcast - - - - eye_alt - float - - eye_alt - - - - cloud_self_shading - float - cloud_self_shading - - - - gamma - float - gamma - - - brightness - float - brightness - - - use_filtering - bool - use_filtering - - - use_night_vision - bool - use_night_vision - - - use_IR_vision - bool - use_IR_vision - - - delta_T - float - delta_T - - - fact_grey - float - fact_grey - - - fact_black - float - fact_black - - - - sea_r - float - - sea_r - - - - sea_g - float - - sea_g - - - - sea_b - float - - sea_b - - - - ocean_flag - int - 0 - - - display_xsize - int - display_xsize - - - display_ysize - int - display_ysize - - - - - diff --git a/Effects/water.eff b/Effects/water.eff index f2b40145d..05a1c944f 100644 --- a/Effects/water.eff +++ b/Effects/water.eff @@ -75,6 +75,11 @@ repeat normalized + 0 + 0.7 + 0 + 0.054 0.149 0.384 + 1 0.0 /rendering/scene/saturation @@ -459,6 +464,26 @@ sampler-2d 8 + + use_specified_water_shallowness + int + use_specified_water_shallowness + + + water_shallowness + float + water_shallowness + + + use_specified_floor_color + int + use_specified_floor_color + + + floor_color + float-vec3 + floor_color + normalmap_dds @@ -976,7 +1001,7 @@ ocean_flag int - 1 + ocean_flag @@ -1409,7 +1434,7 @@ ocean_flag int - 1 + ocean_flag display_xsize