// This is part of Pico Library\r
\r
// (c) Copyright 2004 Dave, All rights reserved.\r
-// (c) Copyright 2006 notaz, All rights reserved.\r
+// (c) Copyright 2006-2008 notaz, All rights reserved.\r
// Free for non-commercial use.\r
\r
// For commercial use, separate licencing terms must be obtained.\r
\r
+/*\r
+ * The renderer has 4 modes now:\r
+ * - normal\r
+ * - shadow/hilight (s/h)\r
+ * - "sonic mode" for midline palette changes\r
+ * - accurate sprites (AS)\r
+ *\r
+ * AS and s/h both use upper bits for both priority and shadow/hilight flags.\r
+ * "sonic mode" is autodetected, shadow/hilight is enabled by emulated game.\r
+ * AS is enabled by user and takes priority over "sonic mode".\r
+ */\r
\r
#include "PicoInt.h"\r
-#ifndef __GNUC__\r
-#pragma warning (disable:4706) // Disable assignment within conditional\r
-#endif\r
\r
-int (*PicoScan)(unsigned int num, void *data)=NULL;\r
+int (*PicoScanBegin)(unsigned int num) = NULL;\r
+int (*PicoScanEnd) (unsigned int num) = NULL;\r
\r
-unsigned short DefOutBuff[320*2];\r
+#if OVERRIDE_HIGHCOL\r
+static unsigned char DefHighCol[8+320+8];\r
+unsigned char *HighCol=DefHighCol;\r
+#else\r
unsigned char HighCol[8+320+8];\r
+#endif\r
+unsigned short DefOutBuff[320*2];\r
+void *DrawLineDest=DefOutBuff; // pointer to dest buffer where to draw this line to\r
+\r
static int HighCacheA[41+1]; // caches for high layers\r
static int HighCacheB[41+1];\r
-static int HighCacheS[80+1]; // and sprites\r
-static int HighPreSpr[80*2+1]; // slightly preprocessed sprites\r
-char HighSprZ[320+8+8]; // Z-buffer for accurate sprites and shadow/hilight mode\r
- // (if bit 7 == 0, sh caused by tile; if bit 6 == 0 pixel must be shadowed, else hilighted, if bit5 == 1)\r
-// lsb->msb: moved sprites, all window tiles don't use same priority, accurate sprites (copied from PicoOpt), interlace\r
-// dirty sprites, sonic mode\r
-int rendstatus;\r
-void *DrawLineDest=DefOutBuff; // pointer to dest buffer where to draw this line to\r
-int Scanline=0; // Scanline\r
+int HighPreSpr[80*2+1]; // slightly preprocessed sprites\r
+\r
+#define SPRL_HAVE_HI 0x80 // have hi priority sprites\r
+#define SPRL_HAVE_LO 0x40 // *lo*\r
+#define SPRL_MAY_HAVE_OP 0x20 // may have operator sprites on the line\r
+#define SPRL_LO_ABOVE_HI 0x10 // low priority sprites may be on top of hi\r
+unsigned char HighLnSpr[240][3 + MAX_LINE_SPRITES]; // sprite_count, ^flags, tile_count, [spritep]...\r
+\r
+int rendstatus = 0;\r
+int DrawScanline = 0;\r
+int PicoDrawMask = -1;\r
+\r
+static int skip_next_line=0;\r
\r
-static int SpriteBlocks;\r
//unsigned short ppt[] = { 0x0f11, 0x0ff1, 0x01f1, 0x011f, 0x01ff, 0x0f1f, 0x0f0e, 0x0e7c };\r
\r
struct TileStrip\r
#ifdef _ASM_DRAW_C\r
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 DrawSpritesFromCache(int *hc, int sh);\r
-void DrawLayer(int plane, int *hcache, int maxcells, int sh);\r
+void DrawAllSprites(unsigned char *sprited, int prio, int sh);\r
+void DrawTilesFromCache(int *hc, int sh, int rlim);\r
+void DrawSpritesSHi(unsigned char *sprited);\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(void *dst, const void *src, size_t n);\r
void blockcpy_or(void *dst, void *src, size_t n, int pat);\r
#else\r
// utility\r
for (; n; n--)\r
*pd++ = (unsigned char) (*ps++ | pat);\r
}\r
+#define blockcpy memcpy\r
#endif\r
\r
\r
-static int TileNorm(int sx,int addr,int pal)\r
-{\r
- unsigned char *pd = HighCol+sx;\r
- unsigned int pack=0; unsigned int t=0;\r
-\r
- pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
- if (pack)\r
- {\r
- t=pack&0x0000f000; if (t) pd[0]=(unsigned char)(pal|(t>>12));\r
- t=pack&0x00000f00; if (t) pd[1]=(unsigned char)(pal|(t>> 8));\r
- t=pack&0x000000f0; if (t) pd[2]=(unsigned char)(pal|(t>> 4));\r
- t=pack&0x0000000f; if (t) pd[3]=(unsigned char)(pal|(t ));\r
- t=pack&0xf0000000; if (t) pd[4]=(unsigned char)(pal|(t>>28));\r
- t=pack&0x0f000000; if (t) pd[5]=(unsigned char)(pal|(t>>24));\r
- t=pack&0x00f00000; if (t) pd[6]=(unsigned char)(pal|(t>>20));\r
- t=pack&0x000f0000; if (t) pd[7]=(unsigned char)(pal|(t>>16));\r
- return 0;\r
- }\r
-\r
- return 1; // Tile blank\r
+#define TileNormMaker(funcname,pix_func) \\r
+static int funcname(int sx,int addr,int pal) \\r
+{ \\r
+ unsigned char *pd = HighCol+sx; \\r
+ unsigned int pack=0; unsigned int t=0; \\r
+ \\r
+ pack=*(unsigned int *)(Pico.vram+addr); /* Get 8 pixels */ \\r
+ if (pack) \\r
+ { \\r
+ t=(pack&0x0000f000)>>12; pix_func(0); \\r
+ t=(pack&0x00000f00)>> 8; pix_func(1); \\r
+ t=(pack&0x000000f0)>> 4; pix_func(2); \\r
+ t=(pack&0x0000000f) ; pix_func(3); \\r
+ t=(pack&0xf0000000)>>28; pix_func(4); \\r
+ t=(pack&0x0f000000)>>24; pix_func(5); \\r
+ t=(pack&0x00f00000)>>20; pix_func(6); \\r
+ t=(pack&0x000f0000)>>16; pix_func(7); \\r
+ return 0; \\r
+ } \\r
+ \\r
+ return 1; /* Tile blank */ \\r
}\r
\r
-static int TileFlip(int sx,int addr,int pal)\r
-{\r
- unsigned char *pd = HighCol+sx;\r
- unsigned int pack=0; unsigned int t=0;\r
\r
- pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
- if (pack)\r
- {\r
- t=pack&0x000f0000; if (t) pd[0]=(unsigned char)(pal|(t>>16));\r
- t=pack&0x00f00000; if (t) pd[1]=(unsigned char)(pal|(t>>20));\r
- t=pack&0x0f000000; if (t) pd[2]=(unsigned char)(pal|(t>>24));\r
- t=pack&0xf0000000; if (t) pd[3]=(unsigned char)(pal|(t>>28));\r
- t=pack&0x0000000f; if (t) pd[4]=(unsigned char)(pal|(t ));\r
- t=pack&0x000000f0; if (t) pd[5]=(unsigned char)(pal|(t>> 4));\r
- t=pack&0x00000f00; if (t) pd[6]=(unsigned char)(pal|(t>> 8));\r
- t=pack&0x0000f000; if (t) pd[7]=(unsigned char)(pal|(t>>12));\r
- return 0;\r
- }\r
- return 1; // Tile blank\r
+#define TileFlipMaker(funcname,pix_func) \\r
+static int funcname(int sx,int addr,int pal) \\r
+{ \\r
+ unsigned char *pd = HighCol+sx; \\r
+ unsigned int pack=0; unsigned int t=0; \\r
+ \\r
+ pack=*(unsigned int *)(Pico.vram+addr); /* Get 8 pixels */ \\r
+ if (pack) \\r
+ { \\r
+ t=(pack&0x000f0000)>>16; pix_func(0); \\r
+ t=(pack&0x00f00000)>>20; pix_func(1); \\r
+ t=(pack&0x0f000000)>>24; pix_func(2); \\r
+ t=(pack&0xf0000000)>>28; pix_func(3); \\r
+ t=(pack&0x0000000f) ; pix_func(4); \\r
+ t=(pack&0x000000f0)>> 4; pix_func(5); \\r
+ t=(pack&0x00000f00)>> 8; pix_func(6); \\r
+ t=(pack&0x0000f000)>>12; pix_func(7); \\r
+ return 0; \\r
+ } \\r
+ \\r
+ return 1; /* Tile blank */ \\r
}\r
\r
\r
-// tile renderers for hacky operator sprite support\r
-#define sh_pix(x) \\r
- if(!t); \\r
- else if(t==0xe) pd[x]=(unsigned char)((pd[x]&0x3f)|0x80); /* hilight */ \\r
- else if(t==0xf) pd[x]=(unsigned char)((pd[x]&0x3f)|0xc0); /* shadow */ \\r
- else pd[x]=(unsigned char)(pal|t)\r
+#ifdef _ASM_DRAW_C_AMIPS\r
+int TileNorm(int sx,int addr,int pal);\r
+int TileFlip(int sx,int addr,int pal);\r
+#else\r
\r
-#ifndef _ASM_DRAW_C\r
-static int TileNormSH(int sx,int addr,int pal)\r
-{\r
- unsigned int pack=0; unsigned int t=0;\r
- unsigned char *pd = HighCol+sx;\r
+#define pix_just_write(x) \\r
+ if (t) pd[x]=pal|t\r
\r
- pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
- if (pack)\r
- {\r
- t=(pack&0x0000f000)>>12; sh_pix(0);\r
- t=(pack&0x00000f00)>> 8; sh_pix(1);\r
- t=(pack&0x000000f0)>> 4; sh_pix(2);\r
- t=(pack&0x0000000f) ; sh_pix(3);\r
- t=(pack&0xf0000000)>>28; sh_pix(4);\r
- t=(pack&0x0f000000)>>24; sh_pix(5);\r
- t=(pack&0x00f00000)>>20; sh_pix(6);\r
- t=(pack&0x000f0000)>>16; sh_pix(7);\r
- return 0;\r
- }\r
+TileNormMaker(TileNorm,pix_just_write)\r
+TileFlipMaker(TileFlip,pix_just_write)\r
\r
- return 1; // Tile blank\r
-}\r
+#endif\r
\r
-static int TileFlipSH(int sx,int addr,int pal)\r
-{\r
- unsigned int pack=0; unsigned int t=0;\r
- unsigned char *pd = HighCol+sx;\r
+#ifndef _ASM_DRAW_C\r
\r
- pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
- if (pack)\r
- {\r
- t=(pack&0x000f0000)>>16; sh_pix(0);\r
- t=(pack&0x00f00000)>>20; sh_pix(1);\r
- t=(pack&0x0f000000)>>24; sh_pix(2);\r
- t=(pack&0xf0000000)>>28; sh_pix(3);\r
- t=(pack&0x0000000f) ; sh_pix(4);\r
- t=(pack&0x000000f0)>> 4; sh_pix(5);\r
- t=(pack&0x00000f00)>> 8; sh_pix(6);\r
- t=(pack&0x0000f000)>>12; sh_pix(7);\r
- return 0;\r
- }\r
- return 1; // Tile blank\r
-}\r
-#endif\r
+// draw a sprite pixel, process operator colors\r
+#define pix_sh(x) \\r
+ if (!t); \\r
+ else if (t==0xe) pd[x]=(pd[x]&0x3f)|0x80; /* hilight */ \\r
+ else if (t==0xf) pd[x]= pd[x] |0xc0; /* shadow */ \\r
+ else pd[x]=pal|t\r
\r
-static int TileNormZ(int sx,int addr,int pal,int zval)\r
-{\r
- unsigned int pack=0; unsigned int t=0;\r
- unsigned char *pd = HighCol+sx;\r
- char *zb = HighSprZ+sx;\r
- int collision = 0, zb_s;\r
+TileNormMaker(TileNormSH, pix_sh)\r
+TileFlipMaker(TileFlipSH, pix_sh)\r
\r
- pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
- if (pack)\r
- {\r
- t=pack&0x0000f000; if(t) { zb_s=zb[0]; if(zb_s) collision=1; if(zval>zb_s) { pd[0]=(unsigned char)(pal|(t>>12)); zb[0]=(char)zval; } }\r
- t=pack&0x00000f00; if(t) { zb_s=zb[1]; if(zb_s) collision=1; if(zval>zb_s) { pd[1]=(unsigned char)(pal|(t>> 8)); zb[1]=(char)zval; } }\r
- t=pack&0x000000f0; if(t) { zb_s=zb[2]; if(zb_s) collision=1; if(zval>zb_s) { pd[2]=(unsigned char)(pal|(t>> 4)); zb[2]=(char)zval; } }\r
- t=pack&0x0000000f; if(t) { zb_s=zb[3]; if(zb_s) collision=1; if(zval>zb_s) { pd[3]=(unsigned char)(pal|(t )); zb[3]=(char)zval; } }\r
- t=pack&0xf0000000; if(t) { zb_s=zb[4]; if(zb_s) collision=1; if(zval>zb_s) { pd[4]=(unsigned char)(pal|(t>>28)); zb[4]=(char)zval; } }\r
- t=pack&0x0f000000; if(t) { zb_s=zb[5]; if(zb_s) collision=1; if(zval>zb_s) { pd[5]=(unsigned char)(pal|(t>>24)); zb[5]=(char)zval; } }\r
- t=pack&0x00f00000; if(t) { zb_s=zb[6]; if(zb_s) collision=1; if(zval>zb_s) { pd[6]=(unsigned char)(pal|(t>>20)); zb[6]=(char)zval; } }\r
- t=pack&0x000f0000; if(t) { zb_s=zb[7]; if(zb_s) collision=1; if(zval>zb_s) { pd[7]=(unsigned char)(pal|(t>>16)); zb[7]=(char)zval; } }\r
- if(collision) Pico.video.status|=0x20;\r
- return 0;\r
- }\r
+// draw a sprite pixel ignoring operator colors\r
+#define pix_sh_noop(x) \\r
+ if (t && t < 0xe) \\r
+ pd[x]=pal|t\r
\r
- return 1; // Tile blank\r
-}\r
+TileNormMaker(TileNormSH_noop, pix_sh_noop)\r
+TileFlipMaker(TileFlipSH_noop, pix_sh_noop)\r
\r
-static int TileFlipZ(int sx,int addr,int pal,int zval)\r
-{\r
- unsigned int pack=0; unsigned int t=0;\r
- unsigned char *pd = HighCol+sx;\r
- char *zb = HighSprZ+sx;\r
- int collision = 0, zb_s;\r
+// process operator pixels only, apply only on low pri tiles\r
+#define pix_sh_onlyop(x) \\r
+ if (t==0xe && (pd[x]&0x40)) pd[x]=(pd[x]&0x3f)|0x80; /* hilight */ \\r
+ else if (t==0xf && (pd[x]&0x40)) pd[x]= pd[x] |0xc0; /* shadow */\r
\r
- pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
- if (pack)\r
- {\r
- t=pack&0x000f0000; if(t) { zb_s=zb[0]&0x1f; if(zb_s) collision=1; if(zval>zb_s) { pd[0]=(unsigned char)(pal|(t>>16)); zb[0]=(char)zval; } }\r
- t=pack&0x00f00000; if(t) { zb_s=zb[1]&0x1f; if(zb_s) collision=1; if(zval>zb_s) { pd[1]=(unsigned char)(pal|(t>>20)); zb[1]=(char)zval; } }\r
- t=pack&0x0f000000; if(t) { zb_s=zb[2]&0x1f; if(zb_s) collision=1; if(zval>zb_s) { pd[2]=(unsigned char)(pal|(t>>24)); zb[2]=(char)zval; } }\r
- t=pack&0xf0000000; if(t) { zb_s=zb[3]&0x1f; if(zb_s) collision=1; if(zval>zb_s) { pd[3]=(unsigned char)(pal|(t>>28)); zb[3]=(char)zval; } }\r
- t=pack&0x0000000f; if(t) { zb_s=zb[4]&0x1f; if(zb_s) collision=1; if(zval>zb_s) { pd[4]=(unsigned char)(pal|(t )); zb[4]=(char)zval; } }\r
- t=pack&0x000000f0; if(t) { zb_s=zb[5]&0x1f; if(zb_s) collision=1; if(zval>zb_s) { pd[5]=(unsigned char)(pal|(t>> 4)); zb[5]=(char)zval; } }\r
- t=pack&0x00000f00; if(t) { zb_s=zb[6]&0x1f; if(zb_s) collision=1; if(zval>zb_s) { pd[6]=(unsigned char)(pal|(t>> 8)); zb[6]=(char)zval; } }\r
- t=pack&0x0000f000; if(t) { zb_s=zb[7]&0x1f; if(zb_s) collision=1; if(zval>zb_s) { pd[7]=(unsigned char)(pal|(t>>12)); zb[7]=(char)zval; } }\r
- if(collision) Pico.video.status|=0x20;\r
- return 0;\r
- }\r
- return 1; // Tile blank\r
-}\r
+TileNormMaker(TileNormSH_onlyop_lp, pix_sh_onlyop)\r
+TileFlipMaker(TileFlipSH_onlyop_lp, pix_sh_onlyop)\r
\r
+#endif\r
\r
-#define sh_pixZ(x) \\r
- if(t) { \\r
- if(zb[x]) collision=1; \\r
- if(zval>zb[x]) { \\r
- if (t==0xe) { pd[x]=(unsigned char)((pd[x]&0x3f)|0x80); /* hilight */ } \\r
- else if(t==0xf) { pd[x]=(unsigned char)((pd[x]&0x3f)|0xc0); /* shadow */ } \\r
- else { zb[x]=(char)zval; pd[x]=(unsigned char)(pal|t); } \\r
- } \\r
- }\r
+// draw a sprite pixel (AS)\r
+#define pix_as(x) \\r
+ if (t && !(pd[x]&0x80)) pd[x]=pal|t\r
\r
-static int TileNormZSH(int sx,int addr,int pal,int zval)\r
-{\r
- unsigned int pack=0; unsigned int t=0;\r
- unsigned char *pd = HighCol+sx;\r
- char *zb = HighSprZ+sx;\r
- int collision = 0;\r
+TileNormMaker(TileNormAS, pix_as)\r
+TileFlipMaker(TileFlipAS, pix_as)\r
\r
- pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
- if (pack)\r
- {\r
- t=(pack&0x0000f000)>>12; sh_pixZ(0);\r
- t=(pack&0x00000f00)>> 8; sh_pixZ(1);\r
- t=(pack&0x000000f0)>> 4; sh_pixZ(2);\r
- t=(pack&0x0000000f) ; sh_pixZ(3);\r
- t=(pack&0xf0000000)>>28; sh_pixZ(4);\r
- t=(pack&0x0f000000)>>24; sh_pixZ(5);\r
- t=(pack&0x00f00000)>>20; sh_pixZ(6);\r
- t=(pack&0x000f0000)>>16; sh_pixZ(7);\r
- if(collision) Pico.video.status|=0x20;\r
- return 0;\r
- }\r
+// draw a sprite pixel, skip operator colors (AS)\r
+#define pix_sh_as_noop(x) \\r
+ if (t && t < 0xe && !(pd[x]&0x80)) pd[x]=pal|t\r
\r
- return 1; // Tile blank\r
-}\r
+TileNormMaker(TileNormAS_noop, pix_sh_as_noop)\r
+TileFlipMaker(TileFlipAS_noop, pix_sh_as_noop)\r
\r
-static int TileFlipZSH(int sx,int addr,int pal,int zval)\r
-{\r
- unsigned int pack=0; unsigned int t=0;\r
- unsigned char *pd = HighCol+sx;\r
- char *zb = HighSprZ+sx;\r
- int collision = 0;\r
+// mark pixel as sprite pixel (AS)\r
+#define pix_sh_as_onlymark(x) \\r
+ if (t) pd[x]|=0x80\r
+\r
+TileNormMaker(TileNormAS_onlymark, pix_sh_as_onlymark)\r
+TileFlipMaker(TileFlipAS_onlymark, pix_sh_as_onlymark)\r
\r
- pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
- if (pack)\r
- {\r
- t=(pack&0x000f0000)>>16; sh_pixZ(0);\r
- t=(pack&0x00f00000)>>20; sh_pixZ(1);\r
- t=(pack&0x0f000000)>>24; sh_pixZ(2);\r
- t=(pack&0xf0000000)>>28; sh_pixZ(3);\r
- t=(pack&0x0000000f) ; sh_pixZ(4);\r
- t=(pack&0x000000f0)>> 4; sh_pixZ(5);\r
- t=(pack&0x00000f00)>> 8; sh_pixZ(6);\r
- t=(pack&0x0000f000)>>12; sh_pixZ(7);\r
- if(collision) Pico.video.status|=0x20;\r
- return 0;\r
- }\r
- return 1; // Tile blank\r
-}\r
\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
// terminate the cache list\r
*ts->hc = 0;\r
+ // if oldcode wasn't changed, it means all layer is hi priority\r
+ if (oldcode == -1) rendstatus |= PDRAW_PLANE_HI_PRIO;\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
+ int pal=0,scan=DrawScanline;\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
// terminate the cache list\r
*ts->hc = 0;\r
+ if (oldcode == -1) rendstatus |= PDRAW_PLANE_HI_PRIO;\r
}\r
#endif\r
\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]&2) htab+=DrawScanline<<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
+ ts.line=(vscroll+(DrawScanline<<1))&((ymask<<1)|1);\r
ts.nametab+=(ts.line>>4)<<shift[width];\r
\r
DrawStripInterlace(&ts);\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.line=(vscroll+DrawScanline)&ymask;\r
ts.nametab+=(ts.line>>3)<<shift[width];\r
\r
- DrawStrip(&ts, sh);\r
+ DrawStrip(&ts, plane_sh, cellskip);\r
}\r
}\r
\r
static void DrawWindow(int tstart, int tend, int prio, int sh) // int *hcache\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
- int tilex=0,ty=0,nametab,code=0;\r
+ int tilex,ty,nametab,code=0;\r
int blank=-1; // The tile we know is blank\r
\r
// Find name table line:\r
if (pvid->reg[12]&1)\r
{\r
nametab=(pvid->reg[3]&0x3c)<<9; // 40-cell mode\r
- nametab+=(Scanline>>3)<<6;\r
+ nametab+=(DrawScanline>>3)<<6;\r
}\r
else\r
{\r
nametab=(pvid->reg[3]&0x3e)<<9; // 32-cell mode\r
- nametab+=(Scanline>>3)<<5;\r
+ nametab+=(DrawScanline>>3)<<5;\r
}\r
\r
tilex=tstart<<1;\r
- tend<<=1;\r
-\r
- ty=(Scanline&7)<<1; // Y-Offset into tile\r
\r
- if(!(rendstatus&2)) {\r
+ if (!(rendstatus & PDRAW_WND_DIFF_PRIO)) {\r
// check the first tile code\r
code=Pico.vram[nametab+tilex];\r
// if the whole window uses same priority (what is often the case), we may be able to skip this field\r
- if((code>>15) != prio) return;\r
+ if ((code>>15) != prio) return;\r
}\r
\r
+ tend<<=1;\r
+ ty=(DrawScanline&7)<<1; // Y-Offset into tile\r
+\r
// Draw tiles across screen:\r
- for (; tilex < tend; tilex++)\r
+ if (!sh)\r
{\r
- int addr=0,zero=0;\r
- int pal;\r
+ for (; tilex < tend; tilex++)\r
+ {\r
+ int addr=0,zero=0;\r
+ int pal;\r
+\r
+ code=Pico.vram[nametab+tilex];\r
+ if (code==blank) continue;\r
+ if ((code>>15) != prio) {\r
+ rendstatus |= PDRAW_WND_DIFF_PRIO;\r
+ continue;\r
+ }\r
\r
- code=Pico.vram[nametab+tilex];\r
- if(code==blank) continue;\r
- if((code>>15) != prio) {\r
- rendstatus|=2;\r
- continue;\r
+ pal=((code>>9)&0x30);\r
+\r
+ // Get tile address/2:\r
+ addr=(code&0x7ff)<<4;\r
+ if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip\r
+\r
+ if (code&0x0800) zero=TileFlip(8+(tilex<<3),addr,pal);\r
+ else zero=TileNorm(8+(tilex<<3),addr,pal);\r
+\r
+ if (zero) blank=code; // We know this tile is blank now\r
}\r
+ }\r
+ else\r
+ {\r
+ for (; tilex < tend; tilex++)\r
+ {\r
+ int addr=0,zero=0;\r
+ int pal;\r
+\r
+ code=Pico.vram[nametab+tilex];\r
+ if(code==blank) continue;\r
+ if((code>>15) != prio) {\r
+ rendstatus |= PDRAW_WND_DIFF_PRIO;\r
+ continue;\r
+ }\r
+\r
+ pal=((code>>9)&0x30);\r
\r
- pal=((code>>9)&0x30);\r
-\r
- if(sh) {\r
- int tmp, *zb = (int *)(HighCol+8+(tilex<<3));\r
- if(prio) {\r
- tmp = *zb;\r
- if(!(tmp&0x00000080)) tmp&=~0x000000c0; if(!(tmp&0x00008000)) tmp&=~0x0000c000;\r
- if(!(tmp&0x00800000)) tmp&=~0x00c00000; if(!(tmp&0x80000000)) tmp&=~0xc0000000;\r
- *zb++=tmp; tmp = *zb;\r
- if(!(tmp&0x00000080)) tmp&=~0x000000c0; if(!(tmp&0x00008000)) tmp&=~0x0000c000;\r
- if(!(tmp&0x00800000)) tmp&=~0x00c00000; if(!(tmp&0x80000000)) tmp&=~0xc0000000;\r
- *zb++=tmp;\r
+ if (prio) {\r
+ int *zb = (int *)(HighCol+8+(tilex<<3));\r
+ *zb++ &= 0x3f3f3f3f;\r
+ *zb &= 0x3f3f3f3f;\r
} else {\r
pal |= 0x40;\r
}\r
- }\r
\r
- // Get tile address/2:\r
- addr=(code&0x7ff)<<4;\r
- if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip\r
+ // Get tile address/2:\r
+ addr=(code&0x7ff)<<4;\r
+ if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip\r
\r
- if (code&0x0800) zero=TileFlip(8+(tilex<<3),addr,pal);\r
- else zero=TileNorm(8+(tilex<<3),addr,pal);\r
+ if (code&0x0800) zero=TileFlip(8+(tilex<<3),addr,pal);\r
+ else zero=TileNorm(8+(tilex<<3),addr,pal);\r
\r
- if (zero) blank=code; // We know this tile is blank now\r
+ if (zero) blank=code; // We know this tile is blank now\r
+ }\r
}\r
-\r
- // terminate the cache list\r
- //*hcache = 0;\r
}\r
\r
// --------------------------------------------\r
\r
-static void DrawTilesFromCache(int *hc, int sh)\r
+static void DrawTilesFromCacheShPrep(void)\r
{\r
- int code, addr, zero, dx;\r
+ // as some layer has covered whole line with hi priority tiles,\r
+ // we can process whole line and then act as if sh/hi mode was off.\r
+ int c = 320/4, *zb = (int *)(HighCol+8);\r
+ rendstatus |= PDRAW_SHHI_DONE;\r
+ while (c--)\r
+ {\r
+ *zb++ &= 0x3f3f3f3f;\r
+ }\r
+}\r
+\r
+static void DrawTilesFromCache(int *hc, int sh, int rlim)\r
+{\r
+ int code, addr, dx;\r
int pal;\r
- short blank=-1; // The tile we know is blank\r
\r
// *ts->hc++ = code | (dx<<16) | (ty<<25); // cache it\r
\r
- while((code=*hc++)) {\r
- if(!sh && (short)code == blank) continue;\r
-\r
- // Get tile address/2:\r
- addr=(code&0x7ff)<<4;\r
- addr+=(unsigned int)code>>25; // y offset into tile\r
- dx=(code>>16)&0x1ff;\r
- if(sh) {\r
- unsigned char *zb = HighCol+dx;\r
- if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;\r
- if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;\r
- if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;\r
- if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;\r
+ if (sh && (rendstatus & (PDRAW_SHHI_DONE|PDRAW_PLANE_HI_PRIO)))\r
+ {\r
+ if (!(rendstatus & PDRAW_SHHI_DONE))\r
+ DrawTilesFromCacheShPrep();\r
+ sh = 0;\r
+ }\r
+\r
+ if (!sh)\r
+ {\r
+ short blank=-1; // The tile we know is blank\r
+ while ((code=*hc++)) {\r
+ int zero;\r
+ if((short)code == blank) continue;\r
+ // Get tile address/2:\r
+ addr=(code&0x7ff)<<4;\r
+ addr+=(unsigned int)code>>25; // y offset into tile\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
}\r
+ }\r
+ else\r
+ {\r
+ while ((code=*hc++)) {\r
+ unsigned char *zb;\r
+ // Get tile address/2:\r
+ addr=(code&0x7ff)<<4;\r
+ addr+=(unsigned int)code>>25; // y offset into tile\r
+ dx=(code>>16)&0x1ff;\r
+ zb = HighCol+dx;\r
+ *zb++ &= 0x3f; *zb++ &= 0x3f; *zb++ &= 0x3f; *zb++ &= 0x3f;\r
+ *zb++ &= 0x3f; *zb++ &= 0x3f; *zb++ &= 0x3f; *zb++ &= 0x3f;\r
\r
- pal=((code>>9)&0x30);\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
+ if (code&0x0800) TileFlip(dx,addr,pal);\r
+ else TileNorm(dx,addr,pal);\r
+ }\r
+ }\r
+ return;\r
\r
- if(zero) blank=(short)code;\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
\r
// Index + 0 : hhhhvvvv ab--hhvv yyyyyyyy yyyyyyyy // a: offscreen h, b: offs. v, h: horiz. size\r
// Index + 4 : xxxxxxxx xxxxxxxx pccvhnnn nnnnnnnn // x: x coord + 8\r
\r
-static void DrawSprite(int *sprite, int **hc, int sh)\r
+static void DrawSprite(int *sprite, int sh)\r
{\r
int width=0,height=0;\r
int row=0,code=0;\r
height=(sy>>24)&7; // Width and height in tiles\r
sy=(sy<<16)>>16; // Y\r
\r
- row=Scanline-sy; // Row of the sprite we are on\r
+ row=DrawScanline-sy; // Row of the sprite we are on\r
\r
if (code&0x1000) row=(height<<3)-1-row; // Flip Y\r
\r
- tile=code&0x7ff; // Tile number\r
- tile+=row>>3; // Tile number increases going down\r
+ tile=code + (row>>3); // Tile number increases going down\r
delta=height; // Delta to increase tile by going right\r
if (code&0x0800) { tile+=delta*(width-1); delta=-delta; } // Flip X\r
\r
- tile<<=4; tile+=(row&7)<<1; // Tile address\r
-\r
- if(code&0x8000) { // high priority - cache it\r
- *(*hc)++ = (tile<<16)|((code&0x0800)<<5)|((sx<<6)&0x0000ffc0)|((code>>9)&0x30)|((sprite[0]>>16)&0xf);\r
- } else {\r
- delta<<=4; // Delta of address\r
- pal=((code>>9)&0x30)|(sh<<6);\r
-\r
- if(sh && (code&0x6000) == 0x6000) {\r
- if(code&0x0800) fTileFunc=TileFlipSH;\r
- else fTileFunc=TileNormSH;\r
- } else {\r
- if(code&0x0800) fTileFunc=TileFlip;\r
- else fTileFunc=TileNorm;\r
- }\r
-\r
- for (; width; width--,sx+=8,tile+=delta)\r
- {\r
- if(sx<=0) continue;\r
- if(sx>=328) break; // Offscreen\r
-\r
- tile&=0x7fff; // Clip tile address\r
- fTileFunc(sx,tile,pal);\r
- }\r
- }\r
-}\r
-#endif\r
-\r
-\r
-// Index + 0 : hhhhvvvv s---hhvv yyyyyyyy yyyyyyyy // s: skip flag, h: horiz. size\r
-// Index + 4 : xxxxxxxx xxxxxxxx pccvhnnn nnnnnnnn // x: x coord + 8\r
-\r
-static void DrawSpriteZ(int pack, int pack2, int shpri, int sprio)\r
-{\r
- int width=0,height=0;\r
- int row=0;\r
- int pal;\r
- int tile=0,delta=0;\r
- int sx, sy;\r
- int (*fTileFunc)(int sx,int addr,int pal,int zval);\r
-\r
- // parse the sprite data\r
- sx=pack2>>16; // X\r
- sy=(pack <<16)>>16; // Y\r
- width=pack>>28;\r
- height=(pack>>24)&7; // Width and height in tiles\r
-\r
- row=Scanline-sy; // Row of the sprite we are on\r
+ tile &= 0x7ff; tile<<=4; tile+=(row&7)<<1; // Tile address\r
+ delta<<=4; // Delta of address\r
\r
- if (pack2&0x1000) row=(height<<3)-1-row; // Flip Y\r
+ pal=(code>>9)&0x30;\r
+ pal|=sh<<6;\r
\r
- tile=pack2&0x7ff; // Tile number\r
- tile+=row>>3; // Tile number increases going down\r
- delta=height; // Delta to increase tile by going right\r
- if (pack2&0x0800) { tile+=delta*(width-1); delta=-delta; } // Flip X\r
-\r
- tile<<=4; tile+=(row&7)<<1; // Tile address\r
- delta<<=4; // Delta of address\r
- pal=((pack2>>9)&0x30);\r
- if((shpri&1)&&!(shpri&2)) pal|=0x40;\r
-\r
- shpri&=1;\r
- if((pack2&0x6000) != 0x6000) shpri = 0;\r
- shpri |= (pack2&0x0800)>>10;\r
- switch(shpri) {\r
- default:\r
- case 0: fTileFunc=TileNormZ; break;\r
- case 1: fTileFunc=TileNormZSH; break;\r
- case 2: fTileFunc=TileFlipZ; break;\r
- case 3: fTileFunc=TileFlipZSH; break;\r
+ if (sh && (code&0x6000) == 0x6000) {\r
+ if(code&0x0800) fTileFunc=TileFlipSH_noop;\r
+ else fTileFunc=TileNormSH_noop;\r
+ } else {\r
+ if(code&0x0800) fTileFunc=TileFlip;\r
+ else fTileFunc=TileNorm;\r
}\r
\r
for (; width; width--,sx+=8,tile+=delta)\r
if(sx>=328) break; // Offscreen\r
\r
tile&=0x7fff; // Clip tile address\r
- fTileFunc(sx,tile,pal,sprio);\r
+ fTileFunc(sx,tile,pal);\r
}\r
}\r
+#endif\r
\r
static void DrawSpriteInterlace(unsigned int *sprite)\r
{\r
width=(height>>2)&3; height&=3;\r
width++; height++; // Width and height in tiles\r
\r
- row=(Scanline<<1)-sy; // Row of the sprite we are on\r
+ row=(DrawScanline<<1)-sy; // Row of the sprite we are on\r
\r
code=sprite[1];\r
sx=((code>>16)&0x1ff)-0x78; // X\r
}\r
\r
\r
-static void DrawAllSpritesInterlace(int pri, int maxwidth)\r
+static void DrawAllSpritesInterlace(int pri, int sh)\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
- int i,u,table,link=0,sline=Scanline<<1;\r
+ int i,u,table,link=0,sline=DrawScanline<<1;\r
unsigned int *sprites[80]; // Sprite index\r
\r
table=pvid->reg[5]&0x7f;\r
// check if sprite is not hidden offscreen\r
sx = (sx>>16)&0x1ff;\r
sx -= 0x78; // Get X coordinate + 8\r
- if(sx <= -8*3 || sx >= maxwidth) goto nextsprite;\r
+ if(sx <= -8*3 || sx >= 328) goto nextsprite;\r
\r
// sprite is good, save it's pointer\r
sprites[i++]=sprite;\r
\r
\r
#ifndef _ASM_DRAW_C\r
-static void DrawSpritesFromCache(int *hc, int sh)\r
+// Index + 0 : hhhhvvvv ----hhvv yyyyyyyy yyyyyyyy // v, h: vert./horiz. size\r
+// Index + 4 : xxxxxxxx xxxxxxxx pccvhnnn nnnnnnnn // x: x coord + 8\r
+static void DrawSpritesSHi(unsigned char *sprited)\r
{\r
- int code, tile, sx, delta, width;\r
- int pal;\r
int (*fTileFunc)(int sx,int addr,int pal);\r
+ unsigned char *p;\r
+ int cnt;\r
+\r
+ cnt = sprited[0] & 0x7f;\r
+ if (cnt == 0) return;\r
\r
- // *(*hc)++ = (tile<<16)|((code&0x0800)<<5)|((sx<<6)&0x0000ffc0)|((code>>9)&0x30)|((sprite[0]>>24)&0xf);\r
-\r
- while((code=*hc++)) {\r
- pal=(code&0x30);\r
- delta=code&0xf;\r
- width=delta>>2; delta&=3;\r
- width++; delta++; // Width and height in tiles\r
- if (code&0x10000) delta=-delta; // Flip X\r
- delta<<=4;\r
- tile=((unsigned int)code>>17)<<1;\r
- sx=(code<<16)>>22; // sx can be negative (start offscreen), so sign extend\r
-\r
- if(sh && pal == 0x30) { //\r
- if(code&0x10000) fTileFunc=TileFlipSH;\r
- else fTileFunc=TileNormSH;\r
+ p = &sprited[3];\r
+\r
+ // Go through sprites backwards:\r
+ for (cnt--; cnt >= 0; cnt--)\r
+ {\r
+ int *sprite, code, pal, tile, sx, sy;\r
+ int offs, delta, width, height, row;\r
+\r
+ offs = (p[cnt] & 0x7f) * 2;\r
+ sprite = HighPreSpr + offs;\r
+ code = sprite[1];\r
+ pal = (code>>9)&0x30;\r
+\r
+ if (pal == 0x30)\r
+ {\r
+ if (code & 0x8000) // hi priority\r
+ {\r
+ if (code&0x800) fTileFunc=TileFlipSH;\r
+ else fTileFunc=TileNormSH;\r
+ } else {\r
+ if (code&0x800) fTileFunc=TileFlipSH_onlyop_lp;\r
+ else fTileFunc=TileNormSH_onlyop_lp;\r
+ }\r
} else {\r
- if(code&0x10000) fTileFunc=TileFlip;\r
- else fTileFunc=TileNorm;\r
+ if (!(code & 0x8000)) continue; // non-operator low sprite, already drawn\r
+ if (code&0x800) fTileFunc=TileFlip;\r
+ else fTileFunc=TileNorm;\r
}\r
\r
+ // parse remaining sprite data\r
+ sy=sprite[0];\r
+ sx=code>>16; // X\r
+ width=sy>>28;\r
+ height=(sy>>24)&7; // Width and height in tiles\r
+ sy=(sy<<16)>>16; // Y\r
+\r
+ row=DrawScanline-sy; // Row of the sprite we are on\r
+\r
+ if (code&0x1000) row=(height<<3)-1-row; // Flip Y\r
+\r
+ tile=code + (row>>3); // Tile number increases going down\r
+ delta=height; // Delta to increase tile by going right\r
+ if (code&0x0800) { tile+=delta*(width-1); delta=-delta; } // Flip X\r
+\r
+ tile &= 0x7ff; tile<<=4; tile+=(row&7)<<1; // Tile address\r
+ delta<<=4; // Delta of address\r
+\r
for (; width; width--,sx+=8,tile+=delta)\r
{\r
if(sx<=0) continue;\r
}\r
#endif\r
\r
+static void DrawSpritesHiAS(unsigned char *sprited, int sh)\r
+{\r
+ int (*fTileFunc)(int sx,int addr,int pal);\r
+ unsigned char *p;\r
+ int entry, cnt, sh_cnt = 0;\r
+\r
+ cnt = sprited[0] & 0x7f;\r
+ if (cnt == 0) return;\r
+\r
+ p = &sprited[3];\r
+\r
+ // Go through sprites:\r
+ for (entry = 0; entry < cnt; entry++)\r
+ {\r
+ int *sprite, code, pal, tile, sx, sy;\r
+ int offs, delta, width, height, row;\r
+\r
+ offs = (p[entry] & 0x7f) * 2;\r
+ sprite = HighPreSpr + offs;\r
+ code = sprite[1];\r
+ pal = (code>>9)&0x30;\r
+\r
+ if (code & 0x8000) // hi priority\r
+ {\r
+ if (sh && pal == 0x30)\r
+ {\r
+ if (code&0x800) fTileFunc=TileFlipAS_noop;\r
+ else fTileFunc=TileNormAS_noop;\r
+ } else {\r
+ if (code&0x800) fTileFunc=TileFlipAS;\r
+ else fTileFunc=TileNormAS;\r
+ }\r
+ } else {\r
+ if (code&0x800) fTileFunc=TileFlipAS_onlymark;\r
+ else fTileFunc=TileNormAS_onlymark;\r
+ }\r
+ if (sh && pal == 0x30)\r
+ p[sh_cnt++] = offs / 2; // re-save for sh/hi pass\r
+\r
+ // parse remaining sprite data\r
+ sy=sprite[0];\r
+ sx=code>>16; // X\r
+ width=sy>>28;\r
+ height=(sy>>24)&7; // Width and height in tiles\r
+ sy=(sy<<16)>>16; // Y\r
+\r
+ row=DrawScanline-sy; // Row of the sprite we are on\r
+\r
+ if (code&0x1000) row=(height<<3)-1-row; // Flip Y\r
+\r
+ tile=code + (row>>3); // Tile number increases going down\r
+ delta=height; // Delta to increase tile by going right\r
+ if (code&0x0800) { tile+=delta*(width-1); delta=-delta; } // Flip X\r
+\r
+ tile &= 0x7ff; tile<<=4; tile+=(row&7)<<1; // Tile address\r
+ delta<<=4; // Delta of address\r
+\r
+ pal |= 0x80;\r
+ for (; width; width--,sx+=8,tile+=delta)\r
+ {\r
+ if(sx<=0) continue;\r
+ if(sx>=328) break; // Offscreen\r
+\r
+ tile&=0x7fff; // Clip tile address\r
+ fTileFunc(sx,tile,pal);\r
+ }\r
+ }\r
+\r
+ if (!sh || !(sprited[1]&SPRL_MAY_HAVE_OP)) return;\r
+\r
+ /* nasty 1: remove 'sprite' flags */\r
+ {\r
+ int c = 320/4, *zb = (int *)(HighCol+8);\r
+ while (c--)\r
+ {\r
+ *zb++ &= 0x7f7f7f7f;\r
+ }\r
+ }\r
+\r
+ /* nasty 2: sh operator pass */\r
+ sprited[0] = sh_cnt;\r
+ DrawSpritesSHi(sprited);\r
+}\r
+\r
\r
// Index + 0 : ----hhvv -lllllll -------y yyyyyyyy\r
// Index + 4 : -------x xxxxxxxx pccvhnnn nnnnnnnn\r
// v\r
-// Index + 0 : hhhhvvvv ab--hhvv yyyyyyyy yyyyyyyy // a: offscreen h, b: offs. v, h: horiz. size\r
+// Index + 0 : hhhhvvvv ----hhvv yyyyyyyy yyyyyyyy // v, h: vert./horiz. size\r
// Index + 4 : xxxxxxxx xxxxxxxx pccvhnnn nnnnnnnn // x: x coord + 8\r
\r
-static void PrepareSprites(int full)\r
+void PrepareSprites(int full)\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
- int u=0,link=0,sblocks=0;\r
+ int u,link=0,sh;\r
int table=0;\r
int *pd = HighPreSpr;\r
+ int max_lines = 224, max_sprites = 80, max_width = 328;\r
+ int max_line_sprites = 20; // 20 sprites, 40 tiles\r
+\r
+ if (!(Pico.video.reg[12]&1))\r
+ max_sprites = 64, max_line_sprites = 16, max_width = 264;\r
+ if (PicoOpt & POPT_DIS_SPRITE_LIM)\r
+ max_line_sprites = MAX_LINE_SPRITES;\r
+\r
+ if (pvid->reg[1]&8) max_lines = 240;\r
+ sh = Pico.video.reg[0xC]&8; // shadow/hilight?\r
\r
table=pvid->reg[5]&0x7f;\r
if (pvid->reg[12]&1) table&=0x7e; // Lowest bit 0 in 40-cell mode\r
{\r
int pack;\r
// updates: tilecode, sx\r
- for (u=0; u < 80 && (pack = *pd); u++, pd+=2)\r
+ for (u=0; u < max_sprites && (pack = *pd); u++, pd+=2)\r
{\r
unsigned int *sprite;\r
- int code, code2, sx, sy, skip=0;\r
+ int code2, sx, sy, height;\r
\r
sprite=(unsigned int *)(Pico.vram+((table+(link<<2))&0x7ffc)); // Find sprite\r
\r
// parse sprite info\r
- code = sprite[0];\r
code2 = sprite[1];\r
- code2 &= ~0xfe000000;\r
- code2 -= 0x00780000; // Get X coordinate + 8 in upper 16 bits\r
- sx = code2>>16;\r
-\r
- if((sx <= 8-((pack>>28)<<3) && sx >= -0x76) || sx >= 328) skip=1<<23;\r
- else if ((sy = (pack<<16)>>16) < 240 && sy > -32) {\r
- int sbl = (2<<(pack>>28))-1;\r
- sblocks |= sbl<<(sy>>3);\r
+ sx = (code2>>16)&0x1ff;\r
+ sx -= 0x78; // Get X coordinate + 8\r
+ sy = (pack << 16) >> 16;\r
+ height = (pack >> 24) & 0xf;\r
+\r
+ if (sy < max_lines && sy + (height<<3) > DrawScanline && // sprite onscreen (y)?\r
+ (sx > -24 || sx < max_width)) // onscreen x\r
+ {\r
+ int y = (sy >= DrawScanline) ? sy : DrawScanline;\r
+ int entry = ((pd - HighPreSpr) / 2) | ((code2>>8)&0x80);\r
+ for (; y < sy + (height<<3) && y < max_lines; y++)\r
+ {\r
+ int i, cnt;\r
+ cnt = HighLnSpr[y][0] & 0x7f;\r
+ if (cnt >= max_line_sprites) continue; // sprite limit?\r
+\r
+ for (i = 0; i < cnt; i++)\r
+ if (((HighLnSpr[y][3+i] ^ entry) & 0x7f) == 0) goto found;\r
+\r
+ // this sprite was previously missing\r
+ HighLnSpr[y][3+cnt] = entry;\r
+ HighLnSpr[y][0] = cnt + 1;\r
+found:;\r
+ if (entry & 0x80)\r
+ HighLnSpr[y][1] |= SPRL_HAVE_HI;\r
+ else HighLnSpr[y][1] |= SPRL_HAVE_LO;\r
+ }\r
}\r
\r
- *pd = (pack&~(1<<23))|skip;\r
- *(pd+1) = code2;\r
+ code2 &= ~0xfe000000;\r
+ code2 -= 0x00780000; // Get X coordinate + 8 in upper 16 bits\r
+ pd[1] = code2;\r
\r
// Find next sprite\r
- link=(code>>16)&0x7f;\r
- if(!link) break; // End of sprites\r
+ link=(sprite[0]>>16)&0x7f;\r
+ if (!link) break; // End of sprites\r
}\r
- SpriteBlocks |= sblocks;\r
}\r
else\r
{\r
- for (; u < 80; u++)\r
+ for (u = 0; u < max_lines; u++)\r
+ *((int *)&HighLnSpr[u][0]) = 0;\r
+\r
+ for (u = 0; u < max_sprites; u++)\r
{\r
unsigned int *sprite;\r
- int code, code2, sx, sy, hv, height, width, skip=0, sx_min;\r
+ int code, code2, sx, sy, hv, height, width;\r
\r
sprite=(unsigned int *)(Pico.vram+((table+(link<<2))&0x7ffc)); // Find sprite\r
\r
hv = (code>>24)&0xf;\r
height = (hv&3)+1;\r
\r
- if(sy > 240 || sy + (height<<3) <= 0) skip|=1<<22;\r
-\r
width = (hv>>2)+1;\r
code2 = sprite[1];\r
sx = (code2>>16)&0x1ff;\r
sx -= 0x78; // Get X coordinate + 8\r
- sx_min = 8-(width<<3);\r
-\r
- if((sx <= sx_min && sx >= -0x76) || sx >= 328) skip|=1<<23;\r
- else if (sx > sx_min && !skip) {\r
- int sbl = (2<<height)-1;\r
- int shi = sy>>3;\r
- if(shi < 0) shi=0; // negative sy\r
- sblocks |= sbl<<shi;\r
+\r
+ if (sy < max_lines && sy + (height<<3) > DrawScanline) // sprite onscreen (y)?\r
+ {\r
+ int entry, y, sx_min, onscr_x, maybe_op = 0;\r
+\r
+ sx_min = 8-(width<<3);\r
+ onscr_x = sx_min < sx && sx < max_width;\r
+ if (sh && (code2 & 0x6000) == 0x6000)\r
+ maybe_op = SPRL_MAY_HAVE_OP;\r
+\r
+ entry = ((pd - HighPreSpr) / 2) | ((code2>>8)&0x80);\r
+ y = (sy >= DrawScanline) ? sy : DrawScanline;\r
+ for (; y < sy + (height<<3) && y < max_lines; y++)\r
+ {\r
+ unsigned char *p = &HighLnSpr[y][0];\r
+ int cnt = p[0];\r
+ if (cnt >= max_line_sprites) continue; // sprite limit?\r
+\r
+ if (p[2] >= max_line_sprites*2) { // tile limit?\r
+ p[0] |= 0x80;\r
+ continue;\r
+ }\r
+ p[2] += width;\r
+\r
+ if (sx == -0x78) {\r
+ if (cnt > 0)\r
+ p[0] |= 0x80; // masked, no more sprites for this line\r
+ continue;\r
+ }\r
+ // must keep the first sprite even if it's offscreen, for masking\r
+ if (cnt > 0 && !onscr_x) continue; // offscreen x\r
+\r
+ p[3+cnt] = entry;\r
+ p[0] = cnt + 1;\r
+ p[1] |= (entry & 0x80) ? SPRL_HAVE_HI : SPRL_HAVE_LO;\r
+ p[1] |= maybe_op; // there might be op sprites on this line\r
+ if (cnt > 0 && (code2 & 0x8000) && !(p[3+cnt-1]&0x80))\r
+ p[1] |= SPRL_LO_ABOVE_HI;\r
+ }\r
}\r
\r
- *pd++ = (width<<28)|(height<<24)|skip|(hv<<16)|((unsigned short)sy);\r
+ *pd++ = (width<<28)|(height<<24)|(hv<<16)|((unsigned short)sy);\r
*pd++ = (sx<<16)|((unsigned short)code2);\r
\r
// Find next sprite\r
link=(code>>16)&0x7f;\r
- if(!link) break; // End of sprites\r
+ if (!link) break; // End of sprites\r
+ }\r
+ *pd = 0;\r
+\r
+#if 0\r
+ for (u = 0; u < max_lines; u++)\r
+ {\r
+ int y;\r
+ printf("c%03i: %2i, %2i: ", u, HighLnSpr[u][0] & 0x7f, HighLnSpr[u][2]);\r
+ for (y = 0; y < HighLnSpr[u][0] & 0x7f; y++)\r
+ printf(" %i", HighLnSpr[u][y+3]);\r
+ printf("\n");\r
}\r
- SpriteBlocks = sblocks;\r
- *pd = 0; // terminate\r
+#endif\r
}\r
}\r
\r
-static void DrawAllSprites(int *hcache, int maxwidth, int prio, int sh)\r
+#ifndef _ASM_DRAW_C\r
+static void DrawAllSprites(unsigned char *sprited, int prio, int sh)\r
{\r
- int i,u,n;\r
- int sx1seen=0; // sprite with x coord 1 or 0 seen\r
- int ntiles = 0; // tile counter for sprite limit emulation\r
- int *sprites[40]; // Sprites to draw in fast mode\r
- int *ps, pack, rs = rendstatus, scan=Scanline;\r
-\r
- if(rs&8) {\r
- DrawAllSpritesInterlace(prio, maxwidth);\r
- return;\r
- }\r
- if(rs&0x11) {\r
- //dprintf("PrepareSprites(%i) [%i]", (rs>>4)&1, scan);\r
- PrepareSprites(rs&0x10);\r
- rendstatus=rs&~0x11;\r
+ int rs = rendstatus;\r
+ unsigned char *p;\r
+ int cnt;\r
+\r
+ if (rs & (PDRAW_SPRITES_MOVED|PDRAW_DIRTY_SPRITES)) {\r
+ //elprintf(EL_STATUS, "PrepareSprites(%i)", (rs>>4)&1);\r
+ PrepareSprites(rs & PDRAW_DIRTY_SPRITES);\r
+ rendstatus = rs & ~(PDRAW_SPRITES_MOVED|PDRAW_DIRTY_SPRITES);\r
}\r
- if (!(SpriteBlocks & (1<<(scan>>3)))) return;\r
-\r
- if(((rs&4)||sh)&&prio==0)\r
- memset(HighSprZ, 0, 328);\r
- if(!(rs&4)&&prio) {\r
- if(hcache[0]) DrawSpritesFromCache(hcache, sh);\r
- return;\r
- }\r
-\r
- ps = HighPreSpr;\r
-\r
- // Index + 0 : hhhhvvvv ab--hhvv yyyyyyyy yyyyyyyy // a: offscreen h, b: offs. v, h: horiz. size\r
- // Index + 4 : xxxxxxxx xxxxxxxx pccvhnnn nnnnnnnn // x: x coord + 8\r
-\r
- for(i=u=n=0; (pack = *ps) && n < 20; ps+=2, u++)\r
- {\r
- int sx, sy, row, pack2;\r
-\r
- if(pack & 0x00400000) continue;\r
-\r
- // get sprite info\r
- pack2 = *(ps+1);\r
- sx = pack2>>16;\r
- sy = (pack <<16)>>16;\r
- row = scan-sy;\r
-\r
- //dprintf("x: %i y: %i %ix%i", sx, sy, (pack>>28)<<3, (pack>>21)&0x38);\r
\r
- if(sx == -0x77) sx1seen|=1; // for masking mode 2\r
+ cnt = sprited[0] & 0x7f;\r
+ if (cnt == 0) return;\r
\r
- // check if it is on this line\r
- if(row < 0 || row >= ((pack>>21)&0x38)) continue; // no\r
- n++; // number of sprites on this line (both visible and hidden, max is 20) [broken]\r
-\r
- // sprite limit\r
- ntiles += pack>>28;\r
- if(ntiles > 40) break;\r
-\r
- if(pack & 0x00800000) continue;\r
-\r
- // masking sprite?\r
- if(sx == -0x78) {\r
- if(!(sx1seen&1) || sx1seen==3) {\r
- break; // this sprite is not drawn and remaining sprites are masked\r
- }\r
- if((sx1seen>>8) == 0) sx1seen=(i+1)<<8;\r
- continue;\r
- }\r
- else if(sx == -0x77) {\r
- // masking mode2 (Outrun, Galaxy Force II, Shadow of the beast)\r
- if(sx1seen>>8) { i=(sx1seen>>8)-1; break; } // seen both 0 and 1\r
- sx1seen |= 2;\r
- continue;\r
- }\r
-\r
- // accurate sprites\r
- //dprintf("P:%i",((sx>>15)&1));\r
- if(rs&4) {\r
- // might need to skip this sprite\r
- if((pack2&0x8000) ^ (prio<<15)) continue;\r
- DrawSpriteZ(pack,pack2,sh|(prio<<1),(char)(0x1f-n));\r
- continue;\r
- }\r
-\r
- // sprite is good, save it's pointer\r
- sprites[i++]=ps;\r
- }\r
+ p = &sprited[3];\r
\r
// Go through sprites backwards:\r
- if(!(rs&4)) {\r
- for (i--; i>=0; i--)\r
- DrawSprite(sprites[i],&hcache,sh);\r
-\r
- // terminate cache list\r
- *hcache = 0;\r
+ for (cnt--; cnt >= 0; cnt--)\r
+ {\r
+ int offs;\r
+ if ((p[cnt] >> 7) != prio) continue;\r
+ offs = (p[cnt]&0x7f) * 2;\r
+ DrawSprite(HighPreSpr + offs, sh);\r
}\r
}\r
\r
\r
// --------------------------------------------\r
\r
-#ifndef _ASM_DRAW_C\r
static void BackFill(int reg7, int sh)\r
{\r
- unsigned int back=0;\r
- unsigned int *pd=NULL,*end=NULL;\r
+ unsigned int back;\r
\r
// Start with a blank scanline (background colour):\r
back=reg7&0x3f;\r
back|=back<<8;\r
back|=back<<16;\r
\r
- pd= (unsigned int *)(HighCol+8);\r
- end=(unsigned int *)(HighCol+8+320);\r
-\r
- do { pd[0]=pd[1]=pd[2]=pd[3]=back; pd+=4; } while (pd<end);\r
+ memset32((int *)(HighCol+8), back, 320/4);\r
}\r
#endif\r
\r
\r
unsigned short HighPal[0x100];\r
\r
+void PicoDoHighPal555(int sh)\r
+{\r
+ unsigned short *pal=HighPal;\r
+ int i, t;\r
+\r
+ Pico.m.dirtyPal = 0;\r
+\r
+ {\r
+ unsigned int *spal=(void *)Pico.cram;\r
+ unsigned int *dpal=(void *)HighPal;\r
+ for (i = 0x3f/2; i >= 0; i--)\r
+#ifdef USE_BGR555\r
+ dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);\r
+#else\r
+ dpal[i] = ((spal[i]&0x000f000f)<<12)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)>>7);\r
+#endif\r
+ }\r
+\r
+ if (sh)\r
+ {\r
+ // shadowed pixels\r
+ for (i = 0x3f; i >= 0; i--)\r
+ pal[0x40|i] = pal[0xc0|i] = (unsigned short)((pal[i]>>1)&0x738e);\r
+ // hilighted pixels\r
+ for (i = 0x3f; i >= 0; i--) {\r
+ t=pal[i]&0xe71c;t+=0x4208;if(t&0x20)t|=0x1c;if(t&0x800)t|=0x700;if(t&0x10000)t|=0xe000;t&=0xe71c;\r
+ pal[0x80|i]=(unsigned short)t;\r
+ }\r
+ }\r
+}\r
+\r
#ifndef _ASM_DRAW_C\r
static void FinalizeLineBGR444(int sh)\r
{\r
unsigned short *pd=DrawLineDest;\r
unsigned char *ps=HighCol+8;\r
unsigned short *pal=Pico.cram;\r
- int len, i, t;\r
+ int len, i, t, mask=0xff;\r
\r
if (Pico.video.reg[12]&1) {\r
len = 320;\r
} else {\r
- if(!(PicoOpt&0x100)) pd+=32;\r
+ if(!(PicoOpt&POPT_DIS_32C_BORDER)) pd+=32;\r
len = 256;\r
}\r
\r
}\r
}\r
\r
+ if (!sh && (rendstatus & PDRAW_ACC_SPRITES))\r
+ mask=0x3f; // accurate sprites\r
+\r
for(i = 0; i < len; i++)\r
- pd[i] = pal[ps[i]];\r
+ pd[i] = pal[ps[i] & mask];\r
}\r
\r
\r
unsigned short *pd=DrawLineDest;\r
unsigned char *ps=HighCol+8;\r
unsigned short *pal=HighPal;\r
- int len, i, t, dirtyPal = Pico.m.dirtyPal;\r
+ int len;\r
\r
- if(dirtyPal) {\r
- unsigned short *ppal=Pico.cram;\r
- for(i = 0x3f; i >= 0; i--)\r
- pal[i] = (unsigned short) (((ppal[i]&0x00f)<<12)|((ppal[i]&0x0f0)<<3)|((ppal[i]&0xf00)>>7));\r
- Pico.m.dirtyPal = 0;\r
- }\r
+ if (Pico.m.dirtyPal)\r
+ PicoDoHighPal555(sh);\r
\r
if (Pico.video.reg[12]&1) {\r
len = 320;\r
} else {\r
- if(!(PicoOpt&0x100)) pd+=32;\r
+ if (!(PicoOpt&POPT_DIS_32C_BORDER)) pd+=32;\r
len = 256;\r
}\r
\r
- if(sh) {\r
- if(dirtyPal) {\r
- // shadowed pixels\r
- for(i = 0x3f; i >= 0; i--)\r
- pal[0x40|i] = pal[0xc0|i] = (unsigned short)((pal[i]>>1)&0x738e);\r
- // hilighted pixels\r
- for(i = 0x3f; i >= 0; i--) {\r
- t=pal[i]&0xe71c;t+=0x4208;if(t&0x20)t|=0x1c;if(t&0x800)t|=0x700;if(t&0x10000)t|=0xe000;t&=0xe71c;\r
- pal[0x80|i]=(unsigned short)t;\r
- }\r
- }\r
- }\r
+ {\r
+#ifndef PSP\r
+ int i, mask=0xff;\r
+ if (!sh && (rendstatus & PDRAW_ACC_SPRITES))\r
+ mask=0x3f; // accurate sprites, upper bits are priority stuff\r
\r
- for(i = 0; i < len; i++)\r
- pd[i] = pal[ps[i]];\r
+ for (i = 0; i < len; i++)\r
+ pd[i] = pal[ps[i] & mask];\r
+#else\r
+ extern void amips_clut(unsigned short *dst, unsigned char *src, unsigned short *pal, int count);\r
+ extern void amips_clut_6bit(unsigned short *dst, unsigned char *src, unsigned short *pal, int count);\r
+ if (!sh && (rendstatus & PDRAW_ACC_SPRITES))\r
+ amips_clut_6bit(pd, ps, pal, len);\r
+ else amips_clut(pd, ps, pal, len);\r
+#endif\r
+ }\r
}\r
#endif\r
\r
int len, rs = rendstatus;\r
static int dirty_count;\r
\r
- if (!sh && Pico.m.dirtyPal == 1 && Scanline < 222) {\r
+ if (!sh && !(rs & PDRAW_ACC_SPRITES) && Pico.m.dirtyPal == 1 && DrawScanline < 222)\r
+ {\r
// a hack for mid-frame palette changes\r
- if (!(rs & 0x20))\r
+ if (!(rs & PDRAW_SONIC_MODE))\r
dirty_count = 1;\r
else dirty_count++;\r
- rs |= 0x20;\r
+ rs |= PDRAW_SONIC_MODE;\r
rendstatus = rs;\r
if (dirty_count == 3) {\r
blockcpy(HighPal, Pico.cram, 0x40*2);\r
if (Pico.video.reg[12]&1) {\r
len = 320;\r
} else {\r
- if(!(PicoOpt&0x100)) pd+=32;\r
+ if (!(PicoOpt&POPT_DIS_32C_BORDER)) pd+=32;\r
len = 256;\r
}\r
\r
- if (!sh && rs & 0x20) {\r
+ if (!sh && (rs & PDRAW_SONIC_MODE)) {\r
if (dirty_count >= 11) {\r
blockcpy_or(pd, HighCol+8, len, 0x80);\r
} else {\r
}\r
}\r
\r
-void (*FinalizeLine)(int sh) = FinalizeLineBGR444;\r
+static void (*FinalizeLine)(int sh) = FinalizeLineBGR444;\r
\r
// --------------------------------------------\r
\r
+static void DrawBlankedLine(void)\r
+{\r
+ int sh=(Pico.video.reg[0xC]&8)>>3; // shadow/hilight?\r
+\r
+ if (PicoScanBegin != NULL)\r
+ PicoScanBegin(DrawScanline);\r
+\r
+ BackFill(Pico.video.reg[7], sh);\r
+\r
+ if (FinalizeLine != NULL)\r
+ FinalizeLine(sh);\r
+\r
+ if (PicoScanEnd != NULL)\r
+ PicoScanEnd(DrawScanline);\r
+}\r
+\r
static int DrawDisplay(int sh)\r
{\r
+ unsigned char *sprited = &HighLnSpr[DrawScanline][0];\r
struct PicoVideo *pvid=&Pico.video;\r
int win=0,edge=0,hvwind=0;\r
- int maxw, maxcells;\r
+ int maxw,maxcells;\r
\r
- if(pvid->reg[12]&1) {\r
+ rendstatus &= ~(PDRAW_SHHI_DONE|PDRAW_PLANE_HI_PRIO);\r
+\r
+ if (pvid->reg[12]&1) {\r
maxw = 328; maxcells = 40;\r
} else {\r
maxw = 264; maxcells = 32;\r
win=pvid->reg[0x12];\r
edge=(win&0x1f)<<3;\r
\r
- if (win&0x80) { if (Scanline>=edge) hvwind=1; }\r
- else { if (Scanline< edge) hvwind=1; }\r
+ if (win&0x80) { if (DrawScanline>=edge) hvwind=1; }\r
+ else { if (DrawScanline< 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
+ {\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
- // 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
+ /* - layer B low - */\r
+ if (PicoDrawMask & PDRAW_LAYERB_ON)\r
+ DrawLayer(1|(sh<<1), HighCacheB, 0, maxcells);\r
+ /* - layer A low - */\r
+ if (!(PicoDrawMask & PDRAW_LAYERA_ON));\r
+ else if (hvwind == 1)\r
+ DrawWindow(0, maxcells>>1, 0, sh);\r
+ else if (hvwind == 2) {\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
- DrawAllSprites(HighCacheS, maxw, 0, sh);\r
-\r
- if(HighCacheB[0]) DrawTilesFromCache(HighCacheB, sh);\r
- if(hvwind == 1)\r
+ DrawLayer(0|(sh<<1), HighCacheA, 0, maxcells);\r
+ /* - sprites low - */\r
+ if (!(PicoDrawMask & PDRAW_SPRITES_LOW_ON));\r
+ else if (rendstatus & PDRAW_INTERLACE)\r
+ DrawAllSpritesInterlace(0, sh);\r
+ else if (sprited[1] & SPRL_HAVE_LO)\r
+ DrawAllSprites(sprited, 0, sh);\r
+\r
+ /* - layer B hi - */\r
+ if ((PicoDrawMask & PDRAW_LAYERB_ON) && HighCacheB[0])\r
+ DrawTilesFromCache(HighCacheB, sh, maxw);\r
+ /* - layer A hi - */\r
+ if (!(PicoDrawMask & PDRAW_LAYERA_ON));\r
+ else 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 : maxw);\r
DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 1, sh);\r
} else\r
- if(HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh);\r
- DrawAllSprites(HighCacheS, maxw, 1, sh);\r
+ if (HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, maxw);\r
+ /* - sprites hi - */\r
+ if (!(PicoDrawMask & PDRAW_SPRITES_HI_ON));\r
+ else if (rendstatus & PDRAW_INTERLACE)\r
+ DrawAllSpritesInterlace(1, sh);\r
+ // AS on and have both lo/hi sprites and lo before hi sprites?\r
+ else if ((sprited[1] & 0xd0) == 0xd0 && (rendstatus & PDRAW_ACC_SPRITES))\r
+ DrawSpritesHiAS(sprited, sh);\r
+ else if (sh && (sprited[1] & SPRL_MAY_HAVE_OP))\r
+ DrawSpritesSHi(sprited);\r
+ else if (sprited[1] & SPRL_HAVE_HI)\r
+ DrawAllSprites(sprited, 1, 0);\r
+\r
+#if 0\r
+ {\r
+ int *c, a, b;\r
+ for (a = 0, c = HighCacheA; *c; c++, a++);\r
+ for (b = 0, c = HighCacheB; *c; c++, b++);\r
+ printf("%i:%03i: a=%i, b=%i\n", Pico.m.frame_count, DrawScanline, a, b);\r
+ }\r
+#endif\r
\r
return 0;\r
}\r
\r
\r
-static int Skip=0;\r
-\r
-void PicoFrameStart()\r
+PICO_INTERNAL void PicoFrameStart(void)\r
{\r
// prepare to do this frame\r
- rendstatus = (PicoOpt&0x80)>>5; // accurate sprites\r
- if(rendstatus)\r
- Pico.video.status &= ~0x0020;\r
- else Pico.video.status |= 0x0020; // sprite collision\r
- if((Pico.video.reg[12]&6) == 6) rendstatus |= 8; // interlace mode\r
- if(Pico.m.dirtyPal) Pico.m.dirtyPal = 2; // reset dirty if needed\r
+ rendstatus = 0;\r
+ if (PicoOpt & POPT_ACC_SPRITES)\r
+ rendstatus |= PDRAW_ACC_SPRITES;\r
+ if ((Pico.video.reg[12]&6) == 6)\r
+ rendstatus |= PDRAW_INTERLACE; // interlace mode\r
+\r
+ if (Pico.m.dirtyPal) Pico.m.dirtyPal = 2; // reset dirty if needed\r
\r
+ DrawScanline=0;\r
PrepareSprites(1);\r
- Skip=0;\r
+ skip_next_line=0;\r
}\r
\r
-int PicoLine(int scan)\r
+static void PicoLine(void)\r
{\r
int sh;\r
- if (Skip>0) { Skip--; return 0; } // Skip rendering lines\r
+ if (skip_next_line>0) { skip_next_line--; return; } // skip rendering lines\r
\r
- Scanline=scan;\r
sh=(Pico.video.reg[0xC]&8)>>3; // shadow/hilight?\r
\r
+ if (PicoScanBegin != NULL)\r
+ skip_next_line = PicoScanBegin(DrawScanline);\r
+\r
// Draw screen:\r
BackFill(Pico.video.reg[7], sh);\r
if (Pico.video.reg[1]&0x40)\r
DrawDisplay(sh);\r
\r
- FinalizeLine(sh);\r
- //if (SpriteBlocks & (1<<(scan>>3))) for (sh=0; sh < 30; sh++) DrawLineDest[sh] = 0xf;\r
-\r
- Skip=PicoScan(Scanline,DrawLineDest);\r
+ if (FinalizeLine != NULL)\r
+ FinalizeLine(sh);\r
\r
- return 0;\r
+ if (PicoScanEnd != NULL)\r
+ PicoScanEnd(DrawScanline);\r
}\r
\r
+void PicoDrawSync(int to, int blank_last_line)\r
+{\r
+ for (; DrawScanline < to; DrawScanline++)\r
+ {\r
+#if !CAN_HANDLE_240_LINES\r
+ if (DrawScanline >= 224) break;\r
+#endif\r
+ PicoLine();\r
+ }\r
+\r
+#if !CAN_HANDLE_240_LINES\r
+ if (DrawScanline >= 224) DrawScanline = 240, return;\r
+#endif\r
+\r
+ // last line\r
+ if (DrawScanline <= to)\r
+ {\r
+ if (blank_last_line)\r
+ DrawBlankedLine();\r
+ else PicoLine();\r
+ DrawScanline++;\r
+ }\r
+}\r
\r
void PicoDrawSetColorFormat(int which)\r
{\r
- if (which == 2)\r
- FinalizeLine = FinalizeLine8bit;\r
- else if (which == 1)\r
- FinalizeLine = FinalizeLineRGB555;\r
- else FinalizeLine = FinalizeLineBGR444;\r
+ switch (which)\r
+ {\r
+ case 2: FinalizeLine = FinalizeLine8bit; break;\r
+ case 1: FinalizeLine = FinalizeLineRGB555; break;\r
+ case 0: FinalizeLine = FinalizeLineBGR444; break;\r
+ default:FinalizeLine = NULL; break;\r
+ }\r
+#if OVERRIDE_HIGHCOL\r
+ if (which) HighCol=DefHighCol;\r
+#endif\r
}\r
+\r
notaz.gp2x.de / picodrive.git / blobdiff