#include "src/lib/planar.h"\r
\r
global_game_variables_t gvar;\r
-bitmap_t bmp;\r
-planar_buf_t *p;\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
int i;\r
word start;\r
int plane;\r
- float t1, t2;\r
+ float t1, t2, tpee;\r
int x,y;\r
word px,py;\r
sword baka;\r
baka = 1;\r
\r
bmp = bitmapLoadPcx(bakapeee);\r
- p = planar_buf_from_bitmap(&bmp);\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
\r
start = *clockw;\r
// oldDrawBmp(VGA, 20, 20, &bmp, 0);\r
for(i=0; i<100 ;i++) {\r
- modexDrawBmp(&gvar.video.page[0], 32, 32, &bmp);\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
// t2 = (*clockw-start)/18.2;\r
start = *clockw;\r
for(i=0; i<100 ;i++) {\r
- DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);\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
+ modexDrawPBuf(&gvar.video.page[0], 64, 64, &ptmpnp, 0);\r
while(!kbhit())\r
{\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
/* 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(py=0; py < p->height; py++) {\r
- for(px=0; px < p->pwidth; px++) {\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,"Project 16 planrpcx.exe. This is just a test file!\n");\r
- fprintf(stderr,"version %s\n", VERSION);\r
- fprintf(stderr,"%d\n", sizeof(p->plane));\r
- fprintf(stderr,"pw=%d\n", p->width);\r
- fprintf(stderr,"ph=%d\n", p->height);\r
- fprintf(stderr,"ppw=%d\n", p->pwidth);\r
- fprintf(stderr,"%d\n", sizeof(bmp));\r
- fprintf(stderr,"%dx%d\n", gvar.video.page[0].sw-(p->width), gvar.video.page[0].sh-(p->height));\r
- planar_buf_free(p);\r
- free(bakapeee);\r
- fprintf(stderr, "modexDrawBmp: %f\n", t1);\r
- fprintf(stderr, "DrawPBuf: %f\n", t2);\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
col=0x0d, bgcol=0;\r
- for(i=0; i<8; i++)\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
+ //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
fprintf(stderr, " j>>=%u\n", j);\r
}\r
//fprintf(stderr, "\n");\r
- }\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
}\r