going to work on this soon

[16.git] / src / lib / modex16.c

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index ea58ebd0547083ce035a90f5bc929d196fb9221d..5cec70c919a773f2332ee697b7da5937da3c1ff7 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -394,13 +394,14 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte  color) {
     }\r
 }\r
 \r
-void\r
-DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite)\r
+//TODO! ADD CLIPPING!!\r
+//void\r
+//modexDrawBmpRegion   (page_t *page, int x, int y, int rx, int ry, int rw, int rh, bitmap_t *bmp)\r
+void modexDrawPBufRegion       (page_t *page, int x, int y, int rx, int ry, int rw, int rh, planar_buf_t *p, boolean sprite)\r
 {\r
        int plane;\r
        int px, py, i;\r
 //     byte near *buff;\r
-\r
        px=x;\r
        py=y;\r
 //     buff = _nmalloc(p->pwidth+1);\r
@@ -420,7 +421,7 @@ DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite)
 //             }\r
 //     }\r
        for(plane=0; plane < 4; plane++) {\r
-               i=0;\r
+               i=(rx/4)+((rx/4)*ry);\r
                modexSelectPlane(PLANE(plane+x));\r
                for(; y < py+p->height; y++) {\r
                        //for(px=0; px < p->width; px++) {\r
@@ -437,34 +438,54 @@ DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite)
 //     _nfree(buff);\r
 }\r
 \r
-void\r
-oldDrawBmp(byte far* page, int x, int y, bitmap_t *bmp, byte sprite)\r
+/*void\r
+DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite)\r
 {\r
-       byte plane;\r
-       word px, py;\r
-       word offset;\r
-\r
-       /* TODO Make this fast.  It's SLOOOOOOW */\r
+       int plane;\r
+       int px, py, i;\r
+//     byte near *buff;\r
+       px=x;\r
+       py=y;\r
+//     buff = _nmalloc(p->pwidth+1);\r
+       // TODO Make this fast.  It's SLOOOOOOW\r
+//     for(plane=0; plane < 4; plane++) {\r
+//             i=0;\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[offset][i++]);\r
+//                             offset+=p->width;\r
+//                             offset++;\r
+//                     }\r
+//             }\r
+//     }\r
        for(plane=0; plane < 4; plane++) {\r
+               i=0;\r
                modexSelectPlane(PLANE(plane+x));\r
-               for(px = plane; px < bmp->width; px+=4) {\r
-                       offset=px;\r
-                       for(py=0; py<bmp->height; py++) {\r
-                       if(!sprite || bmp->data[offset])\r
-                               page[PAGE_OFFSET(x+px, y+py)] = bmp->data[offset];\r
-                       offset+=bmp->width;\r
-                       }\r
+               for(; y < py+p->height; y++) {\r
+                       //for(px=0; px < p->width; px++) {\r
+                               //printf("%02X ", (int) p->plane[plane][i++]);\r
+//                             _fmemcpy(buff, &(p->plane[plane][i+=p->pwidth]), p->pwidth);\r
+//                             printf("buff %u==%s\n", y, *buff);\r
+//                             _fmemcpy(page->data + (((page->width/4) * (y+page->dy)) + ((x+page->dx) / 4)), buff, p->pwidth);\r
+                               _fmemcpy(page->data + (((page->width/4) * (y+page->dy)) + ((x+page->dx) / 4)), &(p->plane[plane][i+=p->pwidth]), p->pwidth);\r
+                       //}\r
                }\r
+               x=px;\r
+               y=py;\r
        }\r
-}\r
+//     _nfree(buff);\r
+}*/\r
 \r
 void\r
-CDrawBmp(byte far* vgamem, page_t* page, int x, int y, bitmap_t *bmp, byte sprite)\r
+oldDrawBmp(byte far* page, int x, int y, bitmap_t *bmp, byte sprite)\r
 {\r
        byte plane;\r
        word px, py;\r
-       word offset=0;\r
-\r
+       word offset;\r
 \r
        /* TODO Make this fast.  It's SLOOOOOOW */\r
        for(plane=0; plane < 4; plane++) {\r
@@ -473,8 +494,7 @@ CDrawBmp(byte far* vgamem, page_t* page, int x, int y, bitmap_t *bmp, byte sprit
                        offset=px;\r
                        for(py=0; py<bmp->height; py++) {\r
                        if(!sprite || bmp->data[offset])\r
-                               //modexputPixel(page, x+px, y+py, bmp->data[offset]);\r
-                               vgamem[PAGE_OFFSET(x+px, y+py)] = bmp->data[offset];\r
+                               page[PAGE_OFFSET(x+px, y+py)] = bmp->data[offset];\r
                        offset+=bmp->width;\r
                        }\r
                }\r
@@ -1278,6 +1298,7 @@ void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, cons
        word addr = (word) l;\r
        word chw=0;\r
        byte c;\r
+       //byte near *bakapee;\r
 \r
        switch(t)\r
        {\r
@@ -1330,9 +1351,14 @@ void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, cons
                DEC CX\r
                JNZ L1\r
        }\r
+       //bakapee = _nmalloc(sizeof(byte)*8);\r
 //TODO: OPTIMIZE THIS!!!!\r
                for(i=0; i<w; 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=1<<8;\r
                        xp=0;\r
                        while(j)\r
@@ -1344,6 +1370,7 @@ void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, cons
                }\r
                chw += xp;\r
        }\r
+       //_nfree(bakapee);\r
 }\r
 \r
 void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str)\r