diff --git a/Effects/transition.eff b/Effects/transition.eff index 65489018b..62b2e075c 100644 --- a/Effects/transition.eff +++ b/Effects/transition.eff @@ -43,6 +43,23 @@ parameters : /sim/rendering/snow-level-m + + + /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 + + 2.0 0.0 @@ -257,6 +274,46 @@ parameters : inverse + + + CloudCover0 + float + + cloud-cover0 + + + + + CloudCover1 + float + + cloud-cover1 + + + + + CloudCover2 + float + + cloud-cover2 + + + + + CloudCover3 + float + + cloud-cover3 + + + + + CloudCover4 + float + + cloud-cover4 + + diff --git a/Effects/water-inland.eff b/Effects/water-inland.eff index 1374ad872..a619e2d90 100644 --- a/Effects/water-inland.eff +++ b/Effects/water-inland.eff @@ -1,9 +1,7 @@ - Effects/water-inland - + Effects/water Effects/terrain-default - Textures/Water/water-reflection-inland.dds @@ -26,14 +24,32 @@ repeat normalized + + Textures/Water/water-reflection-grey.png + linear-mipmap-linear + repeat + repeat + normalized + /rendering/scene/saturation - - /environment/rain-norm - + + /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 + - @@ -141,6 +157,24 @@ texture[3]/internal-format + + 4 + + texture[4]/image + + + texture[4]/filter + + + texture[4]/wrap-s + + + texture[4]/wrap-t + + + texture[4]/internal-format + + Shaders/water.vert Shaders/water-inland.frag @@ -160,25 +194,54 @@ sampler-2d 3 + + water_reflection_grey + sampler-2d + 4 + saturation float - + 0.4 + + + + CloudCover0 + float - saturation + cloud-cover0 - RainNorm + CloudCover1 float - - - rain-norm - + + cloud-cover1 + + + + CloudCover2 + float + + cloud-cover2 + + + + CloudCover3 + float + + cloud-cover3 + + + + CloudCover4 + float + + cloud-cover4 + - diff --git a/Effects/water.eff b/Effects/water.eff index 94a6cff6c..4edf05af9 100644 --- a/Effects/water.eff +++ b/Effects/water.eff @@ -1,176 +1,309 @@ - Effects/water - Effects/terrain-default - - - Textures/Water/water-reflection.png - linear-mipmap-linear - repeat - repeat - normalized - - - Textures/Water/water-normalmap.png - linear-mipmap-linear - repeat - repeat - normalized - - - Textures/Water/water-dudv.png - linear-mipmap-linear - repeat - repeat - normalized - - - /rendering/scene/saturation - - - - - - /sim/rendering/water-shader - /sim/rendering/shader-effects - - 2.0 - /sim/rendering/quality-level - - - - 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 - - - 0 - texture[0]/image - texture[0]/filter - texture[0]/wrap-s - texture[0]/wrap-t - - texture[0]/internal-format - - - - 2 - texture[2]/image - texture[2]/filter - texture[2]/wrap-s - texture[2]/wrap-t - - texture[2]/internal-format - - - - 3 - texture[3]/image - texture[3]/filter - texture[3]/wrap-s - texture[3]/wrap-t - - texture[3]/internal-format - - - - Shaders/water.vert - Shaders/water.frag - - - water_reflection - sampler-2d - 0 - - - water_normalmap - sampler-2d - 2 - - - water_dudvmap - sampler-2d - 3 - - - saturation - float - 0.4 - - - - - - - - /sim/rendering/water-shader - /sim/rendering/shader-effects - - - 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 - - - 0 - noise - - - Shaders/water-orig.vert - Shaders/water-orig.frag - - - texture - sampler-3d - 0 - - + Effects/water + Effects/terrain-default + + + Textures/Water/water-reflection.png + linear-mipmap-linear + repeat + repeat + normalized + + + Textures/Water/water-normalmap.png + linear-mipmap-linear + repeat + repeat + normalized + + + Textures/Water/water-dudv.png + linear-mipmap-linear + repeat + repeat + normalized + + + Textures/Water/water-reflection-grey.png + linear-mipmap-linear + repeat + repeat + normalized + + + /rendering/scene/saturation + + + /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 + + + + + + /sim/rendering/water-shader + /sim/rendering/shader-effects + + 2.0 + /sim/rendering/quality-level + + + + 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 + + + + 0 + + texture[0]/image + + + texture[0]/filter + + + texture[0]/wrap-s + + + texture[0]/wrap-t + + + texture[0]/internal-format + + + + 2 + + texture[2]/image + + + texture[2]/filter + + + texture[2]/wrap-s + + + texture[2]/wrap-t + + + texture[2]/internal-format + + + + 3 + + texture[3]/image + + + texture[3]/filter + + + texture[3]/wrap-s + + + texture[3]/wrap-t + + + texture[3]/internal-format + + + + 4 + + texture[4]/image + + + texture[4]/filter + + + texture[4]/wrap-s + + + texture[4]/wrap-t + + + texture[4]/internal-format + + + + Shaders/water.vert + Shaders/water.frag + + + water_reflection + sampler-2d + 0 + + + water_normalmap + sampler-2d + 2 + + + water_dudvmap + sampler-2d + 3 + + + water_reflection_grey + sampler-2d + 4 + + + saturation + float + 0.4 + + + + CloudCover0 + float + + cloud-cover0 + + + + CloudCover1 + float + + cloud-cover1 + + + + CloudCover2 + float + + cloud-cover2 + + + + CloudCover3 + float + + cloud-cover3 + + + + CloudCover4 + float + + cloud-cover4 + + + + + + + + /sim/rendering/water-shader + /sim/rendering/shader-effects + + + 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 + + + + 0 + noise + + + Shaders/water-orig.vert + Shaders/water-orig.frag + + + texture + sampler-3d + 0 + + +