Compare commits

..

1 Commits

Author SHA1 Message Date
rilysh
12fa3bdd83 use newline char instead flushing 2023-07-11 11:26:57 -04:00
4 changed files with 10 additions and 9 deletions

View File

@ -16,7 +16,7 @@ macx:ICON = icons/crt.icns
RESOURCES += qml/resources.qrc RESOURCES += qml/resources.qrc
######################################### #########################################
## INSTALLS ## INTALLS
######################################### #########################################
target.path += /usr/bin/ target.path += /usr/bin/

View File

@ -32,7 +32,7 @@ QtObject {
readonly property real maximumFontScaling: 2.50 readonly property real maximumFontScaling: 2.50
readonly property real minBurnInFadeTime: 160 readonly property real minBurnInFadeTime: 160
readonly property real maxBurnInFadeTime: 160000 readonly property real maxBurnInFadeTime: 1600
property bool isMacOS: Qt.platform.os === "osx" property bool isMacOS: Qt.platform.os === "osx"
@ -613,7 +613,7 @@ QtObject {
builtin: true builtin: true
} }
ListElement { ListElement {
text: "IBM DOS" text: "IBM Dos"
obj_string: '{ obj_string: '{
"ambientLight": 0.151, "ambientLight": 0.151,
"backgroundColor": "#000000", "backgroundColor": "#000000",

View File

@ -29,8 +29,8 @@ Loader {
property real lastUpdate: 0 property real lastUpdate: 0
property real prevLastUpdate: 0 property real prevLastUpdate: 0
property real burnIn: appSettings.burnIn; property real burnIn: appSettings.burnIn
property real burnInFadeTime: (1 / Utils.lint(_minBurnInFadeTime, _maxBurnInFadeTime, burnIn))*64 property real burnInFadeTime: 1 / Utils.lint(_minBurnInFadeTime, _maxBurnInFadeTime, burnIn)
property real _minBurnInFadeTime: appSettings.minBurnInFadeTime property real _minBurnInFadeTime: appSettings.minBurnInFadeTime
property real _maxBurnInFadeTime: appSettings.maxBurnInFadeTime property real _maxBurnInFadeTime: appSettings.maxBurnInFadeTime
@ -146,8 +146,9 @@ Loader {
float prevMask = accColor.a; float prevMask = accColor.a;
float currMask = rgb2grey(txtColor); float currMask = rgb2grey(txtColor);
highp float blurDecay = clamp(pow(0.5, burnInTime * (lastUpdate - prevLastUpdate)), 0.0, 1.0); highp float blurDecay = clamp((lastUpdate - prevLastUpdate) * burnInTime, 0.0, 1.0);
vec3 blurColor = accColor.rgb * vec3(blurDecay); blurDecay = max(0.0, blurDecay - prevMask);
vec3 blurColor = accColor.rgb - vec3(blurDecay);
vec3 color = max(blurColor, txtColor); vec3 color = max(blurColor, txtColor);
gl_FragColor = vec4(color, currMask); gl_FragColor = vec4(color, currMask);

View File

@ -302,8 +302,8 @@ Item {
(burnIn !== 0 ? " (burnIn !== 0 ? "
vec4 txt_blur = texture2D(burnInSource, staticCoords); vec4 txt_blur = texture2D(burnInSource, staticCoords);
float blurDecay = clamp(pow(0.5, burnInTime * (time - burnInLastUpdate)), 0.0, 1.0); float blurDecay = clamp((time - burnInLastUpdate) * burnInTime, 0.0, 1.0);
vec3 burnInColor = txt_blur.rgb * vec3(blurDecay); vec3 burnInColor = 0.65 * (txt_blur.rgb - vec3(blurDecay));
txt_color = max(txt_color, convertWithChroma(burnInColor));" txt_color = max(txt_color, convertWithChroma(burnInColor));"
: "") + : "") +