ww

[16.git] / src / planrpcx.c

diff --git a/src/planrpcx.c b/src/planrpcx.c
index 7a703c2615560f17d5742ebdcabd51901e1b2966..9dc97ce492559b77cd9738786ff24760d247c43c 100755 (executable)
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -24,26 +24,26 @@
 #include <dos.h>\r
 #include <string.h>\r
 #include "src/lib/modex16.h"\r
-#include "src/lib/modex16/planar16.h"\r
 \r
 global_game_variables_t gvar;\r
-planar_buf_t huge p, ptmp;\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
-       int i;\r
-       word start;\r
-       int plane;\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
+       //byte l[1024];\r
        word j,chw,xp,col,bgcol;\r
 \r
-\r
+//w=0;\r
+//printf("%u ", w++);\r
        bakapeee = malloc(64);\r
 \r
        if(argv[1]) bakapeee = argv[1];\r
@@ -52,10 +52,15 @@ void main(int argc, char *argv[])
 //     if(argv[2]) baka = atoi(argv[2]);\r
 //     else\r
 baka = 1;\r
-\r
+//fprintf(stderr, "%u ", w++);\r
        p = planarLoadPcx(bakapeee);\r
-       ptmp = planarLoadPcx("data/ptmp.pcx");\r
-/*     VGAmodeX(baka, &gvar);\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
@@ -73,40 +78,49 @@ baka = 1;
        start = *clockw;\r
 //             oldDrawBmp(VGA, 20, 20, &bmp, 0);\r
        for(i=0; i<100 ;i++) {\r
-               modexDrawBmpPBufRegion  (&gvar.video.page[0], 32, 32, 0, 0, p.width, p.height, &p);\r
-//             modexDrawBmpPBuf                (&gvar.video.page[0], 32, 32, p);\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
 //             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
        for(i=0; i<100 ;i++) {\r
-               modexDrawPBuf(&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(ptmp.palette);\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
+       //modexDrawPBuf(&gvar.video.page[0], 64, 64, &ptmp, 0);\r
+getch();\r
        while(!kbhit())\r
        {\r
        }\r
-       VGAmodeX(0, &gvar);*/\r
+       VGAmodeX(0, &gvar);\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 < ptmp.height; py++) {\r
-                       for(px=0; px < ptmp.pwidth; px++) {\r
-                               printf("%02X ", (int) ptmp.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
        col=0x0d, bgcol=0;\r
-       /*for(i=0; i<8; i++)\r
+       /*\r
+       for(i=0; i<8; i++)\r
        {\r
                //modexSelectPlane(PLANE(x));\r
                //j=1<<8;\r
@@ -134,12 +148,10 @@ baka = 1;
        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
-       //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
+       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