Merge #1221 from @shartte - resolution scaling, fixes #1172

MovingBlocks · Sep 27, 2014 · a4544d1 · a4544d1
2 parents 22cbebc + eace9c3
commit a4544d1
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 5 deletions.
diff --git a/engine/src/main/java/org/terasology/config/RenderingConfig.java b/engine/src/main/java/org/terasology/config/RenderingConfig.java
@@ -69,6 +69,7 @@ public class RenderingConfig {
     private boolean inscattering = true;
     private boolean localReflections;
     private boolean vSync;
+    private int fboScale = 100;
     private PerspectiveCameraSettings cameraSettings = new PerspectiveCameraSettings(CameraSetting.NORMAL);
 
     private RenderingDebugConfig debug = new RenderingDebugConfig();
@@ -411,6 +412,14 @@ public void setFrameLimit(int frameLimit) {
         this.frameLimit = frameLimit;
     }
 
+    public int getFboScale() {
+        return fboScale;
+    }
+
+    public void setFboScale(int fboScale) {
+        this.fboScale = fboScale;
+    }
+
     @Override
     public String toString() {
         return Config.createGson().toJsonTree(this).toString();

diff --git a/.../java/org/terasology/rendering/nui/layers/mainMenu/videoSettings/VideoSettingsScreen.java b/.../java/org/terasology/rendering/nui/layers/mainMenu/videoSettings/VideoSettingsScreen.java
@@ -155,6 +155,31 @@ public void set(Float value) {
             });
         }
 
+        final UISlider fboScaleSlider = find("fboScale", UISlider.class);
+        if (fboScaleSlider != null) {
+            fboScaleSlider.setIncrement(5.0f);
+            fboScaleSlider.setPrecision(0);
+            fboScaleSlider.setMinimum(25);
+            fboScaleSlider.setRange(200);
+            fboScaleSlider.setLabelFunction(new Function<Float, String>() {
+                @Override
+                public String apply(Float input) {
+                return String.valueOf(input.intValue()) + "%";
+                }
+            });
+            fboScaleSlider.bindValue(new Binding<Float>() {
+                @Override
+                public Float get() {
+                    return (float) config.getRendering().getFboScale();
+                }
+
+                @Override
+                public void set(Float value) {
+                    config.getRendering().setFboScale(value.intValue());
+                }
+            });
+        }
+
         UIDropdown<CameraSetting> cameraSetting = find("camera", UIDropdown.class);
         if (cameraSetting != null) {
             cameraSetting.setOptions(Arrays.asList(CameraSetting.values()));

diff --git a/engine/src/main/java/org/terasology/rendering/opengl/DefaultRenderingProcess.java b/engine/src/main/java/org/terasology/rendering/opengl/DefaultRenderingProcess.java
@@ -30,6 +30,7 @@
 import org.slf4j.LoggerFactory;
 import org.terasology.asset.Assets;
 import org.terasology.config.Config;
+import org.terasology.config.RenderingConfig;
 import org.terasology.editor.EditorRange;
 import org.terasology.monitoring.PerformanceMonitor;
 import org.terasology.registry.CoreRegistry;
@@ -263,7 +264,12 @@ private void createOrUpdateFullscreenFbos() {
             rtFullHeight = org.lwjgl.opengl.Display.getHeight();
         }
 
-        if (CoreRegistry.get(Config.class).getRendering().isOculusVrSupport()) {
+        RenderingConfig renderingConfig = CoreRegistry.get(Config.class).getRendering();
+
+        rtFullWidth *= renderingConfig.getFboScale() / 100f;
+        rtFullHeight *= renderingConfig.getFboScale() / 100f;
+
+        if (renderingConfig.isOculusVrSupport()) {
             if (overwriteRtWidth == 0) {
                 rtFullWidth *= OculusVrHelper.getScaleFactor();
             }

diff --git a/engine/src/main/resources/assets/ui/menu/videoMenuScreen.ui b/engine/src/main/resources/assets/ui/menu/videoMenuScreen.ui
@@ -213,12 +213,12 @@
                                 "id": "frameLimit"
                             },
                             {
-                                "type": "UISpace",
-                                "size": [1, 13]
+                                "type": "UILabel",
+                                "text": "Render Quality: "
                             },
                             {
-                                "type": "UISpace",
-                                "size": [1, 13]
+                                "type": "UISlider",
+                                "id": "fboScale"
                             },
                             {
                                 "type": "UISpace",