double elapsed_fade = double(now.tv_sec - fade_started.tv_sec) +
double(now.tv_usec - fade_started.tv_usec) * 1.0e-6;
- if (elapsed_fade > 6.0 || (!same_fade && elapsed_fade > 1.0)) {
+ if (elapsed_fade > 5.5 || (!same_fade && elapsed_fade > 0.5)) {
in_fade = false;
// ugly hack here? :-)
// find the fade factors
int fr, fg, fb, fa;
if (same_fade) {
- if (elapsed_fade < 1.0) {
- fr = fg = fb = fa = unsigned(elapsed_fade/1.0 * 256.0);
+ if (elapsed_fade < 0.5) {
+ fr = fg = fb = fa = unsigned(elapsed_fade/0.5 * 256.0);
} else {
- fr = fg = fb = fa = unsigned((elapsed_fade-1.0)/5.0 * 256.0);
+ fr = fg = fb = fa = unsigned((elapsed_fade-0.5)/5.0 * 256.0);
}
} else {
- fr = fg = fb = fa = unsigned(elapsed_fade/1.0 * 256.0);
+ fr = fg = fb = fa = unsigned(elapsed_fade/0.5 * 256.0);
}
unsigned char *sptr1 = fadefrom_buf;
unsigned char *sptr2 = subscreens[current_screen].buf;
unsigned char *dptr = buf;
- if (same_fade && elapsed_fade >= 1.0) {
+ if (same_fade && elapsed_fade >= 0.5) {
// fade G&B to be = R
for (unsigned i = 0; i < 800 * 600; ++i) {
dptr[0] = sptr2[0] + (((int(sptr2[2]) - int(sptr2[0])) * fb) >> 8);