From 1c3b4b0c9b791bbd153cb49126a73aff0fd75602 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Thu, 7 Dec 2017 17:54:58 -0800
Subject: [PATCH] Merging and adding Olivier's fixes to taa

---
 libraries/render-utils/src/taa.slh                 |  2 +-
 scripts/developer/utilities/render/antialiasing.js |  2 +-
 .../developer/utilities/render/antialiasing.qml    | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libraries/render-utils/src/taa.slh b/libraries/render-utils/src/taa.slh
index 4e5f0e76ba..83f4d8a893 100644
--- a/libraries/render-utils/src/taa.slh
+++ b/libraries/render-utils/src/taa.slh
@@ -317,7 +317,7 @@ mat3 taa_evalNeighbourColorVariance(vec3 sourceColor, vec2 fragUV, vec2 fragVelo
 
     
     vec3 mu = sumSamples / vec3(9.0);
-    vec3 sigma = sqrt(sumSamples2 / vec3(9.0) - mu * mu);
+    vec3 sigma = sqrt(max(sumSamples2 / vec3(9.0) - mu * mu, vec3(0.0)));
     
        float gamma = params.covarianceGamma;
        vec3 cmin = mu - gamma * sigma;
diff --git a/scripts/developer/utilities/render/antialiasing.js b/scripts/developer/utilities/render/antialiasing.js
index b6c146caac..e915d75e93 100644
--- a/scripts/developer/utilities/render/antialiasing.js
+++ b/scripts/developer/utilities/render/antialiasing.js
@@ -13,7 +13,7 @@
 
 (function() {
     var TABLET_BUTTON_NAME = "TAA";
-    var QMLAPP_URL = Script.resolvePath("./Antialiasing.qml");
+    var QMLAPP_URL = Script.resolvePath("./antialiasing.qml");
 
    
     var onLuciScreen = false;
diff --git a/scripts/developer/utilities/render/antialiasing.qml b/scripts/developer/utilities/render/antialiasing.qml
index 1c58cf8437..e88be0f9bf 100644
--- a/scripts/developer/utilities/render/antialiasing.qml
+++ b/scripts/developer/utilities/render/antialiasing.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 
-import "../lib/styles-uit"
-import "../lib/controls-uit" as HifiControls
+import "qrc:///qml/styles-uit"
+import "qrc:///qml/controls-uit" as HifiControls
 
     
 import "configSlider"
@@ -129,7 +129,7 @@ Rectangle {
                         }
                     }
                 }  
-                HifiControls.ConfigSlider {
+                ConfigSlider {
                     label: qsTr("Covariance gamma")
                     integral: false
                     config: Render.getConfig("RenderMainView.Antialiasing")
@@ -145,7 +145,7 @@ Rectangle {
                     onCheckedChanged: { Render.getConfig("RenderMainView.Antialiasing")["feedbackColor"] = checked }
                 }
         
-                HifiControls.ConfigSlider {
+                ConfigSlider {
                     label: qsTr("Source blend")
                     integral: false
                     config: Render.getConfig("RenderMainView.Antialiasing")
@@ -172,7 +172,7 @@ Rectangle {
                     onCheckedChanged: { Render.getConfig("RenderMainView.Antialiasing")["showCursorPixel"] = checked }
                 }
             }
-            HifiControls.ConfigSlider {
+            ConfigSlider {
                 label: qsTr("Debug Region <")
                 integral: false
                 config: Render.getConfig("RenderMainView.Antialiasing")
@@ -186,7 +186,7 @@ Rectangle {
                 checked: Render.getConfig("RenderMainView.Antialiasing")["showClosestFragment"]
                 onCheckedChanged: { Render.getConfig("RenderMainView.Antialiasing")["showClosestFragment"] = checked }
             }           
-            HifiControls.ConfigSlider {
+            ConfigSlider {
                 label: qsTr("Debug Velocity Threshold [pix]")
                 integral: false
                 config: Render.getConfig("RenderMainView.Antialiasing")
@@ -194,7 +194,7 @@ Rectangle {
                 max: 50
                 min: 0.0
             }
-            HifiControls.ConfigSlider {
+            ConfigSlider {
                 label: qsTr("Debug Orb Zoom")
                 integral: false
                 config: Render.getConfig("RenderMainView.Antialiasing")