diff --git a/Effects/bumpspec.eff b/Effects/bumpspec.eff index ad11d1e6c..a74aeb326 100644 --- a/Effects/bumpspec.eff +++ b/Effects/bumpspec.eff @@ -59,7 +59,7 @@ in Aircraft/A320/Models/Effects/a320_bumpspec.eff ( or whatever, private to the texture[0]/filter texture[0]/wrap-s texture[0]/wrap-t - texture[1]/internal-format + texture[0]/internal-format 1 @@ -70,8 +70,8 @@ in Aircraft/A320/Models/Effects/a320_bumpspec.eff ( or whatever, private to the texture[2]/internal-format - Shaders/bumpspec.vert - Shaders/bumpspec.frag + Shaders/bumpspec.vert + Shaders/bumpspec.frag tangent 6 diff --git a/Effects/cloud-models.eff b/Effects/cloud-models.eff index 47c42b55c..c60336161 100644 --- a/Effects/cloud-models.eff +++ b/Effects/cloud-models.eff @@ -10,7 +10,7 @@ - /sim/rendering/shader-effects + /sim/rendering/shaders/quality-level 2.0 diff --git a/Effects/clouds-box.eff b/Effects/clouds-box.eff index 2dbb18940..a7483263e 100644 --- a/Effects/clouds-box.eff +++ b/Effects/clouds-box.eff @@ -8,7 +8,7 @@ - /sim/rendering/shader-effects + /sim/rendering/shaders/quality-level 1.0 diff --git a/Effects/clouds-layered.eff b/Effects/clouds-layered.eff index 2d1b0b9c5..b638339c7 100644 --- a/Effects/clouds-layered.eff +++ b/Effects/clouds-layered.eff @@ -8,7 +8,7 @@ - /sim/rendering/shader-effects + /sim/rendering/shaders/quality-level 1.0 diff --git a/Effects/clouds-thick.eff b/Effects/clouds-thick.eff index 52dcbb101..7c5beaf7f 100644 --- a/Effects/clouds-thick.eff +++ b/Effects/clouds-thick.eff @@ -8,7 +8,7 @@ - /sim/rendering/shader-effects + /sim/rendering/shaders/quality-level 1.0 diff --git a/Effects/clouds-thin.eff b/Effects/clouds-thin.eff index 94a5fa172..fae3163a7 100644 --- a/Effects/clouds-thin.eff +++ b/Effects/clouds-thin.eff @@ -8,7 +8,7 @@ - /sim/rendering/shader-effects + /sim/rendering/shaders/quality-level 1.0 diff --git a/Effects/clouds-thinlayer.eff b/Effects/clouds-thinlayer.eff index 8d22f82c5..0bf9158df 100644 --- a/Effects/clouds-thinlayer.eff +++ b/Effects/clouds-thinlayer.eff @@ -8,7 +8,7 @@ - /sim/rendering/shader-effects + /sim/rendering/shaders/quality-level 1.0 diff --git a/Effects/crop.eff b/Effects/crop.eff index 2c616ff06..2bcce657a 100644 --- a/Effects/crop.eff +++ b/Effects/crop.eff @@ -16,13 +16,12 @@ mirror normalized - /sim/rendering/snow-level-m + /environment/snow-level-m - /sim/rendering/crop-shader - /sim/rendering/shader-effects + /sim/rendering/shaders/crop 2.0 diff --git a/Effects/cropgrass.eff b/Effects/cropgrass.eff index ee78881ce..7ca55d597 100644 --- a/Effects/cropgrass.eff +++ b/Effects/cropgrass.eff @@ -16,6 +16,6 @@ mirror normalized - /sim/rendering/snow-level-m + /environment/snow-level-m diff --git a/Effects/forest.eff b/Effects/forest.eff index 438d30dfa..5b806190e 100644 --- a/Effects/forest.eff +++ b/Effects/forest.eff @@ -30,10 +30,10 @@ repeat normalized - /sim/rendering/snow-level-m + /environment/snow-level-m 0.04 15.0 - /sim/rendering/quality-level + /sim/rendering/shaders/transition 0.12 @@ -49,8 +49,7 @@ - /sim/rendering/transition-shader - /sim/rendering/shader-effects + /sim/rendering/shaders/transition 2.0 diff --git a/Effects/glacier.eff b/Effects/glacier.eff index c5fb1f2db..a8b8c71aa 100644 --- a/Effects/glacier.eff +++ b/Effects/glacier.eff @@ -30,10 +30,10 @@ repeat normalized - /sim/rendering/snow-level-m + /environment/snow-level-m 0.01 15.0 - /sim/rendering/quality-level + /sim/rendering/shaders/transition 0.12 @@ -49,8 +49,7 @@ - /sim/rendering/transition-shader - /sim/rendering/shader-effects + /sim/rendering/shaders/transition 2.0 diff --git a/Effects/herbtundra.eff b/Effects/herbtundra.eff index 6b819d16e..3e2eae61a 100644 --- a/Effects/herbtundra.eff +++ b/Effects/herbtundra.eff @@ -30,7 +30,7 @@ repeat normalized - /sim/rendering/snow-level-m + /environment/snow-level-m 0.01 15.0 @@ -40,7 +40,7 @@ 0.22 - /sim/rendering/quality-level + /sim/rendering/shaders/transition 6 @@ -49,8 +49,7 @@ - /sim/rendering/transition-shader - /sim/rendering/shader-effects + /sim/rendering/shaders/transition 2.0 diff --git a/Effects/terrain-default.eff b/Effects/terrain-default.eff index fa48f7a4e..484d1cba2 100644 --- a/Effects/terrain-default.eff +++ b/Effects/terrain-default.eff @@ -35,6 +35,24 @@ 0 RenderBin + + /environment/ground-visibility-m + + + /environment/visibility-m + + + /environment/ground-haze-thickness-m + + + /rendering/scene/scattering + + + /environment/terminator-relative-position-m + + + /sim/rendering/scattering-shader + @@ -85,6 +103,7 @@ + Shaders/include_fog.vert Shaders/default.vert Shaders/terrain-nocolor.frag @@ -124,9 +143,53 @@ + Shaders/include_fog.vert Shaders/default.vert Shaders/default.frag + Shaders/include_fog.frag + + visibility + float + + visibility + + + + avisibility + float + + avisibility + + + + hazeLayerAltitude + float + + lthickness + + + + scattering + float + + scattering + + + + terminator + float + + terminator + + + + fogType + int + + fogtype + + texture sampler-2d diff --git a/Effects/test.eff b/Effects/test.eff index c5b4e8435..b6d87eeb3 100644 --- a/Effects/test.eff +++ b/Effects/test.eff @@ -1,62 +1,72 @@ - Effects/test - - - - - - - - /sim/rendering/shader-effects - - 1.0 - - - - - - - true - - 0.5 0.5 0.5 1.0 - 0.5 0.5 0.5 1.0 - off - - - greater - 0.01 - - smooth - - src-alpha - one-minus-src-alpha - - - false - - - 10 - DepthSortedBin - - - 0 - texture[0]/type - texture[0]/image - texture[0]/filter - texture[0]/wrap-s - texture[0]/wrap-t - + true + + 0.5 0.5 0.5 1.0 + 0.5 0.5 0.5 1.0 + off + + + greater + 0.01 + + smooth + + src-alpha + one-minus-src-alpha + + + false + + + 10 + DepthSortedBin + + + 0 + + texture[0]/type + + + texture[0]/image + + + texture[0]/filter + + + texture[0]/wrap-s + + + texture[0]/wrap-t + + - - - - Shaders/test.vert - Shaders/test.frag - - - - baseTexture - sampler-2d - 0 - - - shading - float - 0.5 - - true - - + + + baseTexture + sampler-2d + 0 + + + shading + float + 0.5 + + true + + diff --git a/Effects/water-inland.eff b/Effects/water-inland.eff index 59f66f1e7..999c90dca 100644 --- a/Effects/water-inland.eff +++ b/Effects/water-inland.eff @@ -1,6 +1,6 @@ - Effects/water-inland + Effects/water Effects/terrain-default @@ -49,6 +49,26 @@ /environment/clouds/layer[4]/coverage-type + + + /environment/ground-visibility-m + + + /environment/visibility-m + + + /environment/ground-haze-thickness-m + + + /rendering/scene/scattering + + + /environment/terminator-relative-position-m + + + /sim/rendering/scattering-shader + + @@ -176,6 +196,7 @@ + Shaders/include_fog.vert Shaders/water.vert Shaders/water-inland.frag @@ -240,6 +261,50 @@ cloud-cover4 + + + visibility + float + + visibility + + + + avisibility + float + + avisibility + + + + hazeLayerAltitude + float + + lthickness + + + + scattering + float + + scattering + + + + terminator + float + + terminator + + + + fogType + int + + fogtype + + +