Changeset 3549

Timestamp:

07/10/09 12:44:42 (4 years ago)

Author:

pterjan

Message:

• Use masks in screensaver to avoid truncated toasters

File:

• neercs/trunk/src/screensaver.c (modified) (7 diffs)

neercs/trunk/src/screensaver.c

@@ -56 +56 @@
 #define PRECISION 100
 
-char toaster1_text[] = {
+char toaster_text[3][99] = { {
 "      __._ \n"
 "   .-'== _',\n"
@@ -62 +62 @@
 "   | --|   \\'.-_ \n"
 "   |   | \\  \" _.\n"
-"    `-_|.-\\_.-\n"};
-
-char toaster2_text[] = {
+"    `-_|.-\\_.-\n"
+}, {
 "      __._ \n"
 "   .-'== _',\n"
@@ -71 +70 @@
 "   |   | ___.-\n"
 "    `-_|.-\n"
-};
-
-char toaster3_text[] = {
+}, {
 "   _- __._\n"
 "  /.-'== _',_.-.\n"
@@ -79 +76 @@
 "   | --| / .-\n"
 "   |   |  _.|\n"
-"    `-_|.-\n"};
+"    `-_|.-\n"} };
+
+char toaster_mask[3][99] = { {
+"      __._ \n"
+"   .-'== _',\n"
+"  <|_=X.-'XX|\n"
+"   |X--|XXX\\'.-_ \n"
+"   |XXX|X\\XX\"X_.\n"
+"    `-_|.-\\_.-\n"
+}, {
+
+"      __._ \n"
+"   .-'== _',\n"
+"  \\|_= .-'XX|\n"
+"   |X--|XX__'-.\n"
+"   |XXX|X___.-\n"
+"    `-_|.-\n"
+}, {
+"   _- __._\n"
+"  /.-'== _',_.-.\n"
+"  \\|_= .-'/XX_.'\n"
+"   |X--|X/X.-\n"
+"   |XXX|XX_.|\n"
+"    `-_|.-\n"} };
 
 struct flying_toaster
@@ -85 +105 @@
     int x[COUNT], y[COUNT], s[COUNT];
     caca_canvas_t **toaster;
+    caca_canvas_t **mask;
 };
 
@@ -96 +117 @@
     flying_toaster = malloc(sizeof(struct flying_toaster));
     flying_toaster->toaster = (caca_canvas_t **)malloc(sizeof(caca_canvas_t*)*3);
+    flying_toaster->mask = (caca_canvas_t **)malloc(sizeof(caca_canvas_t*)*3);
 
-
-    flying_toaster->toaster[0] = caca_create_canvas(0, 0);
-    flying_toaster->toaster[1] = caca_create_canvas(0, 0);
-    flying_toaster->toaster[2] = caca_create_canvas(0, 0);
-
-
-    caca_import_memory(flying_toaster->toaster[0],
-                        toaster1_text,
-                        strlen(toaster1_text), "ansi");
-    caca_import_memory(flying_toaster->toaster[1],
-                        toaster2_text,
-                        strlen(toaster2_text), "ansi");
-    caca_import_memory(flying_toaster->toaster[2],
-                        toaster3_text,
-                        strlen(toaster3_text), "ansi");
+    for(i = 0; i < 3; i++)
+    {
+        flying_toaster->toaster[i] = caca_create_canvas(0, 0);
+        flying_toaster->mask[i] = caca_create_canvas(0, 0);
+        caca_import_memory(flying_toaster->toaster[i],
+                           toaster_text[i],
+                           strlen(toaster_text[i]), "ansi");        
+        caca_import_memory(flying_toaster->mask[i],
+                           toaster_mask[i],
+                           strlen(toaster_mask[i]), "ansi");        
+    }
 
     for(i = 0; i < COUNT; i++)
@@ -149 +167 @@
     caca_clear_canvas(screen_list->cv);
 
-
-
     for(i = 0; i < COUNT; i++)
     {
-        caca_blit(screen_list->cv, d->x[i]/PRECISION, d->y[i]/PRECISION, d->toaster[d->s[i]/PRECISION], NULL);
+        caca_blit(screen_list->cv, d->x[i]/PRECISION, d->y[i]/PRECISION, d->toaster[d->s[i]/PRECISION], d->mask[d->s[i]/PRECISION]);
 
         d->x[i]-=40;