Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merging and adding Olivier's fixes to taa

Browse source
This commit is contained in:
samcake 2017-12-07 17:54:58 -08:00
parent e0110ff7e6
commit 1c3b4b0c9b
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/render-utils/src/taa.slh
View file

@ -317,7 +317,7 @@ mat3 taa_evalNeighbourColorVariance(vec3 sourceColor, vec2 fragUV, vec2 fragVelo
vec3 mu = sumSamples / vec3(9.0); 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; float gamma = params.covarianceGamma;
vec3 cmin = mu - gamma * sigma; vec3 cmin = mu - gamma * sigma;

2
scripts/developer/utilities/render/antialiasing.js
View file

@ -13,7 +13,7 @@
(function() { (function() {
var TABLET_BUTTON_NAME = "TAA"; var TABLET_BUTTON_NAME = "TAA";
var QMLAPP_URL = Script.resolvePath("./Antialiasing.qml"); var QMLAPP_URL = Script.resolvePath("./antialiasing.qml");
var onLuciScreen = false; var onLuciScreen = false;

14
scripts/developer/utilities/render/antialiasing.qml
View file

@ -12,8 +12,8 @@ import QtQuick 2.7
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../lib/styles-uit" import "qrc:///qml/styles-uit"
import "../lib/controls-uit" as HifiControls import "qrc:///qml/controls-uit" as HifiControls
import "configSlider" import "configSlider"
@ -129,7 +129,7 @@ Rectangle {
} }
} }
} }
HifiControls.ConfigSlider { ConfigSlider {
label: qsTr("Covariance gamma") label: qsTr("Covariance gamma")
integral: false integral: false
config: Render.getConfig("RenderMainView.Antialiasing") config: Render.getConfig("RenderMainView.Antialiasing")
@ -145,7 +145,7 @@ Rectangle {
onCheckedChanged: { Render.getConfig("RenderMainView.Antialiasing")["feedbackColor"] = checked } onCheckedChanged: { Render.getConfig("RenderMainView.Antialiasing")["feedbackColor"] = checked }
} }
HifiControls.ConfigSlider { ConfigSlider {
label: qsTr("Source blend") label: qsTr("Source blend")
integral: false integral: false
config: Render.getConfig("RenderMainView.Antialiasing") config: Render.getConfig("RenderMainView.Antialiasing")
@ -172,7 +172,7 @@ Rectangle {
onCheckedChanged: { Render.getConfig("RenderMainView.Antialiasing")["showCursorPixel"] = checked } onCheckedChanged: { Render.getConfig("RenderMainView.Antialiasing")["showCursorPixel"] = checked }
} }
} }
HifiControls.ConfigSlider { ConfigSlider {
label: qsTr("Debug Region <") label: qsTr("Debug Region <")
integral: false integral: false
config: Render.getConfig("RenderMainView.Antialiasing") config: Render.getConfig("RenderMainView.Antialiasing")
@ -186,7 +186,7 @@ Rectangle {
checked: Render.getConfig("RenderMainView.Antialiasing")["showClosestFragment"] checked: Render.getConfig("RenderMainView.Antialiasing")["showClosestFragment"]
onCheckedChanged: { Render.getConfig("RenderMainView.Antialiasing")["showClosestFragment"] = checked } onCheckedChanged: { Render.getConfig("RenderMainView.Antialiasing")["showClosestFragment"] = checked }
} }
HifiControls.ConfigSlider { ConfigSlider {
label: qsTr("Debug Velocity Threshold [pix]") label: qsTr("Debug Velocity Threshold [pix]")
integral: false integral: false
config: Render.getConfig("RenderMainView.Antialiasing") config: Render.getConfig("RenderMainView.Antialiasing")
@ -194,7 +194,7 @@ Rectangle {
max: 50 max: 50
min: 0.0 min: 0.0
} }
HifiControls.ConfigSlider { ConfigSlider {
label: qsTr("Debug Orb Zoom") label: qsTr("Debug Orb Zoom")
integral: false integral: false
config: Render.getConfig("RenderMainView.Antialiasing") config: Render.getConfig("RenderMainView.Antialiasing")