Added in a very basic sprite handler.

Author: root

make_display.c

@@ -67,28 +67,78 @@ MAKEDISPLAY *initialize_display()
 int make_display(MAKEDISPLAY *dis,ws2811_led_t MATRIX[][15])
 {
   int i,j,jone,jcoord,jonecoord,coord,mirrorcoord;
-
+  int basepos,phase;
+  
   GifColorType *sprite;
 
-  sprite=dis->sprites[(dis->phase++)>>2];
+  //sprite=dis->sprites[(dis->phase++)>>2];
 
-  if (dis->phase >= 8*16) {
+  phase = dis->phase++;
+  if (dis->phase >= 92) {
     dis->phase = 0;
   }
-  
-  for(j=0;j<16;j++) {
-    for(i=0;i<15;i++) {
-      MATRIX[j][i] =
-	sprite[dis->SpriteW*j + i].Red +
-	sprite[dis->SpriteW*j + i].Green*0x100 +
-	sprite[dis->SpriteW*j + i].Blue*0x10000;
+
+  if(phase<36) {
+    sprite = dis->sprites[(phase)&1];
+    _put_sprite(dis,MATRIX,sprite,0,36 - phase);
+  } else if(phase<38) {
+    sprite = dis->sprites[6+((phase)&1)];
+    _put_sprite(dis,MATRIX,sprite,0,0);
+  } else if(phase<54) {
+    sprite = dis->sprites[6+((phase)&1)];
+    _put_sprite(dis,MATRIX,sprite,phase-38,0);
+  } else if(phase<70) {
+    sprite = dis->sprites[14 +((phase)&1)];
+    _put_sprite(dis,MATRIX,sprite,phase-54-16,0);
+  } else if(phase<72) {
+    sprite = dis->sprites[10 + ((phase)&1)];
+    _put_sprite(dis,MATRIX,sprite,0,0);
+  } else if(phase<92) {
+    sprite = dis->sprites[10 + ((phase)&1)];
+    _put_sprite(dis,MATRIX,sprite,0,phase-72);
+  } 
+
+
+		
+  /*
+  for(j=0;j<20;j++) {
+    {
+      for(i=0;i<15;i++) {
+	MATRIX[j][i] =
+	  sprite[dis->SpriteW*j + i].Red +
+	  sprite[dis->SpriteW*j + i].Green*0x100 +
+	  sprite[dis->SpriteW*j + i].Blue*0x10000;
+      }
     }
   }
-
+  */
   return 0;
 
 }
 
+void _put_sprite(MAKEDISPLAY *dis,ws2811_led_t MATRIX[][15],GifColorType *sprite,int x, int y)
+{
+  int i,j,transx,transy;
+
+  for(j=0;j<dis->SpriteH;j++)
+    {
+      transy = j+y;
+      if(transy>=0 && transy<60) {
+	for(i=0;i<dis->SpriteW;i++)
+	  {
+	    transx = i+x;
+	    if(transx>=0 && transx < 15)
+	      {
+		MATRIX[transy][transx] =
+		  sprite[dis->SpriteW*j + i].Red +
+		  sprite[dis->SpriteW*j + i].Green*0x100 +
+		  sprite[dis->SpriteW*j + i].Blue*0x10000;
+	      }
+	  }
+      }
+    }      
+}
+    
 void close_display(MAKEDISPLAY *dis)
 {
   gifloader_close(dis->gfl);

make_display.h

@@ -15,5 +15,6 @@ typedef struct {
 MAKEDISPLAY *initialize_display();
 int make_display(MAKEDISPLAY *dis,ws2811_led_t MATRIX[][15]);
 void close_display(MAKEDISPLAY *dis);
+void _put_sprite(MAKEDISPLAY *dis,ws2811_led_t MATRIX[][15],GifColorType *sprite,int x, int y);
 
 #endif // MAKE_DISPLAY_INCLUDE