renderer patch for DBZ - Buyuu Retsuden

[picodrive.git] / Pico / Draw.c

diff --git a/Pico/Draw.c b/Pico/Draw.c
index c43f7f0..dec7abd 100644 (file)
--- a/Pico/Draw.c
+++ b/Pico/Draw.c
@@ -46,7 +46,7 @@ struct TileStrip
 void DrawWindow(int tstart, int tend, int prio, int sh);\r
 void BackFill(int reg7, int sh);\r
 void DrawSprite(int *sprite, int **hc, int sh);\r
-void DrawTilesFromCache(int *hc, int sh);\r
+void DrawTilesFromCache(int *hc, int sh, int rlim);\r
 void DrawSpritesFromCache(int *hc, int sh);\r
 void DrawLayer(int plane, int *hcache, int maxcells, int sh);\r
 void FinalizeLineBGR444(int sh);\r
@@ -579,7 +579,7 @@ static void DrawWindow(int tstart, int tend, int prio, int sh) // int *hcache
 \r
 // --------------------------------------------\r
 \r
-static void DrawTilesFromCache(int *hc, int sh)\r
+static void DrawTilesFromCache(int *hc, int sh, int rlim)\r
 {\r
   int code, addr, dx;\r
   int pal;\r
@@ -611,7 +611,7 @@ static void DrawTilesFromCache(int *hc, int sh)
 \r
   if (sh)\r
   {\r
-    while((code=*hc++)) {\r
+    while ((code=*hc++)) {\r
       unsigned char *zb;\r
       // Get tile address/2:\r
       addr=(code&0x7ff)<<4;\r
@@ -624,6 +624,7 @@ static void DrawTilesFromCache(int *hc, int sh)
       if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;\r
 \r
       pal=((code>>9)&0x30);\r
+      if (rlim-dx < 0) goto last_cut_tile;\r
 \r
       if (code&0x0800) TileFlip(dx,addr,pal);\r
       else             TileNorm(dx,addr,pal);\r
@@ -632,7 +633,7 @@ static void DrawTilesFromCache(int *hc, int sh)
   else\r
   {\r
     short blank=-1; // The tile we know is blank\r
-    while((code=*hc++)) {\r
+    while ((code=*hc++)) {\r
       int zero;\r
       if((short)code == blank) continue;\r
       // Get tile address/2:\r
@@ -641,11 +642,48 @@ static void DrawTilesFromCache(int *hc, int sh)
       dx=(code>>16)&0x1ff;\r
 \r
       pal=((code>>9)&0x30);\r
+      if (rlim-dx < 0) goto last_cut_tile;\r
 \r
       if (code&0x0800) zero=TileFlip(dx,addr,pal);\r
       else             zero=TileNorm(dx,addr,pal);\r
 \r
-      if(zero) blank=(short)code;\r
+      if (zero) blank=(short)code;\r
+    }\r
+  }\r
+  return;\r
+\r
+last_cut_tile:\r
+  {\r
+    unsigned int t, pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
+    unsigned char *pd = HighCol+dx;\r
+    if (!pack) return;\r
+    if (code&0x0800)\r
+    {\r
+      switch (rlim-dx+8)\r
+      {\r
+        case 7: t=pack&0x00000f00; if (t) pd[6]=(unsigned char)(pal|(t>> 8)); // "break" is left out intentionally\r
+        case 6: t=pack&0x000000f0; if (t) pd[5]=(unsigned char)(pal|(t>> 4));\r
+        case 5: t=pack&0x0000000f; if (t) pd[4]=(unsigned char)(pal|(t    ));\r
+        case 4: t=pack&0xf0000000; if (t) pd[3]=(unsigned char)(pal|(t>>28));\r
+        case 3: t=pack&0x0f000000; if (t) pd[2]=(unsigned char)(pal|(t>>24));\r
+        case 2: t=pack&0x00f00000; if (t) pd[1]=(unsigned char)(pal|(t>>20));\r
+        case 1: t=pack&0x000f0000; if (t) pd[0]=(unsigned char)(pal|(t>>16));\r
+        default: break;\r
+      }\r
+    }\r
+    else\r
+    {\r
+      switch (rlim-dx+8)\r
+      {\r
+        case 7: t=pack&0x00f00000; if (t) pd[6]=(unsigned char)(pal|(t>>20));\r
+       case 6: t=pack&0x0f000000; if (t) pd[5]=(unsigned char)(pal|(t>>24));\r
+       case 5: t=pack&0xf0000000; if (t) pd[4]=(unsigned char)(pal|(t>>28));\r
+       case 4: t=pack&0x0000000f; if (t) pd[3]=(unsigned char)(pal|(t    ));\r
+       case 3: t=pack&0x000000f0; if (t) pd[2]=(unsigned char)(pal|(t>> 4));\r
+       case 2: t=pack&0x00000f00; if (t) pd[1]=(unsigned char)(pal|(t>> 8));\r
+       case 1: t=pack&0x0000f000; if (t) pd[0]=(unsigned char)(pal|(t>>12));\r
+       default: break;\r
+      }\r
     }\r
   }\r
 }\r
@@ -1246,23 +1284,23 @@ static int DrawDisplay(int sh)
   if (win&0x80) { if (Scanline>=edge) hvwind=1; }\r
   else          { if (Scanline< edge) hvwind=1; }\r
 \r
-  if(!hvwind) { // we might have a vertical window here\r
+  if (!hvwind) { // we might have a vertical window here\r
     win=pvid->reg[0x11];\r
     edge=win&0x1f;\r
-    if(win&0x80) {\r
-      if(!edge) hvwind=1;\r
+    if (win&0x80) {\r
+      if (!edge) hvwind=1;\r
       else if(edge < (maxcells>>1)) hvwind=2;\r
     } else {\r
-      if(!edge);\r
+      if (!edge);\r
       else if(edge < (maxcells>>1)) hvwind=2;\r
       else hvwind=1;\r
     }\r
   }\r
 \r
   DrawLayer(1, HighCacheB, maxcells, sh);\r
-  if(hvwind == 1)\r
+  if (hvwind == 1)\r
     DrawWindow(0, maxcells>>1, 0, sh); // HighCacheAW\r
-  else if(hvwind == 2) {\r
+  else if (hvwind == 2) {\r
     // ahh, we have vertical window\r
     DrawLayer(0, HighCacheA, (win&0x80) ? edge<<1 : maxcells, sh);\r
     DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 0, sh); // HighCacheW\r
@@ -1270,14 +1308,14 @@ static int DrawDisplay(int sh)
     DrawLayer(0, HighCacheA, maxcells, sh);\r
   DrawAllSprites(HighCacheS, maxw, 0, sh);\r
 \r
-  if(HighCacheB[0])  DrawTilesFromCache(HighCacheB, sh);\r
-  if(hvwind == 1)\r
+  if (HighCacheB[0]) DrawTilesFromCache(HighCacheB, sh, 328);\r
+  if (hvwind == 1)\r
     DrawWindow(0, maxcells>>1, 1, sh);\r
-  else if(hvwind == 2) {\r
-    if(HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh);\r
+  else if (hvwind == 2) {\r
+    if(HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, (win&0x80) ? edge<<4 : 0);\r
     DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 1, sh);\r
   } else\r
-    if(HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh);\r
+    if (HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, 328);\r
   DrawAllSprites(HighCacheS, maxw, 1, sh);\r
 \r
 #if 0\r