Compare commits
7 Commits
12fa3bdd83
...
84c5e8bca6
Author | SHA1 | Date | |
---|---|---|---|
![]() |
84c5e8bca6 | ||
1a25749315 | |||
![]() |
3852f5995d | ||
9093b7a16e | |||
afead1c2c0 | |||
1b2572f381 | |||
![]() |
27ca6b3f73 |
@ -16,7 +16,7 @@ macx:ICON = icons/crt.icns
|
||||
RESOURCES += qml/resources.qrc
|
||||
|
||||
#########################################
|
||||
## INTALLS
|
||||
## INSTALLS
|
||||
#########################################
|
||||
|
||||
target.path += /usr/bin/
|
||||
|
20
app/main.cpp
20
app/main.cpp
@ -49,15 +49,15 @@ int main(int argc, char *argv[])
|
||||
|
||||
if (argc>1 && (!strcmp(argv[1],"-h") || !strcmp(argv[1],"--help"))) {
|
||||
QTextStream cout(stdout, QIODevice::WriteOnly);
|
||||
cout << "Usage: " << argv[0] << " [--default-settings] [--workdir <dir>] [--program <prog>] [-p|--profile <prof>] [--fullscreen] [-h|--help]" << endl;
|
||||
cout << " --default-settings Run cool-retro-term with the default settings" << endl;
|
||||
cout << " --workdir <dir> Change working directory to 'dir'" << endl;
|
||||
cout << " -e <cmd> Command to execute. This option will catch all following arguments, so use it as the last option." << endl;
|
||||
cout << " -T <title> Set window title to 'title'." << endl;
|
||||
cout << " --fullscreen Run cool-retro-term in fullscreen." << endl;
|
||||
cout << " -p|--profile <prof> Run cool-retro-term with the given profile." << endl;
|
||||
cout << " -h|--help Print this help." << endl;
|
||||
cout << " --verbose Print additional information such as profiles and settings." << endl;
|
||||
cout << "Usage: " << argv[0] << " [--default-settings] [--workdir <dir>] [--program <prog>] [-p|--profile <prof>] [--fullscreen] [-h|--help]" << '\n';
|
||||
cout << " --default-settings Run cool-retro-term with the default settings" << '\n';
|
||||
cout << " --workdir <dir> Change working directory to 'dir'" << '\n';
|
||||
cout << " -e <cmd> Command to execute. This option will catch all following arguments, so use it as the last option." << '\n';
|
||||
cout << " -T <title> Set window title to 'title'." << '\n';
|
||||
cout << " --fullscreen Run cool-retro-term in fullscreen." << '\n';
|
||||
cout << " -p|--profile <prof> Run cool-retro-term with the given profile." << '\n';
|
||||
cout << " -h|--help Print this help." << '\n';
|
||||
cout << " --verbose Print additional information such as profiles and settings." << '\n';
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -65,7 +65,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
if (argc>1 && (!strcmp(argv[1],"-v") || !strcmp(argv[1],"--version"))) {
|
||||
QTextStream cout(stdout, QIODevice::WriteOnly);
|
||||
cout << "cool-retro-term " << appVersion << endl;
|
||||
cout << "cool-retro-term " << appVersion << '\n';
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -32,7 +32,7 @@ QtObject {
|
||||
readonly property real maximumFontScaling: 2.50
|
||||
|
||||
readonly property real minBurnInFadeTime: 160
|
||||
readonly property real maxBurnInFadeTime: 1600
|
||||
readonly property real maxBurnInFadeTime: 160000
|
||||
|
||||
property bool isMacOS: Qt.platform.os === "osx"
|
||||
|
||||
@ -613,7 +613,7 @@ QtObject {
|
||||
builtin: true
|
||||
}
|
||||
ListElement {
|
||||
text: "IBM Dos"
|
||||
text: "IBM DOS"
|
||||
obj_string: '{
|
||||
"ambientLight": 0.151,
|
||||
"backgroundColor": "#000000",
|
||||
|
@ -29,8 +29,8 @@ Loader {
|
||||
property real lastUpdate: 0
|
||||
property real prevLastUpdate: 0
|
||||
|
||||
property real burnIn: appSettings.burnIn
|
||||
property real burnInFadeTime: 1 / Utils.lint(_minBurnInFadeTime, _maxBurnInFadeTime, burnIn)
|
||||
property real burnIn: appSettings.burnIn;
|
||||
property real burnInFadeTime: (1 / Utils.lint(_minBurnInFadeTime, _maxBurnInFadeTime, burnIn))*64
|
||||
property real _minBurnInFadeTime: appSettings.minBurnInFadeTime
|
||||
property real _maxBurnInFadeTime: appSettings.maxBurnInFadeTime
|
||||
|
||||
@ -146,9 +146,8 @@ Loader {
|
||||
float prevMask = accColor.a;
|
||||
float currMask = rgb2grey(txtColor);
|
||||
|
||||
highp float blurDecay = clamp((lastUpdate - prevLastUpdate) * burnInTime, 0.0, 1.0);
|
||||
blurDecay = max(0.0, blurDecay - prevMask);
|
||||
vec3 blurColor = accColor.rgb - vec3(blurDecay);
|
||||
highp float blurDecay = clamp(pow(0.5, burnInTime * (lastUpdate - prevLastUpdate)), 0.0, 1.0);
|
||||
vec3 blurColor = accColor.rgb * vec3(blurDecay);
|
||||
vec3 color = max(blurColor, txtColor);
|
||||
|
||||
gl_FragColor = vec4(color, currMask);
|
||||
|
@ -302,8 +302,8 @@ Item {
|
||||
|
||||
(burnIn !== 0 ? "
|
||||
vec4 txt_blur = texture2D(burnInSource, staticCoords);
|
||||
float blurDecay = clamp((time - burnInLastUpdate) * burnInTime, 0.0, 1.0);
|
||||
vec3 burnInColor = 0.65 * (txt_blur.rgb - vec3(blurDecay));
|
||||
float blurDecay = clamp(pow(0.5, burnInTime * (time - burnInLastUpdate)), 0.0, 1.0);
|
||||
vec3 burnInColor = txt_blur.rgb * vec3(blurDecay);
|
||||
txt_color = max(txt_color, convertWithChroma(burnInColor));"
|
||||
: "") +
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user