Compare commits
4 Commits
master
...
99a559fb04
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
99a559fb04 | ||
|
|
2bd9e0f59e | ||
|
|
6754a0b949 | ||
|
|
26a4f33dc5 |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -48,6 +48,3 @@ cool-retro-term
|
|||||||
|
|
||||||
.DS_Store
|
.DS_Store
|
||||||
*.app
|
*.app
|
||||||
|
|
||||||
# IntelliJ
|
|
||||||
.idea
|
|
||||||
|
|||||||
@@ -58,7 +58,6 @@ int main(int argc, char *argv[])
|
|||||||
cout << " -p|--profile <prof> Run cool-retro-term with the given profile." << '\n';
|
cout << " -p|--profile <prof> Run cool-retro-term with the given profile." << '\n';
|
||||||
cout << " -h|--help Print this help." << '\n';
|
cout << " -h|--help Print this help." << '\n';
|
||||||
cout << " --verbose Print additional information such as profiles and settings." << '\n';
|
cout << " --verbose Print additional information such as profiles and settings." << '\n';
|
||||||
cout << " -v|--version Print the program name and version." << '\n';
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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: 1600
|
readonly property real maxBurnInFadeTime: 160000
|
||||||
|
|
||||||
property bool isMacOS: Qt.platform.os === "osx"
|
property bool isMacOS: Qt.platform.os === "osx"
|
||||||
|
|
||||||
|
|||||||
@@ -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)
|
property real burnInFadeTime: (1 / Utils.lint(_minBurnInFadeTime, _maxBurnInFadeTime, burnIn))*64
|
||||||
property real _minBurnInFadeTime: appSettings.minBurnInFadeTime
|
property real _minBurnInFadeTime: appSettings.minBurnInFadeTime
|
||||||
property real _maxBurnInFadeTime: appSettings.maxBurnInFadeTime
|
property real _maxBurnInFadeTime: appSettings.maxBurnInFadeTime
|
||||||
|
|
||||||
@@ -146,9 +146,8 @@ Loader {
|
|||||||
float prevMask = accColor.a;
|
float prevMask = accColor.a;
|
||||||
float currMask = rgb2grey(txtColor);
|
float currMask = rgb2grey(txtColor);
|
||||||
|
|
||||||
highp float blurDecay = clamp((lastUpdate - prevLastUpdate) * burnInTime, 0.0, 1.0);
|
highp float blurDecay = clamp(pow(0.5, burnInTime * (lastUpdate - prevLastUpdate)), 0.0, 1.0);
|
||||||
blurDecay = max(0.0, blurDecay - prevMask);
|
vec3 blurColor = accColor.rgb * vec3(blurDecay);
|
||||||
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);
|
||||||
|
|||||||
@@ -58,13 +58,6 @@ Item{
|
|||||||
kterminal.pasteClipboard()
|
kterminal.pasteClipboard()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Connections {
|
|
||||||
target: pasteActionAlt
|
|
||||||
|
|
||||||
onTriggered: {
|
|
||||||
kterminal.pasteSelection()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//When settings are updated sources need to be redrawn.
|
//When settings are updated sources need to be redrawn.
|
||||||
Connections {
|
Connections {
|
||||||
|
|||||||
@@ -247,17 +247,6 @@ Item {
|
|||||||
" return outColor;
|
" return outColor;
|
||||||
}" +
|
}" +
|
||||||
|
|
||||||
//pseudo-random vector
|
|
||||||
//https://stackoverflow.com/a/10625698
|
|
||||||
"float random( vec2 p )
|
|
||||||
{
|
|
||||||
vec2 K1 = vec2(
|
|
||||||
23.14069263277926, // e^pi (Gelfond's constant)
|
|
||||||
2.665144142690225 // 2^sqrt(2) (Gelfond-Schneider constant)
|
|
||||||
);
|
|
||||||
return fract( cos( dot(p,K1) ) * 12345.6789 );
|
|
||||||
}" +
|
|
||||||
|
|
||||||
"void main() {" +
|
"void main() {" +
|
||||||
"vec2 cc = vec2(0.5) - qt_TexCoord0;" +
|
"vec2 cc = vec2(0.5) - qt_TexCoord0;" +
|
||||||
"float distance = length(cc);" +
|
"float distance = length(cc);" +
|
||||||
@@ -296,11 +285,7 @@ Item {
|
|||||||
: "") +
|
: "") +
|
||||||
|
|
||||||
(jitter !== 0 || staticNoise !== 0 ?
|
(jitter !== 0 || staticNoise !== 0 ?
|
||||||
"vec4 noiseTexel = texture2D(
|
"vec4 noiseTexel = texture2D(noiseSource, scaleNoiseSize * coords + vec2(fract(time / 51.0), fract(time / 237.0)));"
|
||||||
noiseSource, scaleNoiseSize * coords
|
|
||||||
+ vec2(0.0, random(vec2(fract(time / 237.0), 822.9582)))
|
|
||||||
+ vec2(fract(time / 31.0), fract(time / 177.0))
|
|
||||||
);"
|
|
||||||
: "") +
|
: "") +
|
||||||
|
|
||||||
(jitter !== 0 ? "
|
(jitter !== 0 ? "
|
||||||
@@ -321,8 +306,8 @@ Item {
|
|||||||
|
|
||||||
(burnIn !== 0 ? "
|
(burnIn !== 0 ? "
|
||||||
vec4 txt_blur = texture2D(burnInSource, staticCoords);
|
vec4 txt_blur = texture2D(burnInSource, staticCoords);
|
||||||
float blurDecay = clamp((time - burnInLastUpdate) * burnInTime, 0.0, 1.0);
|
float blurDecay = clamp(pow(0.5, burnInTime * (time - burnInLastUpdate)), 0.0, 1.0);
|
||||||
vec3 burnInColor = 0.65 * (txt_blur.rgb - vec3(blurDecay));
|
vec3 burnInColor = txt_blur.rgb * vec3(blurDecay);
|
||||||
txt_color = max(txt_color, convertWithChroma(burnInColor));"
|
txt_color = max(txt_color, convertWithChroma(burnInColor));"
|
||||||
: "") +
|
: "") +
|
||||||
|
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ ShaderEffect {
|
|||||||
float alpha = 0.0;
|
float alpha = 0.0;
|
||||||
|
|
||||||
float frameShadow = max2(positiveLog(-coords * frameShadowCoeff + vec2(1.0)) + positiveLog(coords * frameShadowCoeff - (vec2(frameShadowCoeff) - vec2(1.0))));
|
float frameShadow = max2(positiveLog(-coords * frameShadowCoeff + vec2(1.0)) + positiveLog(coords * frameShadowCoeff - (vec2(frameShadowCoeff) - vec2(1.0))));
|
||||||
frameShadow = clamp(sqrt(frameShadow), 0.0, 1.0);
|
frameShadow = max(sqrt(frameShadow), 0.0);
|
||||||
color *= frameShadow;
|
color *= frameShadow;
|
||||||
alpha = sum2(1.0 - step(vec2(0.0), coords) + step(vec2(1.0), coords));
|
alpha = sum2(1.0 - step(vec2(0.0), coords) + step(vec2(1.0), coords));
|
||||||
alpha = clamp(alpha, 0.0, 1.0);
|
alpha = clamp(alpha, 0.0, 1.0);
|
||||||
|
|||||||
@@ -116,11 +116,6 @@ ApplicationWindow {
|
|||||||
text: qsTr("Paste")
|
text: qsTr("Paste")
|
||||||
shortcut: "Ctrl+Shift+V"
|
shortcut: "Ctrl+Shift+V"
|
||||||
}
|
}
|
||||||
Action {
|
|
||||||
id: pasteActionAlt
|
|
||||||
text: qsTr("Paste selection")
|
|
||||||
shortcut: "Shift+Insert"
|
|
||||||
}
|
|
||||||
Action {
|
Action {
|
||||||
id: zoomIn
|
id: zoomIn
|
||||||
text: qsTr("Zoom In")
|
text: qsTr("Zoom In")
|
||||||
|
|||||||
Reference in New Issue
Block a user