Merge remote-tracking branch 'upstream/master'

[16.git] / src / planrpcx.c

diff --git a/src/planrpcx.c b/src/planrpcx.c
index 9dc97ce492559b77cd9738786ff24760d247c43c..06b1f29c8eb812887bf6bd089ff940d67f81d64c 100755 (executable)
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -36,11 +36,14 @@ word px,py;
 sword baka;\r
 char *bakapeee;\r
 \r
+\r
 void main(int argc, char *argv[])\r
 {\r
 \r
-       //byte l[1024];\r
-       word j,chw,xp,col,bgcol;\r
+       byte l[1024];\r
+       static byte e;\r
+       static word chx, chy, colpee;\r
+       byte pee[2];\r
 \r
 //w=0;\r
 //printf("%u ", w++);\r
@@ -60,7 +63,8 @@ baka = 1;
 //fprintf(stderr, "^^;", w++);\r
 //getch();\r
 \r
-       VGAmodeX(baka, &gvar);\r
+       textInit();\r
+       VGAmodeX(baka, 1, &gvar);\r
        gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
 \r
        //fix up the palette and everything\r
@@ -82,7 +86,7 @@ baka = 1;
        }\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
+               modexDrawBmpPBufRegion  (&gvar.video.page[0], p.width+32, 32, p.width-(p.width/4), p.height-(p.height/4), p.width/4, p.height/4, &p);\r
        }\r
        t2 = (*clockw-start) /18.2;\r
        getch();\r
@@ -94,18 +98,19 @@ baka = 1;
                modexDrawPBuf           (&gvar.video.page[0], 0, 0, &p, 0);\r
        }\r
        t3 = (*clockw-start) /18.2;\r
+getch();\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
+                                               //(page_t *page, int x, int y, int rx, int ry, int rw, int rh, planar_buf_t *p, boolean sprite);\r
+               modexDrawPBufRegion     (&gvar.video.page[0], p.width, 0, p.width-(p.width/4), p.height-(p.height/4), p.width/4, p.height/4, &p, 0);//(&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
        }\r
-       VGAmodeX(0, &gvar);\r
+       VGAmodeX(0, 1, &gvar);\r
 \r
        //print out the contents of each plane\r
        for(plane=0; plane < 4; plane++) {\r
@@ -118,28 +123,26 @@ getch();
                        printf("\n");\r
                }\r
        }\r
-       col=0x0d, bgcol=0;\r
-       /*\r
-       for(i=0; i<8; i++)\r
+\r
+       chx=0;\r
+       chy=0;\r
+       colpee=32;\r
+       for(e=0x00; e<=0xFE; e++)\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
+               if(chx+8>(gvar.video.page[0].width/2))\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
+                       chx=0;\r
+                       chy+=8;\r
+                       sprintf(pee,"%u", colpee);\r
+                       modexprint(&gvar.video.page[0], 200, 200, 1, 47, 0, &pee, 0);\r
+                       //getch();\r
                }\r
-               //fprintf(stderr, "\n");\r
-       }*/\r
-       chw += xp;\r
+               modexprint(&gvar.video.page[0], chx, chy, 1, 0, colpee, &e, 0);\r
+               chx+=9;\r
+               colpee++;\r
+               if(colpee>=32+24) colpee=32;\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
@@ -149,9 +152,9 @@ getch();
        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, "modexDrawBmpPBufRegion:        %f\n", t2);\r
+       fprintf(stderr, "modexDrawPBufRegion:   %f\n", t4);\r
+       fprintf(stderr, "speed difference       %f\n", t2/t4);\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