Merge remote-tracking branch 'upstream/master'

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

diff --git a/src/lib/modex16/16render.c b/src/lib/modex16/16render.c
index f80d5ea8fc367bcd1a2aa9460d7758c0cd30e441..0399a7771738f489fe3a77a936387183319ab571 100755 (executable)
--- a/src/lib/modex16/16render.c
+++ b/src/lib/modex16/16render.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,29 +36,30 @@ void modexDrawPBufRegion    (page_t *page, int x, int y, int rx, int ry, int rw, in
        const int px=x+page->dx;\r
        const int py=y+page->dy;\r
        const int prw = rw/4;\r
+       int prh;\r
+\r
+       //fine tuning\r
        rx+=1;\r
        ry+=1;\r
+\r
+       //^^;\r
        #define PEEE    rx-prw\r
        #define PE              (p->pwidth)\r
-       #define PEEEE   (PE*(ry))\r
+       if(rh<p->height) prh = (PE*(ry-4));\r
+       else if(rh==p->height) prh = (PE*(ry));\r
        y=py;\r
        x=px;\r
        //printf("%d,%d p(%d,%d) r(%d,%d) rwh(%d,%d)\n", x, y, px, py, rx, ry, rw, rh);\r
        for(plane=0; plane < 4; plane++) {\r
-               i=PEEE+PEEEE;\r
+               i=PEEE+prh;\r
                modexSelectPlane(PLANE(plane-1));\r
                for(; y < py+rh; 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)) + ((x) / 4)), &(p->plane[plane][i]), prw);\r
                                i+=PE;\r
-                       //}\r
                }\r
                x=px;\r
                y=py;\r
-               }\r
+       }\r
 }\r
 \r
 \r
@@ -433,3 +434,35 @@ modexDrawSpritePBufRegion(page_t *page, int x, int y,
                JNZ PLANE_LOOP    ; do all 4 planes\r
     }\r
 }\r
+\r
+void modexDrawCharPBuf(page_t *page, int x, int y, word t, word col, word bgcol, boolean q)\r
+{\r
+       word i, j, k;\r
+       for(i=0; i<romFonts[t].charSize; i++)\r
+       {\r
+               j=1<<8;\r
+               k=0;\r
+               //every "pixel" row\r
+               while(j)\r
+               {\r
+                       if(q)\r
+                       //_fmemcpy(page->data + (((page->width/4) * (y+i)) + ((x+romFontsData.chw+k) / 4)), romFontsData.l[i] & j ? col:bgcol, 2);\r
+                       modexputPixel(page, x+k+romFontsData.chw, y+i, romFontsData.l[i] & j ? col:bgcol);\r
+                       else\r
+                               //printf("l[i]=%c j=%02u l[i] & j=%02u %c\n", l[i] , j, l[i] & j, l[i] & j ? '*':' ');\r
+                               //printf("%c", l[i] & j ? '*':' ');\r
+                               romFontsData.z[k]=romFontsData.l[i] & j ? '*':' ';\r
+                       j>>=1;\r
+                       k++;\r
+               }\r
+               if(!q)\r
+               {\r
+                       for(k=0;k<9;k++)\r
+                       {\r
+                               printf("%c", romFontsData.z[k]);\r
+                       }\r
+                       printf("\n");\r
+               }\r
+       }\r
+       romFontsData.chw += k;\r
+}\r