#include "src/lib/planar.h"\r
\r
global_game_variables_t gvar;\r
-\r
-void\r
-DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, byte sprite)\r
-{\r
- word plane;\r
- word px, py;\r
- word offset;\r
- word i;\r
-\r
- // TODO Make this fast. It's SLOOOOOOW\r
- for(plane=0; plane < 4; plane++) {\r
- i=0;\r
- modexSelectPlane(PLANE(plane+x));\r
- for(px = plane; px < p->width; px+=4) {\r
- offset=px;\r
- for(py=0; py<p->height/2; py++) {\r
- //SELECT_ALL_PLANES();\r
- if(!sprite || p->plane[offset])\r
- page->data = &(p->plane[offset][i++]);\r
- offset+=p->width;\r
- offset++;\r
- }\r
- }\r
- }\r
-}\r
-\r
+bitmap_t bmp, ptmpbt;\r
+//planar_buf_t *p, *ptmp;\r
+planar_buf_t pnp, ptmpnp;\r
\r
void main(int argc, char *argv[])\r
{\r
- bitmap_t bmp;\r
- planar_buf_t *p;\r
int i;\r
- //word start;\r
+ word start;\r
int plane;\r
- //float t1, t2;\r
+ float t1, t2, tpee;\r
int x,y;\r
- sword bakapee;\r
+ word px,py;\r
+ sword baka;\r
+ char *bakapeee;\r
+\r
+ byte l[1024];\r
+ word j,chw,xp,col,bgcol;\r
+\r
+\r
+ bakapeee = malloc(64);\r
+\r
+ if(argv[1]) bakapeee = argv[1];\r
+ else bakapeee = "data/koishi~.pcx";\r
+\r
+// if(argv[2]) baka = atoi(argv[2]);\r
+// else\r
+baka = 1;\r
\r
- if(argv[1]) bakapee = atoi(argv[1]);\r
- else bakapee = 1;\r
-//0000 bmp = bitmapLoadPcx("data/koishi~~.pcx");\r
-// bmp = bitmapLoadPcx("data/chikyuu.pcx");\r
- bmp = bitmapLoadPcx("data/koishi^^.pcx");\r
- p = planar_buf_from_bitmap(&bmp);\r
- VGAmodeX(bakapee, &gvar);\r
+ bmp = bitmapLoadPcx(bakapeee);\r
+ //p = planar_buf_from_bitmap(&bmp);\r
+ pnp = planar_buf_from_bitmap0(&bmp);\r
+ ptmpbt = bitmapLoadPcx("data/ptmp.pcx");\r
+ //ptmp = planar_buf_from_bitmap(&ptmpbt);\r
+ ptmpnp = planar_buf_from_bitmap0(&ptmpbt);\r
+ VGAmodeX(baka, &gvar);\r
gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
- gvar.video.page[0].sw+=32;\r
- gvar.video.page[0].sh+=32;\r
\r
/* fix up the palette and everything */\r
modexPalUpdate1(bmp.palette);\r
\r
/* clear and draw one sprite and one bitmap */\r
- modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].sw, gvar.video.page[0].sh, 1);\r
+ modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].sw, gvar.video.page[0].sh, 0);\r
\r
/* update display~*/\r
gvar.video.page[0].dx+=32;\r
modexShowPage(&gvar.video.page[0]);\r
\r
/* non sprite comparison */\r
-// start = *clockw;\r
+ start = *clockw;\r
// oldDrawBmp(VGA, 20, 20, &bmp, 0);\r
-\r
-// start = *clockw;\r
-//0000 modexDrawBmp(&gvar.video.page[0], 20, 20, &bmp);\r
-// modexDrawBmp(&gvar.video.page[0], 160, 120, &bmp);\r
-// t1 = (*clockw-start) /18.2;\r
-\r
+ for(i=0; i<100 ;i++) {\r
+// modexDrawBmpPBufRegion (&gvar.video.page[0], 32, 32, 0, 0, pnp.width, pnp.height, &pnp);\r
+ modexDrawBmpPBuf (&gvar.video.page[0], 32, 32, &pnp);\r
+ }\r
+ t1 = (*clockw-start) /18.2;\r
// start = *clockw;\r
-//0000 modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 20, 20, 128, 20, 64, 64);\r
// modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 0, 0, 0, 0, 320, 240);\r
// t2 = (*clockw-start)/18.2;\r
-\r
-\r
-// start = *clockw;\r
-// oldDrawBmp(VGA, 20, 20, &bmp, 1);\r
-\r
-\r
-// start = *clockw;\r
-//0000 modexDrawSprite(&gvar.video.page[0], 20, 20, &bmp);\r
-// modexDrawSprite(&gvar.video.page[0], 160, 120, &bmp);\r
- //_fmemset(MK_FP(0xA000, 0), (int)p->plane, gvar.video.page[0].sw*(gvar.video.page[0].sh*2));\r
- //modexDrawBmp(&gvar.video.page[0], 0, 0, &bmp);\r
+ start = *clockw;\r
+ for(i=0; i<100 ;i++) {\r
+ modexDrawPBuf(&gvar.video.page[0], 0, 0, &pnp, 0);\r
+ }\r
+ t2 = (*clockw-start) /18.2;\r
+ getch();\r
+ modexPalUpdate1(ptmpbt.palette);\r
+ modexDrawBmpPBufRegion(&gvar.video.page[0], 64, 64, 48, 32, 24, 32, &ptmpnp);\r
while(!kbhit())\r
{\r
- DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);\r
}\r
VGAmodeX(0, &gvar);\r
- /*printf("\nmain=%Fp\n\n", &i);\r
- printf("bmp.data=%Fp\n", bmp.data);\r
- printf("*bmp.data=%Fp\n", *(bmp.data));\r
- printf("&bmp.data=%Fp\n", &(bmp.data));*/\r
-\r
- printf("\n%d\n", sizeof(p->plane));\r
- printf("%d\n", sizeof(bmp));\r
\r
/* print out the contents of each plane */\r
for(plane=0; plane < 4; plane++) {\r
i=0;\r
printf("Plane %d\n", plane);\r
- for(y=0; y < p->height; y++) {\r
- for(x=0; x < p->pwidth; x++) {\r
- printf("%02X ", (int) p->plane[plane][i++]);\r
+ for(py=0; py < ptmpnp.height; py++) {\r
+ for(px=0; px < ptmpnp.pwidth; px++) {\r
+ printf("%02X ", (int) ptmpnp.plane[plane][i++]);\r
}\r
printf("\n");\r
}\r
}\r
- fprintf(stderr, "\n");\r
-// fprintf(stderr, "CPU to VGA: %f\n", t1);\r
-// fprintf(stderr, "VGA to VGA: %f\n", t2);\r
+ col=0x0d, bgcol=0;\r
+ /*for(i=0; i<8; i++)\r
+ {\r
+ //modexSelectPlane(PLANE(x));\r
+ //j=1<<8;\r
+ //*bakapee=(l[i] & j ? col:bgcol);\r
+ //_fmemcpy(page->data + (((page->width/4) * (y+page->dy+i)) + ((x+page->dx+chw) / 4)), bakapee, 8);\r
+ j=4<<8;\r
+ fprintf(stderr, "j<<=%u\n", j);\r
+ xp=0;\r
+ while(j)\r
+ {\r
+ //modexputPixel(page, x+xp+chw, y+i, l[i] & j ? col:bgcol);\r
+ //fprintf(stderr, "%u", l[i] & j ? col:bgcol);\r
+ xp++;\r
+ j>>=4;\r
+ fprintf(stderr, " j>>=%u\n", j);\r
+ }\r
+ //fprintf(stderr, "\n");\r
+ }*/\r
+ chw += xp;\r
+ fprintf(stderr,"Project 16 planrpcx.exe. This is just a test file!\n");\r
+ fprintf(stderr,"version %s\n", VERSION);\r
+ fprintf(stderr,"%d\n", sizeof(pnp.plane));\r
+ fprintf(stderr,"pw=%d\n", pnp.width);\r
+ fprintf(stderr,"ph=%d\n", pnp.height);\r
+ fprintf(stderr,"ppw=%d\n", pnp.pwidth);\r
+ fprintf(stderr,"%d\n", sizeof(bmp));\r
+ fprintf(stderr,"%dx%d\n", gvar.video.page[0].sw-(pnp.width), gvar.video.page[0].sh-(pnp.height));\r
+ //planar_buf_free(p);\r
+ free(bakapeee);\r
+ fprintf(stderr, "modexDrawBmpPBuf: %f\n", t1);\r
+ fprintf(stderr, "modexDrawPBuf: %f\n", t2);\r
+ fprintf(stderr, "speed difference %f\n", t2/t1);\r
fprintf(stderr, "gvar.video.page[0].width: %u\n", gvar.video.page[0].width);\r
fprintf(stderr, "gvar.video.page[0].height: %u\n", gvar.video.page[0].height);\r
return;\r
projects / 16.git / blobdiff