#include <dos.h>\r
#include <string.h>\r
#include "src/lib/modex16.h"\r
-#include "src/lib/bitmap.h"\r
-#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
- int plane;\r
- int px, py, i;\r
- byte *buff;\r
-\r
- px=x;\r
- py=y;\r
- buff = _fmalloc(p->pwidth+1);\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
- for(plane=0; plane < 4; plane++) {\r
- i=0;\r
- modexSelectPlane(PLANE(plane+x));\r
- for(; y < p->height; y++) {\r
- //for(px=0; px < p->width; px++) {\r
- //printf("%02X ", (int) p->plane[plane][i++]);\r
- _fstrncpy(buff, &(p->plane[plane][i+=p->pwidth]), p->pwidth);\r
- printf("buff==%s\n", *buff);\r
- _fstrncpy(page->data + (((page->width/4) * (y+page->dy)) + ((x+page->dx) / 4)), buff, p->pwidth);\r
- //}\r
- }\r
- //getch();\r
- x=px;\r
- y=py;\r
- }\r
- _ffree(buff);\r
-}\r
+planar_buf_t p, ptmp;\r
+int i;\r
+word start;//, w;\r
+int plane;\r
+float t1, t2, t3, t4, tpee;\r
+int x,y;\r
+word px,py;\r
+sword baka;\r
+char *bakapeee;\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
- int plane;\r
- //float t1, t2;\r
- int x,y;\r
- word px,py;\r
- sword baka;\r
- //char *pee;\r
- char *bakapeee;\r
\r
+ //byte l[1024];\r
+ word j,chw,xp,col,bgcol;\r
+\r
+//w=0;\r
+//printf("%u ", w++);\r
bakapeee = malloc(64);\r
\r
- if(argv[1]) bakapeee = argv[1];\r
- else bakapeee = "data/koishi~.pcx";\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
+// if(argv[2]) baka = atoi(argv[2]);\r
+// else\r
baka = 1;\r
-//0000 bmp = bitmapLoadPcx("data/koishi~~.pcx");\r
- bmp = bitmapLoadPcx(bakapeee);\r
- //bmp = bitmapLoadPcx("data/koishi~.pcx");\r
- p = planar_buf_from_bitmap(&bmp);\r
+//fprintf(stderr, "%u ", w++);\r
+ p = planarLoadPcx(bakapeee);\r
+//fprintf(stderr, "%u ", w++);\r
+// ptmp = planarLoadPcx("data/ptmp.pcx");\r
+//fprintf(stderr, "%u ", w++);\r
+//fprintf(stderr, "^^;", w++);\r
+//getch();\r
+\r
VGAmodeX(baka, &gvar);\r
gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
\r
- /* fix up the palette and everything */\r
- modexPalUpdate1(bmp.palette);\r
+ //fix up the palette and everything\r
+ modexPalUpdate1(p.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
+ //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, 0);\r
\r
- /* update display~*/\r
+ //update display~\r
gvar.video.page[0].dx+=32;\r
gvar.video.page[0].dy+=32;\r
modexShowPage(&gvar.video.page[0]);\r
\r
- /* non sprite comparison */\r
-// start = *clockw;\r
+ //non sprite comparison\r
+ start = *clockw;\r
// oldDrawBmp(VGA, 20, 20, &bmp, 0);\r
+ for(i=0; i<100 ;i++) {\r
+ modexDrawBmpPBuf (&gvar.video.page[0], 32, 32, &p);\r
+ }\r
+ t1 = (*clockw-start) /18.2;\r
+ for(i=0; i<100 ;i++) {\r
+ modexDrawBmpPBufRegion (&gvar.video.page[0], p.width+32, 32, 0, 0, p.width, p.height, &p);\r
+ }\r
+ t2 = (*clockw-start) /18.2;\r
+ getch();\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
-// 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
-// start = *clockw;\r
-// oldDrawBmp(VGA, 20, 20, &bmp, 1);\r
-// start = *clockw;\r
-//0000 modexDrawSprite(&gvar.video.page[0], 20, 20, &bmp);\r
-// modexDrawSprite(&gvar.video.page[0], 160, 120, &bmp);\r
-//i=0;\r
-//plane=0;\r
-// _fmemset(VGA, (int) p->plane[plane++][i++], p->width*p->height);\r
- //modexDrawBmp(&gvar.video.page[0], 0, 0, &bmp);\r
- DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);\r
+ start = *clockw;\r
+ for(i=0; i<100 ;i++) {\r
+ modexDrawPBuf (&gvar.video.page[0], 0, 0, &p, 0);\r
+ }\r
+ t3 = (*clockw-start) /18.2;\r
+ for(i=0; i<100 ;i++) {\r
+ modexDrawPBufRegion (&gvar.video.page[0], 0, 0, 0+p.width, 0, p.width, p.height, &p, 0);\r
+ }\r
+ t4 = (*clockw-start) /18.2;\r
+ //++++ modexPalUpdate1(ptmp.palette);\r
+ //modexDrawBmpPBufRegion(&gvar.video.page[0], 64, 64, 48, 32, 24, 32, ptmp);\r
+ //modexDrawPBuf(&gvar.video.page[0], 64, 64, &ptmp, 0);\r
+getch();\r
while(!kbhit())\r
{\r
- //if(argv[2]) pee = strcpy(VGA, &(p->plane[plane][24]));\r
- }//gvar.video.page[0].data\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
+ //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 < p.height; py++) {\r
+ for(px=0; px < p.pwidth; px++) {\r
+ printf("%02X ", (int) p.plane[plane][i++]);\r
}\r
printf("\n");\r
}\r
}\r
- fprintf(stderr,"\n%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
- planar_buf_free(p);\r
-// fprintf(stderr,"%s\n", *pee);\r
-// fprintf(stderr, "CPU to VGA: %f\n", t1);\r
-// fprintf(stderr, "VGA to VGA: %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
- return;\r
+ col=0x0d, bgcol=0;\r
+ /*\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(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(p));\r
+ fprintf(stderr,"%dx%d\n", gvar.video.page[0].sw-(p.width), gvar.video.page[0].sh-(p.height));\r
+ free(bakapeee);\r
+ fprintf(stderr, "modexDrawBmpPBuf: %f\n", t1);\r
+ fprintf(stderr, "modexDrawPBuf: %f\n", t3);\r
+ fprintf(stderr, "speed difference %f\n", t3/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
}\r
projects / 16.git / blobdiff