diff --git a/Compositor/Effects/model-combined.eff b/Compositor/Effects/model-combined.eff index aed99f782..5562e23b5 100644 --- a/Compositor/Effects/model-combined.eff +++ b/Compositor/Effects/model-combined.eff @@ -305,7 +305,7 @@ please see Docs/README.model-combined.eff for documentation 7 --> - + /sim/rendering/shaders/quality-level @@ -843,7 +843,7 @@ please see Docs/README.model-combined.eff for documentation - + als-lighting diff --git a/Compositor/Effects/planet-cloudlayer.eff b/Compositor/Effects/planet-cloudlayer.eff index 1f303c732..fc98be6db 100644 --- a/Compositor/Effects/planet-cloudlayer.eff +++ b/Compositor/Effects/planet-cloudlayer.eff @@ -86,7 +86,86 @@ 15 6 - + + + true + + + material/active + + + material/ambient + + + material/diffuse + + + material/specular + + + material/emissive + + + material/shininess + + + material/color-mode + + + + + blend/active + + + blend/source + + + blend/destination + + + + shade-model + + + cull-face + + + rendering-hint + + + + texture[0]/active + + 0 + + texture[0]/image + + + texture[0]/filter + + + texture[0]/wrap-s + + + texture[0]/wrap-t + + + + modulate + + + + + + + als-lighting @@ -360,82 +439,4 @@ - - - true - - - material/active - - - material/ambient - - - material/diffuse - - - material/specular - - - material/emissive - - - material/shininess - - - material/color-mode - - - - - blend/active - - - blend/source - - - blend/destination - - - - shade-model - - - cull-face - - - rendering-hint - - - - texture[0]/active - - 0 - - texture[0]/image - - - texture[0]/filter - - - texture[0]/wrap-s - - - texture[0]/wrap-t - - - - modulate - - - - - diff --git a/Compositor/Effects/planet.eff b/Compositor/Effects/planet.eff index 0dbf670a8..c983ce20b 100644 --- a/Compositor/Effects/planet.eff +++ b/Compositor/Effects/planet.eff @@ -90,293 +90,7 @@ 15 6 - - - - - 2.0 - - - - GL_ARB_shader_objects - GL_ARB_shading_language_100 - GL_ARB_vertex_shader - GL_ARB_fragment_shader - - - - - true - - - material/active - - - material/ambient - - - material/diffuse - - - material/specular - - - material/emissive - - - material/shininess - - - material/color-mode - - - - transparent - - - false - - - shade-model - - - cull-face - - - rendering-hint - - - 0 - - texture[0]/type - - - texture[0]/image - - - texture[0]/filter - - - texture[0]/wrap-s - - - texture[0]/wrap-t - - - - 1 - - texture[1]/image - - - texture[1]/type - - - texture[1]/filter - - - texture[1]/wrap-s - - - texture[1]/wrap-t - - - texture[1]/internal-format - - - - 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 - - - - Shaders/ALS/planet.vert - Shaders/ALS/planet.frag - Shaders/ALS/noise.frag - Shaders/ALS/filters.frag - - tangent - 6 - - - normal - 15 - - - - texture - sampler-2d - 0 - - - shadowtex - sampler-2d - 1 - - - grain_texture - sampler-2d - 2 - - - colorMode - int - - material/color-mode-uniform - - - - visibility - float - - visibility - - - - air_pollution - float - - air_pollution - - - - sun_angle - float - - sun-angle - - - - use_clouds - bool - - use-clouds - - - - use_overlay - bool - - use-overlay-textures - - - - use_cloud_shadows - bool - - use-cloud-shadows - - - - 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 - - - - display_xsize - int - - display_xsize - - - - display_ysize - int - - display_ysize - - - - - + true @@ -454,7 +168,8 @@ --> - + + als-lighting @@ -755,4 +470,291 @@ + + als-lighting + + + + 2.0 + + + + GL_ARB_shader_objects + GL_ARB_shading_language_100 + GL_ARB_vertex_shader + GL_ARB_fragment_shader + + + + + true + + + material/active + + + material/ambient + + + material/diffuse + + + material/specular + + + material/emissive + + + material/shininess + + + material/color-mode + + + + transparent + + + false + + + shade-model + + + cull-face + + + rendering-hint + + + 0 + + texture[0]/type + + + texture[0]/image + + + texture[0]/filter + + + texture[0]/wrap-s + + + texture[0]/wrap-t + + + + 1 + + texture[1]/image + + + texture[1]/type + + + texture[1]/filter + + + texture[1]/wrap-s + + + texture[1]/wrap-t + + + texture[1]/internal-format + + + + 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 + + + + Shaders/ALS/planet.vert + Shaders/ALS/planet.frag + Shaders/ALS/noise.frag + Shaders/ALS/filters.frag + + tangent + 6 + + + normal + 15 + + + + texture + sampler-2d + 0 + + + shadowtex + sampler-2d + 1 + + + grain_texture + sampler-2d + 2 + + + colorMode + int + + material/color-mode-uniform + + + + visibility + float + + visibility + + + + air_pollution + float + + air_pollution + + + + sun_angle + float + + sun-angle + + + + use_clouds + bool + + use-clouds + + + + use_overlay + bool + + use-overlay-textures + + + + use_cloud_shadows + bool + + use-cloud-shadows + + + + 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 + + + + display_xsize + int + + display_xsize + + + + display_ysize + int + + display_ysize + + + + diff --git a/Compositor/Effects/space-combined.eff b/Compositor/Effects/space-combined.eff index bd3058a2f..39a7cde81 100644 --- a/Compositor/Effects/space-combined.eff +++ b/Compositor/Effects/space-combined.eff @@ -15,6 +15,7 @@ 0 + als-lighting Shaders/ALS/space-ultra.vert @@ -951,6 +952,7 @@ + als-lighting Shaders/ALS/space-base.vert diff --git a/Compositor/Effects/space.eff b/Compositor/Effects/space.eff index 82bc863ae..14130c699 100644 --- a/Compositor/Effects/space.eff +++ b/Compositor/Effects/space.eff @@ -3,7 +3,8 @@ Effects/space Effects/model-default - + + als-lighting Shaders/ALS/space-base.vert