polished 16_vrs.h and put into make file AND! updated copyright to add yakui lover...

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

diff --git a/src/lib/modex16/16render.c b/src/lib/modex16/16render.c
index 91820e8e246d8fbaa67a0bccafe1ec2577deede9..051e94f97cf73ea918d3c5bd7e581859ef97ac4e 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 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -435,36 +435,39 @@ modexDrawSpritePBufRegion(page_t *page, int x, int y,
     }\r
 }\r
 \r
-void modexDrawCharPBuf(page_t *page, int x, int y, word t, word col, word bgcol, boolean q)\r
+void modexDrawChar(page_t *page, int x/*for planar selection only*/, word t, word col, word bgcol, word addr)\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)),\r
- romFontsData.l[i] & j ?\r
- col:bgcol, 2);\r
-                       //modexputPixel(page, x+xp+chw, y+i, 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
+       /* vertical drawing routine by joncampbell123.\r
+        *\r
+        * optimize for VGA mode X planar memory to minimize the number of times we do I/O write to map mask register.\r
+        * so, we enumerate over columns (not rows!) to draw every 4th pixel. bit masks are used because of the font bitmap.\r
+        *\r
+        * NTS: addr defines what VGA memory address we use, "x" is redundant except to specify which of the 4 pixels we select in the map mask register. */\r
+       word rows = romFonts[t].charSize;\r
+       word drawaddr;\r
+       word colm, row;\r
+       byte fontbyte;\r
+       byte plane;\r
+       byte m1,m2;\r
+\r
+       plane = x & 3;\r
+       m1 = 0x80; // left half\r
+       m2 = 0x08; // right half\r
+       for (colm=0;colm < 4;colm++) {\r
+               drawaddr = addr;\r
+               modexSelectPlane(PLANE(plane));\r
+               for (row=0;row < rows;row++) {\r
+                       fontbyte = romFontsData.l[row];\r
+                       vga_state.vga_graphics_ram[drawaddr  ] = (fontbyte & m1) ? col : bgcol;\r
+                       vga_state.vga_graphics_ram[drawaddr+1] = (fontbyte & m2) ? col : bgcol;\r
+                       drawaddr += page->width >> 2;\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
+               m1 >>= 1;\r
+               m2 >>= 1;\r
+               if ((++plane) == 4) {\r
+                       addr++;\r
+                       plane = 0;\r
                }\r
        }\r
-       romFontsData.chw += k;\r
 }\r