Compare commits
No commits in common. "92a768d6f1f17a59b0de3d00ca8771876400dc91" and "49213a1cf0211c09f497ef108e50948102e3cc8a" have entirely different histories.
92a768d6f1
...
49213a1cf0
@ -71,7 +71,6 @@ QtObject {
|
||||
|
||||
property string _backgroundColor: "#000000"
|
||||
property string _fontColor: "#ff8100"
|
||||
property string _frameColor: "#ffffff"
|
||||
property string saturatedColor: Utils.mix(Utils.strToColor("#FFFFFF"),
|
||||
Utils.strToColor(_fontColor),
|
||||
saturationColor * 0.5)
|
||||
@ -82,7 +81,6 @@ QtObject {
|
||||
_backgroundColor),
|
||||
Utils.strToColor(saturatedColor),
|
||||
0.7 + (contrast * 0.3))
|
||||
property color frameColor: Utils.strToColor(_frameColor)
|
||||
|
||||
property real staticNoise: 0.12
|
||||
property real screenCurvature: 0.3
|
||||
@ -92,7 +90,6 @@ QtObject {
|
||||
|
||||
property real chromaColor: 0.25
|
||||
property real saturationColor: 0.25
|
||||
property real frameGloss: 0
|
||||
|
||||
property real jitter: 0.2
|
||||
|
||||
@ -254,13 +251,11 @@ QtObject {
|
||||
var settings = {
|
||||
"backgroundColor": _backgroundColor,
|
||||
"fontColor": _fontColor,
|
||||
"frameColor": _frameColor,
|
||||
"flickering": flickering,
|
||||
"horizontalSync": horizontalSync,
|
||||
"staticNoise": staticNoise,
|
||||
"chromaColor": chromaColor,
|
||||
"saturationColor": saturationColor,
|
||||
"frameGloss": frameGloss,
|
||||
"screenCurvature": screenCurvature,
|
||||
"glowingLine": glowingLine,
|
||||
"burnIn": burnIn,
|
||||
@ -350,7 +345,6 @@ QtObject {
|
||||
_backgroundColor = settings.backgroundColor
|
||||
!== undefined ? settings.backgroundColor : _backgroundColor
|
||||
_fontColor = settings.fontColor !== undefined ? settings.fontColor : _fontColor
|
||||
_frameColor = settings.frameColor !== undefined ? settings.frameColor : _frameColor
|
||||
|
||||
horizontalSync = settings.horizontalSync
|
||||
!== undefined ? settings.horizontalSync : horizontalSync
|
||||
@ -359,7 +353,6 @@ QtObject {
|
||||
chromaColor = settings.chromaColor !== undefined ? settings.chromaColor : chromaColor
|
||||
saturationColor = settings.saturationColor
|
||||
!== undefined ? settings.saturationColor : saturationColor
|
||||
frameGloss = settings.frameGloss !== undefined ? settings.frameGloss : frameGloss
|
||||
screenCurvature = settings.screenCurvature
|
||||
!== undefined ? settings.screenCurvature : screenCurvature
|
||||
glowingLine = settings.glowingLine !== undefined ? settings.glowingLine : glowingLine
|
||||
@ -466,8 +459,6 @@ QtObject {
|
||||
"rbgShift": 0,
|
||||
"saturationColor": 0.2483,
|
||||
"screenCurvature": 0.3,
|
||||
"frameColor": "#ffffff",
|
||||
"frameGloss": 0,
|
||||
"staticNoise": 0.1198,
|
||||
"windowOpacity": 1,
|
||||
"margin": 0.5,
|
||||
@ -497,8 +488,6 @@ QtObject {
|
||||
"rbgShift": 0,
|
||||
"saturationColor": 0.0,
|
||||
"screenCurvature": 0.3,
|
||||
"frameColor": "#ffffff",
|
||||
"frameGloss": 0,
|
||||
"staticNoise": 0.1198,
|
||||
"windowOpacity": 1,
|
||||
"margin": 0.5,
|
||||
@ -528,8 +517,6 @@ QtObject {
|
||||
"rbgShift": 0,
|
||||
"saturationColor": 0.5,
|
||||
"screenCurvature": 0.3,
|
||||
"frameColor": "#ffffff",
|
||||
"frameGloss": 0,
|
||||
"staticNoise": 0.15,
|
||||
"windowOpacity": 1,
|
||||
"margin": 0.5,
|
||||
@ -559,8 +546,6 @@ QtObject {
|
||||
"rbgShift": 0,
|
||||
"saturationColor": 0,
|
||||
"screenCurvature": 0,
|
||||
"frameColor": "#ffffff",
|
||||
"frameGloss": 0,
|
||||
"staticNoise": 0.15,
|
||||
"windowOpacity": 1,
|
||||
"margin": 0.5,
|
||||
@ -590,8 +575,6 @@ QtObject {
|
||||
"rbgShift": 0,
|
||||
"saturationColor": 0,
|
||||
"screenCurvature": 0.5,
|
||||
"frameColor": "#ffffff",
|
||||
"frameGloss": 0,
|
||||
"staticNoise": 0.099,
|
||||
"windowOpacity": 1,
|
||||
"margin": 0.5,
|
||||
@ -621,8 +604,6 @@ QtObject {
|
||||
"rbgShift": 0.2969,
|
||||
"saturationColor": 0,
|
||||
"screenCurvature": 0.5,
|
||||
"frameColor": "#ffffff",
|
||||
"frameGloss": 0,
|
||||
"staticNoise": 0.2969,
|
||||
"windowOpacity": 1,
|
||||
"margin": 0.5,
|
||||
@ -652,8 +633,6 @@ QtObject {
|
||||
"rbgShift": 0.3524,
|
||||
"saturationColor": 0,
|
||||
"screenCurvature": 0.4,
|
||||
"frameColor": "#ffffff",
|
||||
"frameGloss": 0,
|
||||
"staticNoise": 0.0503,
|
||||
"windowOpacity": 1,
|
||||
"margin": 0.5,
|
||||
@ -683,8 +662,6 @@ QtObject {
|
||||
"rbgShift": 0,
|
||||
"saturationColor": 0,
|
||||
"screenCurvature": 0.2,
|
||||
"frameColor": "#ffffff",
|
||||
"frameGloss": 0,
|
||||
"staticNoise": 0,
|
||||
"windowOpacity": 1,
|
||||
"margin": 0.5,
|
||||
@ -714,8 +691,6 @@ QtObject {
|
||||
"rbgShift": 0,
|
||||
"saturationColor": 0.4983,
|
||||
"screenCurvature": 0,
|
||||
"frameColor": "#ffffff",
|
||||
"frameGloss": 0,
|
||||
"staticNoise": 0.0955,
|
||||
"windowOpacity": 0.7,
|
||||
"margin": 0.1,
|
||||
|
||||
@ -149,11 +149,6 @@ ColumnLayout {
|
||||
value: appSettings.saturationColor
|
||||
enabled: appSettings.chromaColor !== 0
|
||||
}
|
||||
CheckableSlider {
|
||||
name: qsTr("Frame Gloss")
|
||||
onNewValue: appSettings.frameGloss = newValue
|
||||
value: appSettings.frameGloss
|
||||
}
|
||||
}
|
||||
RowLayout {
|
||||
Layout.fillWidth: true
|
||||
@ -171,13 +166,6 @@ ColumnLayout {
|
||||
onColorSelected: appSettings._backgroundColor = color
|
||||
color: appSettings._backgroundColor
|
||||
}
|
||||
ColorButton {
|
||||
name: qsTr("Frame")
|
||||
height: 50
|
||||
Layout.fillWidth: true
|
||||
onColorSelected: appSettings._frameColor = color
|
||||
color: appSettings._frameColor
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -37,8 +37,6 @@ Item {
|
||||
|
||||
property real ambientLight: appSettings.ambientLight * 0.2
|
||||
|
||||
property real frameGloss: appSettings.frameGloss
|
||||
|
||||
property size virtualResolution
|
||||
property size screenResolution
|
||||
|
||||
@ -61,7 +59,6 @@ Item {
|
||||
property real screenCurvature: parent.screenCurvature
|
||||
property real chromaColor: parent.chromaColor
|
||||
property real ambientLight: parent.ambientLight
|
||||
property real frameGloss: parent.frameGloss
|
||||
|
||||
property real flickering: appSettings.flickering
|
||||
property real horizontalSync: appSettings.horizontalSync
|
||||
@ -175,7 +172,6 @@ Item {
|
||||
uniform highp vec4 fontColor;
|
||||
uniform highp vec4 backgroundColor;
|
||||
uniform lowp float shadowLength;
|
||||
uniform lowp float frameGloss;
|
||||
|
||||
uniform highp vec2 virtualResolution;
|
||||
uniform lowp float rasterizationIntensity;\n" +
|
||||
@ -325,7 +321,7 @@ Item {
|
||||
|
||||
(displayTerminalFrame ?
|
||||
"vec4 frameColor = texture2D(frameSource, qt_TexCoord0);
|
||||
finalColor = mix(finalColor, frameColor.rgb + (finalColor*frameGloss), frameColor.a);"
|
||||
finalColor = mix(finalColor, frameColor.rgb, frameColor.a);"
|
||||
: "") +
|
||||
|
||||
"gl_FragColor = vec4(finalColor, qt_Opacity);" +
|
||||
|
||||
@ -22,13 +22,13 @@ import QtQuick 2.0
|
||||
import "utils.js" as Utils
|
||||
|
||||
ShaderEffect {
|
||||
property color _frameColor: appSettings.frameColor
|
||||
property color _staticFrameColor: "#fff"
|
||||
property color _backgroundColor: appSettings.backgroundColor
|
||||
property color _fontColor: appSettings.fontColor
|
||||
property color _lightColor: Utils.mix(_fontColor, _backgroundColor, 0.2)
|
||||
property real _ambientLight: Utils.lint(0.2, 0.8, appSettings.ambientLight)
|
||||
|
||||
property color frameColor: Utils.mix(_frameColor, _lightColor, _ambientLight)
|
||||
property color frameColor: Utils.mix(_staticFrameColor, _lightColor, _ambientLight)
|
||||
property real screenCurvature: appSettings.screenCurvature * appSettings.screenCurvatureSize
|
||||
|
||||
// Coefficient of the log curve used to approximate shadowing
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user