Merge PR #5370 (soloturn-remove-clamp-lighting) into merge-train

Author: soloturn

engine/src/main/java/org/terasology/engine/config/RenderingConfig.java

@@ -61,7 +61,6 @@ public class RenderingConfig extends AbstractSubscribable {
     public static final String FRAME_LIMIT = "FrameLimit";
     public static final String FBO_SCALE = "FboScale";
     public static final String UI_SCALE = "UiScale";
-    public static final String CLAMP_LIGHTING = "ClampLighting";
     public static final String SCREENSHOT_SIZE = "screenshotSize";
     public static final String SCREENSHOT_FORMAT = "ScreenshotFormat";
     public static final String DUMP_SHADERS = "DumpShaders";
@@ -110,7 +109,6 @@ public class RenderingConfig extends AbstractSubscribable {
     private boolean inscattering;
     private boolean localReflections;
     private boolean vSync;
-    private boolean clampLighting;
     private int fboScale;
     private int uiScale = 100;
     private boolean dumpShaders;
@@ -630,16 +628,6 @@ public void setUiScale(int uiScale) {
         propertyChangeSupport.firePropertyChange(UI_SCALE, oldScale, this.uiScale);
     }
 
-    public boolean isClampLighting() {
-        return clampLighting;
-    }
-
-    public void setClampLighting(boolean clampLighting) {
-        boolean oldValue = this.clampLighting;
-        this.clampLighting = clampLighting;
-        propertyChangeSupport.firePropertyChange(CLAMP_LIGHTING, oldValue, this.clampLighting);
-    }
-
     public ScreenshotSize getScreenshotSize() {
         return screenshotSize;
     }

engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/VideoSettingsScreen.java

@@ -332,7 +332,6 @@ public void set(Resolution value) {
         WidgetUtil.tryBindCheckbox(this, "vsync", BindHelper.bindBeanProperty("vSync", config.getRendering(), Boolean.TYPE));
         WidgetUtil.tryBindCheckbox(this, "eyeAdaptation", BindHelper.bindBeanProperty("eyeAdaptation", config.getRendering(), Boolean.TYPE));
         WidgetUtil.tryBindCheckbox(this, "ssao", BindHelper.bindBeanProperty("ssao", config.getRendering(), Boolean.TYPE));
-        WidgetUtil.tryBindCheckbox(this, "clampLighting", BindHelper.bindBeanProperty("clampLighting", config.getRendering(), Boolean.TYPE));
         WidgetUtil.tryBindCheckbox(this, "bloom", BindHelper.bindBeanProperty("bloom", config.getRendering(), Boolean.TYPE));
         WidgetUtil.tryBindCheckbox(this, "lightShafts", BindHelper.bindBeanProperty("lightShafts", config.getRendering(), Boolean.TYPE));
         WidgetUtil.tryBindCheckbox(this, "vignette", BindHelper.bindBeanProperty("vignette", config.getRendering(), Boolean.TYPE));

engine/src/main/java/org/terasology/engine/rendering/opengl/GLSLShader.java

@@ -237,10 +237,6 @@ private StringBuilder createShaderBuilder() {
         if (renderConfig.isInscattering()) {
             builder.append("#define INSCATTERING \n");
         }
-        // TODO A 3D wizard should take a look at this. Configurable for the moment to make better comparisons possible.
-        if (renderConfig.isClampLighting()) {
-            builder.append("#define CLAMP_LIGHTING \n");
-        }
 
         for (ChunkVertexFlag vertexFlag : ChunkVertexFlag.values()) {
             builder.append("#define ").append(vertexFlag.getDefineName()).append(" int(").append(vertexFlag.getValue()).append(") \n");

engine/src/main/resources/default.cfg

@@ -43,7 +43,6 @@
     "inscattering": true,
     "localReflections": false,
     "vSync": false,
-    "clampLighting": false,
     "fboScale": 100,
     "dumpShaders": false,
     "screenshotSize": "${engine:menu#screenshot-size-normal}",

engine/src/main/resources/org/terasology/engine/assets/i18n/menu_en.lang

@@ -88,7 +88,6 @@
     "change-keybind-popup-message": "is already bound to an action. Rebind anyway?",
     "change-keybind-popup-title": "Key already bound",
     "chunk-lods": "Chunk LODs",
-    "clamp-lighting": "Clamp Lighting",
     "cloud-shadows": "Cloud Shadows",
     "config": "Configure",
     "connecting-to": "Connecting to",

engine/src/main/resources/org/terasology/engine/assets/ui/menu/videoMenuScreen.ui

@@ -377,14 +377,6 @@
                                     "type": "UICheckbox",
                                     "id": "ssao"
                                 },
-                                {
-                                    "type": "UILabel",
-                                    "text": "${engine:menu#clamp-lighting}: "
-                                },
-                                {
-                                    "type": "UICheckbox",
-                                    "id": "clampLighting"
-                                },
                                 {
                                     "type": "UILabel",
                                     "text": "${engine:menu#bloom-effect}: "