From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 20 Feb 2005 17:40:28 +0000 (+0000)
Subject: Adjusted the fade times a bit.
X-Git-Url: https://git.sesse.net/?p=ccbs;a=commitdiff_plain;h=bb7cc9171d0c948b69e94227266f126e132ecf02

Adjusted the fade times a bit.
---

diff --git a/bigscreen/rotatescreen.cpp b/bigscreen/rotatescreen.cpp
index 1dba1cc..900bac3 100644
--- a/bigscreen/rotatescreen.cpp
+++ b/bigscreen/rotatescreen.cpp
@@ -42,7 +42,7 @@ void RotateScreen::draw(unsigned char *buf)
 			double(now.tv_usec - fade_started.tv_usec) * 1.0e-6;
 		printf("fade: %f\n", elapsed_fade);
 		
-		if (elapsed_fade > 5.0 || (!same_fade && elapsed_fade > 0.5)) {
+		if (elapsed_fade > 6.0 || (!same_fade && elapsed_fade > 1.0)) {
 			in_fade = false;
 
 			// ugly hack here? :-)
@@ -54,13 +54,13 @@ void RotateScreen::draw(unsigned char *buf)
 			// find the fade factors
 			int fr, fg, fb, fa;
 			if (same_fade) {
-				if (elapsed_fade < 0.5) {
-					fr = fg = fb = fa = unsigned(elapsed_fade/0.5 * 256.0);
+				if (elapsed_fade < 1.0) {
+					fr = fg = fb = fa = unsigned(elapsed_fade/1.0 * 256.0);
 				} else {
-					fr = fg = fb = fa = unsigned((elapsed_fade-0.5)/4.5 * 256.0);
+					fr = fg = fb = fa = unsigned((elapsed_fade-1.0)/5.0 * 256.0);
 				}
 			} else {
-				fr = fg = fb = fa = unsigned(elapsed_fade/0.5 * 256.0);
+				fr = fg = fb = fa = unsigned(elapsed_fade/1.0 * 256.0);
 			}
 			printf("%u %u %u %u\n", fr, fg, fb, fa);
 
@@ -68,7 +68,7 @@ void RotateScreen::draw(unsigned char *buf)
 			unsigned char *sptr2 = subscreens[current_screen].buf;
 			unsigned char *dptr = buf;
 
-			if (same_fade && elapsed_fade >= 0.5) {
+			if (same_fade && elapsed_fade >= 1.0) {
 				// 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);