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 DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells);\r
void FinalizeLineBGR444(int sh);\r
void FinalizeLineRGB555(int sh);\r
void blockcpy_or(void *dst, void *src, size_t n, int pat);\r
// --------------------------------------------\r
\r
#ifndef _ASM_DRAW_C\r
-static void DrawStrip(struct TileStrip *ts, int sh)\r
+static void DrawStrip(struct TileStrip *ts, int plane_sh, int cellskip)\r
{\r
- int tilex=0,dx=0,ty=0,code=0,addr=0,cells;\r
+ int tilex,dx,ty,code=0,addr=0,cells;\r
int oldcode=-1,blank=-1; // The tile we know is blank\r
- int pal=0;\r
+ int pal=0,sh;\r
\r
// Draw tiles across screen:\r
- tilex=(-ts->hscroll)>>3;\r
+ sh=(plane_sh<<5)&0x40;\r
+ tilex=((-ts->hscroll)>>3)+cellskip;\r
ty=(ts->line&7)<<1; // Y-Offset into tile\r
dx=((ts->hscroll-1)&7)+1;\r
- cells = ts->cells;\r
+ cells = ts->cells - cellskip;\r
if(dx != 8) cells++; // have hscroll, need to draw 1 cell more\r
+ dx+=cellskip<<3;\r
\r
- for (; cells; dx+=8,tilex++,cells--)\r
+ for (; cells > 0; dx+=8,tilex++,cells--)\r
{\r
int zero=0;\r
\r
addr+=ty;\r
if (code&0x1000) addr^=0xe; // Y-flip\r
\r
-// pal=Pico.cram+((code>>9)&0x30);\r
- pal=((code>>9)&0x30)|(sh<<6);\r
+ pal=((code>>9)&0x30)|sh;\r
}\r
\r
if (code&0x0800) zero=TileFlip(dx,addr,pal);\r
}\r
\r
// this is messy\r
-void DrawStripVSRam(struct TileStrip *ts, int plane)\r
+void DrawStripVSRam(struct TileStrip *ts, int plane_sh, int cellskip)\r
{\r
- int tilex=0,dx=0,ty=0,code=0,addr=0,cell=0,nametabadd=0;\r
+ int tilex,dx,code=0,addr=0,cell=0;\r
int oldcode=-1,blank=-1; // The tile we know is blank\r
int pal=0,scan=Scanline;\r
\r
// Draw tiles across screen:\r
tilex=(-ts->hscroll)>>3;\r
dx=((ts->hscroll-1)&7)+1;\r
- if(dx != 8) {\r
- int vscroll, line;\r
- cell--; // have hscroll, start with negative cell\r
- // also calculate intial VS stuff\r
- vscroll=Pico.vsram[plane];\r
-\r
- // Find the line in the name table\r
- line=(vscroll+scan)&ts->line&0xffff; // ts->line is really ymask ..\r
- nametabadd=(line>>3)<<(ts->line>>24); // .. and shift[width]\r
- ty=(line&7)<<1; // Y-Offset into tile\r
- }\r
+ if(dx != 8) cell--; // have hscroll, start with negative cell\r
+ cell+=cellskip;\r
+ tilex+=cellskip;\r
+ dx+=cellskip<<3;\r
\r
for (; cell < ts->cells; dx+=8,tilex++,cell++)\r
{\r
- int zero=0;\r
+ int zero=0,nametabadd,ty;\r
\r
- if((cell&1)==0) {\r
+ //if((cell&1)==0)\r
+ {\r
int line,vscroll;\r
- vscroll=Pico.vsram[plane+(cell&~1)];\r
+ vscroll=Pico.vsram[(plane_sh&1)+(cell&~1)];\r
\r
// Find the line in the name table\r
line=(vscroll+scan)&ts->line&0xffff; // ts->line is really ymask ..\r
addr=(code&0x7ff)<<4;\r
if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip\r
\r
-// pal=Pico.cram+((code>>9)&0x30);\r
- pal=((code>>9)&0x30);\r
+ pal=((code>>9)&0x30)|((plane_sh<<5)&0x40);\r
}\r
\r
if (code&0x0800) zero=TileFlip(dx,addr,pal);\r
// --------------------------------------------\r
\r
#ifndef _ASM_DRAW_C\r
-static void DrawLayer(int plane, int *hcache, int maxcells, int sh)\r
+static void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells)\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
const char shift[4]={5,6,5,7}; // 32,64 or 128 sized tilemaps (2 is invalid)\r
else if(width>1) ymask =0x0ff;\r
\r
// Find name table:\r
- if (plane==0) ts.nametab=(pvid->reg[2]&0x38)<< 9; // A\r
- else ts.nametab=(pvid->reg[4]&0x07)<<12; // B\r
+ if (plane_sh&1) ts.nametab=(pvid->reg[4]&0x07)<<12; // B\r
+ else ts.nametab=(pvid->reg[2]&0x38)<< 9; // A\r
\r
htab=pvid->reg[13]<<9; // Horizontal scroll table address\r
if ( pvid->reg[11]&2) htab+=Scanline<<1; // Offset by line\r
if ((pvid->reg[11]&1)==0) htab&=~0xf; // Offset by tile\r
- htab+=plane; // A or B\r
+ htab+=plane_sh&1; // A or B\r
\r
// Get horizontal scroll value, will be masked later\r
ts.hscroll=Pico.vram[htab&0x7fff];\r
\r
if((pvid->reg[12]&6) == 6) {\r
// interlace mode 2\r
- vscroll=Pico.vsram[plane]; // Get vertical scroll value\r
+ vscroll=Pico.vsram[plane_sh&1]; // Get vertical scroll value\r
\r
// Find the line in the name table\r
ts.line=(vscroll+(Scanline<<1))&((ymask<<1)|1);\r
// shit, we have 2-cell column based vscroll\r
// luckily this doesn't happen too often\r
ts.line=ymask|(shift[width]<<24); // save some stuff instead of line\r
- DrawStripVSRam(&ts, plane);\r
+ DrawStripVSRam(&ts, plane_sh, cellskip);\r
} else {\r
- vscroll=Pico.vsram[plane]; // Get vertical scroll value\r
+ vscroll=Pico.vsram[plane_sh&1]; // Get vertical scroll value\r
\r
// Find the line in the name table\r
ts.line=(vscroll+Scanline)&ymask;\r
ts.nametab+=(ts.line>>3)<<shift[width];\r
\r
- DrawStrip(&ts, sh);\r
+ DrawStrip(&ts, plane_sh, cellskip);\r
}\r
}\r
\r
\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
\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
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
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
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
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
- DrawWindow(0, maxcells>>1, 0, sh); // HighCacheAW\r
- else if(hvwind == 2) {\r
+ DrawLayer(1|(sh<<1), HighCacheB, 0, maxcells);\r
+ if (hvwind == 1)\r
+ DrawWindow(0, maxcells>>1, 0, sh);\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
+ DrawLayer(0|(sh<<1), HighCacheA, (win&0x80) ? 0 : edge<<1, (win&0x80) ? edge<<1 : maxcells);\r
+ DrawWindow( (win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 0, sh);\r
} else\r
- DrawLayer(0, HighCacheA, maxcells, sh);\r
+ DrawLayer(0|(sh<<1), HighCacheA, 0, maxcells);\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 : 328);\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
notaz.gp2x.de / picodrive.git / blobdiff