updated lua

[16.git] / src / planrpcx.c

diff --git a/src/planrpcx.c b/src/planrpcx.c
index d4b91e009101257bae68c3874e2d74cd14c4f608..9de942b3f64504fa3116ccaed15b3d6c778629df 100755 (executable)
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -28,31 +28,37 @@
 #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
 \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
        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
+//     if(argv[2]) baka = atoi(argv[2]);\r
+//     else\r
 baka = 1;\r
 \r
        bmp = bitmapLoadPcx(bakapeee);\r
        p = planar_buf_from_bitmap(&bmp);\r
+       ptmpbt = bitmapLoadPcx("data/ptmp.pcx");\r
+       ptmp = planar_buf_from_bitmap(&ptmpbt);\r
        VGAmodeX(baka, &gvar);\r
        gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
 \r
@@ -71,7 +77,7 @@ baka = 1;
        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
+               modexDrawBmpPBuf(&gvar.video.page[0], 32, 32, p);\r
        }\r
        t1 = (*clockw-start) /18.2;\r
 //     start = *clockw;\r
@@ -79,9 +85,12 @@ baka = 1;
 //     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, p, 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, ptmp);*/\r
        while(!kbhit())\r
        {\r
        }\r
@@ -95,13 +104,34 @@ baka = 1;
        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 < ptmp->height; py++) {\r
+                       for(px=0; px < ptmp->pwidth; px++) {\r
+                               printf("%02X ", (int) ptmp->plane[plane][i++]);\r
                        }\r
                        printf("\n");\r
                }\r
        }\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(p->plane));\r
@@ -112,8 +142,9 @@ baka = 1;
        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, "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