Merge remote-tracking branch 'upstream/master'

[16.git] / src / pcxtest.c

diff --git a/src/pcxtest.c b/src/pcxtest.c
index be51733b77ce894dbeafdbdbcf4e517ea9ed6801..0392b5cb3937f64e3cc44e244d97a7aaaa6a79a3 100755 (executable)
--- a/src/pcxtest.c
+++ b/src/pcxtest.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
@@ -27,56 +27,29 @@
 #include "src/lib/bitmap.h"\r
 #include "src/lib/planar.h"\r
 \r
-word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
-\r
-/*\r
-void\r
-DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, byte sprite)\r
-{\r
-       byte plane;\r
-       word px, py;\r
-       word offset;\r
-\r
-       // TODO Make this fast.  It's SLOOOOOOW\r
-       for(plane=0; plane < 4; plane++) {\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;\r
-               //offset+=p->width;\r
-               //offset++;\r
-               }\r
-       }\r
-       }\r
-}\r
-*/\r
+global_game_variables_t gvar;\r
 \r
 void main() {\r
        bitmap_t bmp;\r
        planar_buf_t *p;\r
        int i;\r
-       page_t page;\r
        word start;\r
        int plane;\r
        float t1, t2;\r
 \r
-       page=modexDefaultPage();\r
-\r
 //0000 bmp = bitmapLoadPcx("data/koishi~~.pcx");\r
 //     bmp = bitmapLoadPcx("data/chikyuu.pcx");\r
        bmp = bitmapLoadPcx("data/koishi^^.pcx");\r
 //     bmp = bitmapLoadPcx("16/PCX_LIB/chikyuu.pcx");\r
        p = planar_buf_from_bitmap(&bmp);\r
-       modexEnter();\r
+       VGAmodeX(1, &gvar);\r
+       gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
 \r
        /* fix up the palette and everything */\r
        modexPalUpdate1(bmp.palette);\r
 \r
        /* clear and draw one sprite and one bitmap */\r
-       modexClearRegion(&page, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 1);\r
+       modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].sw, gvar.video.page[0].sh, 1);\r
 \r
        /* non sprite comparison */\r
        start = *clockw;\r
@@ -86,15 +59,15 @@ void main() {
 \r
        start = *clockw;\r
        //for(i=0; i<100 ;i++) {\r
-//0000         modexDrawBmp(&page, 20, 20, &bmp);\r
-               modexDrawBmp(&page, 100, 100, &bmp);\r
+//0000         modexDrawBmp(&gvar.video.page[0], 20, 20, &bmp);\r
+               modexDrawBmp(&gvar.video.page[0], 160, 120, &bmp);\r
        //}\r
        t1 = (*clockw-start) /18.2;\r
 \r
        start = *clockw;\r
        //for(i=0; i<100; i++) {\r
-//0000         modexCopyPageRegion(&page, &page, 20, 20, 128, 20, 64, 64);\r
-               modexCopyPageRegion(&page, &page, 0, 0, 0, 0, 320, 240);\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
        //}\r
        t2 = (*clockw-start)/18.2;\r
 \r
@@ -107,27 +80,32 @@ void main() {
 \r
        start = *clockw;\r
        //for(i=0; i<100 ;i++) {\r
-//0000         modexDrawSprite(&page, 20, 20, &bmp);\r
-               modexDrawSprite(&page, 100, 100, &bmp);\r
+//0000         modexDrawSprite(&gvar.video.page[0], 20, 20, &bmp);\r
+               modexDrawSprite(&gvar.video.page[0], 160, 120, &bmp);\r
        //}\r
-       //_fmemset(MK_FP(0xA000, 0), (int)p->plane, SCREEN_WIDTH*(SCREEN_HEIGHT*2));\r
-       //modexDrawBmp(&page, 0, 0, &bmp);\r
+       //_fmemset(MK_FP(0xA000, 0), (int)p->plane, gvar.video.page[0].sw*(gvar.video.page[0].sh*2));\r
+       //modexDrawBmp(&gvar.video.page[0], 0, 0, &bmp);\r
        while(!kbhit())\r
        {\r
-               //DrawPBuf(&page, 0, 0, p, 0);\r
+               //DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);\r
        }\r
-       modexLeave();\r
-       printf("main=%Fp\n", &i);\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
        printf("\n%d\n", sizeof(p->plane));\r
-       printf("%d\n", sizeof(bmp));\r
+       printf("%d\n", sizeof(bmp));*/\r
 \r
        /*for(i=0; i<(320*240); i++)\r
        {\r
                fprintf(stdout, "%d", bmp.data[i]);\r
-               if(i%320==0) fprintf(stdout, "\n");\r
+               if(i%bmp.width==0) fprintf(stdout, "\n");\r
        }*/\r
        printf("CPU to VGA: %f\n", t1);\r
        printf("VGA to VGA: %f\n", t2);\r
+       printf("gvar.video.page[0].width: %u\n", gvar.video.page[0].width);\r
+       printf("gvar.video.page[0].height: %u\n", gvar.video.page[0].height);\r
        return;\r
 }\r