trying to fix~ palette updater bug! wwww

[16.git] / src / pcxtest.c

diff --git a/src/pcxtest.c b/src/pcxtest.c
index 67e351c7b6a9c89dcae285145bb6a68e31b09269..f735a5597e2561044f64406e85cd453c41e314cd 100644 (file)
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <dos.h>
 #include <string.h>\r
 #include "src\lib\modex16.h"\r
 #include "src\lib\bitmap.h"
@@ -24,8 +25,9 @@ oldDrawBmp(byte far* page, int x, int y, bitmap_t *bmp, byte sprite) {
            }\r
        }\r
     }\r
-}\r
-
+}
+\r
+/*
 void\r
 DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, byte sprite)
 {\r
@@ -33,7 +35,7 @@ DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, byte sprite)
     word px, py;\r
     word offset;\r
 \r
-    /* TODO Make this fast.  It's SLOOOOOOW */\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
@@ -48,7 +50,7 @@ DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, byte sprite)
        }\r
     }\r
 }\r
-
+*/
 \r
 void main() {\r
     bitmap_t bmp;
@@ -61,18 +63,18 @@ void main() {
 \r
     page=modexDefaultPage();\r
 \r
-    bmp = bitmapLoadPcx("data/ed.pcx");
+    bmp = bitmapLoadPcx("data/koishi~~.pcx");
     p = planar_buf_from_bitmap(&bmp);\r
     modexEnter();\r
 \r
     /* fix up the palette and everything */\r
-    modexPalUpdate(bmp.palette);\r
+    modexPalUpdate(&bmp, 0, 0, 0);\r
 \r
     /* clear and draw one sprite and one bitmap */\r
     modexClearRegion(&page, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 1);\r
 \r
     /* non sprite comparison */
-    /*start = *clock;\r
+    start = *clock;\r
     for(i=0; i<100 ;i++) {\r
       oldDrawBmp(VGA, 20, 20, &bmp, 0);\r
     }\r
@@ -99,16 +101,17 @@ void main() {
     start = *clock;\r
     for(i=0; i<100 ;i++) {\r
       modexDrawSprite(&page, 20, 20, &bmp);\r
-    }*/
+    }
+    //_fmemset(MK_FP(0xA000, 0), (int)p->plane, SCREEN_WIDTH*(SCREEN_HEIGHT*2));
        while(!kbhit())
        {
-               DrawPBuf(&page, 0, 0, p, 0);
+               //DrawPBuf(&page, 0, 0, p, 0);
        }
     modexLeave();\r
 
        printf("\n%d\n", sizeof(p->plane));
        printf("%d\n", sizeof(bmp));\r
-    //printf("CPU to VGA: %f\n", t1);\r
-    //printf("VGA to VGA: %f\n", t2);\r
+    printf("CPU to VGA: %f\n", t1);\r
+    printf("VGA to VGA: %f\n", t2);\r
     return;\r
 }\r