From f0c8d17bb4289a928283bd1d16b484517d8c6232 Mon Sep 17 00:00:00 2001
From: Christian Kroll <chris@das-labor.org>
Date: Sun, 4 Sep 2011 22:31:24 +0000
Subject: [PATCH] reverted spiral routine as the new implementation had no
 dispappearing animation

---
 animations/programm.c | 51 +++++++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/animations/programm.c b/animations/programm.c
index 258ce92..cb39679 100644
--- a/animations/programm.c
+++ b/animations/programm.c
@@ -47,22 +47,45 @@ void test_palette2(){
 
 
 #ifdef ANIMATION_SPIRALE
-void spirale(int delay) {
-	clear_screen(0);
-	static signed char const delta[5] PROGMEM = {0, -1, 0, 1, 0};
-	unsigned char length[2] = {NUM_ROWS, NUM_COLS - 1};
-	unsigned char x = NUM_COLS - 1, y = NUM_ROWS;
-	unsigned char i = 0;
+static void walk(cursor_t* cur, unsigned char steps, unsigned int delay){
+	unsigned char x;
+	for(x=steps;x--;){
+		set_cursor(cur, next_pixel(cur->pos, cur->dir));
+		wait(delay);
+	}
+}
 
-	while (length[i & 0x01] != 0) {
-		for (unsigned char j = 0; j < length[i & 0x01]; ++j) {
-			x += pgm_read_byte(&delta[i]);
-			y += pgm_read_byte(&delta[i + 1]);
-			setpixel((pixel){x, y}, 3);
-			wait(delay);
+void spirale(unsigned int delay){
+	clear_screen(0);
+
+	cursor_t cur;
+	cur.dir = right;
+	cur.mode = set;
+	set_cursor (&cur, (pixel){NUM_COLS-1,0});
+
+	unsigned char clearbit=0;
+	while(clearbit == 0){
+
+		clearbit = 1;
+		while (!get_next_pixel(cur.pos, cur.dir)){
+			clearbit = 0;
+			walk(&cur, 1, delay);
+		}
+		cur.dir = direction_r(cur.dir);
+	}
+
+	cur.mode = clear;
+	set_cursor(&cur, (pixel){(NUM_COLS/2)-1,(NUM_ROWS/2)-1});
+
+	for(clearbit=0;clearbit==0;){
+		if( get_next_pixel(cur.pos, direction_r(cur.dir)) ){
+			cur.dir = direction_r(cur.dir);
+		}
+		if( get_next_pixel(cur.pos, cur.dir) == 1 ){
+			walk(&cur , 1, delay);
+		}else{
+			clearbit = 1;
 		}
-		length[i++ & 0x01]--;
-		i %= 4;
 	}
 }
 #endif