diff --git a/Effects/building.eff b/Effects/building.eff index 5b56a5a16..25a66f877 100644 --- a/Effects/building.eff +++ b/Effects/building.eff @@ -3,73 +3,243 @@ Effects/building Effects/model-combined-deferred - - 2d - Textures/buildings.png - linear-mipmap-linear - clamp - clamp - normalized - - - 0 - 0 - 1.0 - - - Textures/buildings-lightmap.png - linear-mipmap-linear - clamp - clamp - normalized - - 1 - 0 - - /sim/time/sun-angle-rad - - 0.3 0.3 0.3 - - - 1 - 1 - 0.10 - 0 - 0.0 - 0.0 - 0.0 - - 0.0 - 0 - 0.0 0.0 0.0 - 0.0 - - true - 1 - 0.6 0.6 0.6 1.0 - 1.0 1.0 1.0 1.0 - 0.0 0.0 0.0 1.0 - 0.02 0.02 0.02 1.0 - 0.0 - ambient-and-diffuse - ambient-and-diffuse - + + 2d + Textures/buildings.png + linear-mipmap-linear + clamp + clamp + normalized + + + 0 + 0 + 1.0 + + + Textures/buildings-lightmap.png + linear-mipmap-linear + clamp + clamp + normalized + + 1 + 0 + + /sim/time/sun-angle-rad + + 0.3 0.3 0.3 + + + 1 + 1 + 0.10 + 0 + 0.0 + 0.0 + 0.0 + + 0.0 + 0 + 0.0 0.0 0.0 + 0.0 + + true + 1 + 0.6 0.6 0.6 1.0 + 1.0 1.0 1.0 1.0 + 0.0 0.0 0.0 1.0 + 0.02 0.02 0.02 1.0 + 0.0 + ambient-and-diffuse + ambient-and-diffuse + 0 - 0 - 0 - 0 + 0 + 0 + 0 flat back opaque + + /environment/ground-visibility-m + /environment/visibility-m + /environment/ground-haze-thickness-m + /rendering/scene/scattering + /environment/surface/scattering + /environment/terminator-relative-position-m + /sim/rendering/shaders/skydome + /environment/mean-terrain-elevation-m + /rendering/scene/overcast + /sim/rendering/eye-altitude-m + /environment/mysnow-level-m + /environment/surface/dust-cover-factor + /sim/rendering/shaders/skydome + /environment/fog-structure + + + + + + + /sim/rendering/shaders/skydome + + + 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 + material/emissive + material/shininess + ambient-and-diffuse + + false + flat + back + + -1 + RenderBin + + + 0 + texture[0]/image + texture[0]/filter + texture[0]/wrap-s + texture[0]/wrap-t + + texture[0]/internal-format + + + + Shaders/include_fog.vert + Shaders/default.vert + Shaders/include_fog.frag + Shaders/terrain-nocolor.frag + + + texture + sampler-2d + 0 + + 0 0 0 0 + + + true + + material/ambient + material/diffuse + material/specular + material/emissive + material/shininess + ambient-and-diffuse + + false + false + flat + 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 + + + + Shaders/terrain-haze.vert + Shaders/terrain-haze.frag + + + 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 + + + texture + sampler-2d + 0 + + + colorMode + int + 2 + + + lequal + false + + + @@ -115,4 +285,4 @@ - \ No newline at end of file + diff --git a/Effects/tree.eff b/Effects/tree.eff index d6650e8ad..a49a4bb31 100644 --- a/Effects/tree.eff +++ b/Effects/tree.eff @@ -31,8 +31,6 @@ /environment/surface/dust-cover-factor /sim/rendering/shaders/skydome /environment/fog-structure - /sim/rendering/tree-bin - /sim/rendering/tree-bin-name