X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16%2F16render.c;h=77598fa55ee14c9616bfbdff3d5b206b29719459;hb=781dba2e4095d0e72af3f0c38d2de7bafc21c57d;hp=f80d5ea8fc367bcd1a2aa9460d7758c0cd30e441;hpb=544ccf6efbf54ec3bf18c0dc1a71a9943f493905;p=16.git

diff --git a/src/lib/modex16/16render.c b/src/lib/modex16/16render.c
index f80d5ea8..77598fa5 100755
--- a/src/lib/modex16/16render.c
+++ b/src/lib/modex16/16render.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123
  *
  * This file is part of Project 16.
  *
@@ -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;
 	const int py=y+page->dy;
 	const int prw = rw/4;
+	int prh;
+
+	//fine tuning
 	rx+=1;
 	ry+=1;
+
+	//^^;
 	#define PEEE	rx-prw
 	#define PE		(p->pwidth)
-	#define PEEEE	(PE*(ry))
+	if(rh<p->height) prh = (PE*(ry-4));
+	else if(rh==p->height) prh = (PE*(ry));
 	y=py;
 	x=px;
 	//printf("%d,%d p(%d,%d) r(%d,%d) rwh(%d,%d)\n", x, y, px, py, rx, ry, rw, rh);
 	for(plane=0; plane < 4; plane++) {
-		i=PEEE+PEEEE;
+		i=PEEE+prh;
 		modexSelectPlane(PLANE(plane-1));
 		for(; y < py+rh; y++) {
-			//for(px=0; px < p->width; px++) {
-				//printf("%02X ", (int) p->plane[plane][i++]);
-//			      _fmemcpy(buff, &(p->plane[plane][i+=p->pwidth]), p->pwidth);
-//			      printf("buff %u==%s\n", y, *buff);
 				_fmemcpy(page->data + (((page->width/4) * (y)) + ((x) / 4)), &(p->plane[plane][i]), prw);
 				i+=PE;
-			//}
 		}
 		x=px;
 		y=py;
-		}
+	}
 }
 
 
@@ -433,3 +434,40 @@ modexDrawSpritePBufRegion(page_t *page, int x, int y,
 		JNZ PLANE_LOOP	  ; do all 4 planes
     }
 }
+
+void modexDrawChar(page_t *page, int x/*for planar selection only*/, word t, word col, word bgcol, word addr)
+{
+	/* vertical drawing routine by joncampbell123.
+	 *
+	 * optimize for VGA mode X planar memory to minimize the number of times we do I/O write to map mask register.
+	 * so, we enumerate over columns (not rows!) to draw every 4th pixel. bit masks are used because of the font bitmap.
+	 *
+	 * 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. */
+	word rows = romFonts[t].charSize;
+	word drawaddr;
+	word colm, row;
+	byte fontbyte;
+	byte plane;
+	byte m1,m2;
+
+	plane = x & 3;
+	m1 = 0x80; // left half
+	m2 = 0x08; // right half
+	for (colm=0;colm < 4;colm++) {
+		drawaddr = addr;
+		modexSelectPlane(PLANE(plane));
+		for (row=0;row < rows;row++) {
+			fontbyte = romFontsData.l[row];
+			vga_state.vga_graphics_ram[drawaddr  ] = (fontbyte & m1) ? col : bgcol;
+			vga_state.vga_graphics_ram[drawaddr+1] = (fontbyte & m2) ? col : bgcol;
+			drawaddr += page->width >> 2;
+		}
+
+		m1 >>= 1;
+		m2 >>= 1;
+		if ((++plane) == 4) {
+			addr++;
+			plane = 0;
+		}
+	}
+}