From 44a63d4aaa59f8b16166b5e49c59734be4eb5fdc Mon Sep 17 00:00:00 2001
From: Filippo Scognamiglio <flscogna@gmail.com>
Date: Mon, 3 Dec 2018 17:12:41 +0100
Subject: [PATCH] Change default curvature values.

---
 app/qml/ApplicationSettings.qml | 20 ++++++++++----------
 app/qml/ShaderTerminal.qml      |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/qml/ApplicationSettings.qml b/app/qml/ApplicationSettings.qml
index 1a0e1da..f286184 100644
--- a/app/qml/ApplicationSettings.qml
+++ b/app/qml/ApplicationSettings.qml
@@ -73,7 +73,7 @@ QtObject{
     property color backgroundColor: Utils.mix(Utils.strToColor(_backgroundColor), Utils.strToColor(saturatedColor), 0.7 + (contrast * 0.3))
 
     property real staticNoise: 0.12
-    property real screenCurvature: 0.2
+    property real screenCurvature: 0.3
     property real glowingLine: 0.2
     property real burnIn: 0.25
     property real bloom: 0.55
@@ -384,7 +384,7 @@ QtObject{
                   "rasterization": 0,
                   "rbgShift": 0,
                   "saturationColor": 0.2483,
-                  "screenCurvature": 0.1997,
+                  "screenCurvature": 0.3,
                   "staticNoise": 0.1198,
                   "windowOpacity": 1
                 }'
@@ -411,7 +411,7 @@ QtObject{
                   "rasterization": 0,
                   "rbgShift": 0,
                   "saturationColor": 0.0,
-                  "screenCurvature": 0.1997,
+                  "screenCurvature": 0.3,
                   "staticNoise": 0.1198,
                   "windowOpacity": 1
                 }'
@@ -438,7 +438,7 @@ QtObject{
                   "rasterization": 1,
                   "rbgShift": 0,
                   "saturationColor": 0.5,
-                  "screenCurvature": 0.2,
+                  "screenCurvature": 0.3,
                   "staticNoise": 0.15,
                   "windowOpacity": 1
                 }'
@@ -466,7 +466,7 @@ QtObject{
                   "rbgShift": 0,
                   "saturationColor": 0,
                   "screenCurvature": 0,
-                  "staticNoise": 0.1545,
+                  "staticNoise": 0.15,
                   "windowOpacity": 1
                 }'
             builtin: true
@@ -492,7 +492,7 @@ QtObject{
                   "rasterization": 1,
                   "rbgShift": 0,
                   "saturationColor": 0,
-                  "screenCurvature": 0.8976,
+                  "screenCurvature": 0.5,
                   "staticNoise": 0.099,
                   "windowOpacity": 1
                 }'
@@ -519,7 +519,7 @@ QtObject{
                   "rasterization": 1,
                   "rbgShift": 0.2969,
                   "saturationColor": 0,
-                  "screenCurvature": 0.3003,
+                  "screenCurvature": 0.5,
                   "staticNoise": 0.2969,
                   "windowOpacity": 1
                 }'
@@ -546,7 +546,7 @@ QtObject{
                   "rasterization": 0,
                   "rbgShift": 0.3524,
                   "saturationColor": 0,
-                  "screenCurvature": 0.401,
+                  "screenCurvature": 0.4,
                   "staticNoise": 0.0503,
                   "windowOpacity": 1
                 }'
@@ -573,7 +573,7 @@ QtObject{
                   "rasterization": 0,
                   "rbgShift": 0,
                   "saturationColor": 0,
-                  "screenCurvature": 0.1997,
+                  "screenCurvature": 0.2,
                   "staticNoise": 0,
                   "windowOpacity": 1
                 }'
@@ -600,7 +600,7 @@ QtObject{
                   "rasterization": 0,
                   "rbgShift": 0,
                   "saturationColor": 0.4983,
-                  "screenCurvature": 0.05,
+                  "screenCurvature": 0,
                   "staticNoise": 0.0955,
                   "windowOpacity": 0.7
                 }'
diff --git a/app/qml/ShaderTerminal.qml b/app/qml/ShaderTerminal.qml
index 1d93f59..ff1547a 100644
--- a/app/qml/ShaderTerminal.qml
+++ b/app/qml/ShaderTerminal.qml
@@ -123,7 +123,7 @@ Item {
                  qt_TexCoord0 = qt_MultiTexCoord0;
                  vec2 coords = vec2(fract(time/(1024.0*2.0)), fract(time/(1024.0*1024.0)));" +
 
-                 (!fallBack && (flickering !== 0.0 || horizontalSync !== 0.0 || rbgShift !== 0) ?
+                 (!fallBack && (flickering !== 0.0 || horizontalSync !== 0.0) ?
                      "vec4 initialNoiseTexel = texture2D(noiseSource, coords);"
                  : "") +
 
@@ -162,7 +162,7 @@ Item {
                  uniform highp float burnInTime;" : "") +
              (staticNoise !== 0 ? "
                  uniform highp float staticNoise;" : "") +
-             (((staticNoise !== 0 || jitter !== 0 || rbgShift)
+             (((staticNoise !== 0 || jitter !== 0)
                ||(fallBack && (flickering || horizontalSync))) ? "
                  uniform lowp sampler2D noiseSource;
                  uniform highp vec2 scaleNoiseSize;" : "") +
@@ -230,7 +230,7 @@ Item {
                  "float distance = length(cc);" +
 
                  //FallBack if there are problems
-                 (fallBack && (flickering !== 0.0 || horizontalSync !== 0.0 || rbgShift !== 0.0) ?
+                 (fallBack && (flickering !== 0.0 || horizontalSync !== 0.0) ?
                      "vec2 initialCoords = vec2(fract(time/(1024.0*2.0)), fract(time/(1024.0*1024.0)));
                       vec4 initialNoiseTexel = texture2D(noiseSource, initialCoords);"
                  : "") +
@@ -265,7 +265,7 @@ Item {
 
                  : "") +
 
-                 (jitter !== 0 || staticNoise !== 0 || rbgShift !== 0 ?
+                 (jitter !== 0 || staticNoise !== 0 ?
                      "vec4 noiseTexel = texture2D(noiseSource, scaleNoiseSize * coords + vec2(fract(time / 51.0), fract(time / 237.0)));"
                  : "") +