X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.c;h=3bf65ee40fa12bc96c404d3b1b7cfb21bd26e38f;hb=2bc6e98511fbe156f4ec68b1b7dbc7c8c03f866f;hp=e2c95ac95a018d654725758021d594f872f29228;hpb=02dd99850b12a31480e011885a8299a0e24f7dd8;p=16.git

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index e2c95ac9..3bf65ee4 100644
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -1,11 +1,32 @@
+/* Project 16 Source Code~
+ * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ *
+ * This file is part of Project 16.
+ *
+ * Project 16 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Project 16 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>, or
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 #include <dos.h>
 #include <string.h>
 #include <mem.h>
 #include <conio.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "src\lib\modex16.h"
-
+#include "src/lib/modex16.h"
 
 byte far* VGA=(byte far*) 0xA0000000; 	/* this points to video memory. */
 
@@ -91,6 +112,7 @@ modexDefaultPage() {
     page.dy = 0;
     page.width = SCREEN_WIDTH;
     page.height = SCREEN_HEIGHT;
+	page.id = 0;
 
     return page;
 }
@@ -107,6 +129,23 @@ modexNextPage(page_t *p) {
     result.dy = 0;
     result.width = p->width;
     result.height = p->height;
+	result.id = p->id+1;
+
+    return result;
+}
+
+//next page with defined dimentions~
+page_t
+modexNextPage0(page_t *p, word x, word y)
+{
+	page_t result;
+
+	result.data = p->data + (p->width/4)*p->height;  /* compute the offset */
+	result.dx = 0;
+	result.dy = 0;
+	result.width = x;
+	result.height = y;
+	result.id = p->id+1;
 
     return result;
 }
@@ -138,7 +177,7 @@ modexShowPage(page_t *page) {
     outp(CRTC_DATA, crtcOffset);
 
     /*  wait for one retrace */
-    while (!(inp(INPUT_STATUS_1) & VRETRACE)); 
+    while (!(inp(INPUT_STATUS_1) & VRETRACE));
 
     /* do PEL panning here */
     outp(AC_INDEX, 0x33);
@@ -215,6 +254,28 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte  color) {
 }
 
 
+void
+oldDrawBmp(byte far* page, int x, int y, bitmap_t *bmp, byte sprite)
+{
+	byte plane;
+	word px, py;
+	word offset;
+
+	/* TODO Make this fast.  It's SLOOOOOOW */
+	for(plane=0; plane < 4; plane++) {
+		modexSelectPlane(PLANE(plane+x));
+		for(px = plane; px < bmp->width; px+=4) {
+			offset=px;
+			for(py=0; py<bmp->height; py++) {
+			if(!sprite || bmp->data[offset])
+				page[PAGE_OFFSET(x+px, y+py)] = bmp->data[offset];
+			offset+=bmp->width;
+			}
+		}
+	}
+}
+
+
 void
 modexDrawBmp(page_t *page, int x, int y, bitmap_t *bmp) {
     /* draw the region (the entire freakin bitmap) */
@@ -253,7 +314,7 @@ modexDrawBmpRegion(page_t *page, int x, int y,
 
 		;-- begin plane painting
 		MOV AX, height		; start the row counter
-		MOV rowCounter, AX	; 
+		MOV rowCounter, AX	;
 		MOV DI, poffset		; go to the first pixel
 		MOV SI, bmpOffset	; go to the bmp pixel
 	ROW_LOOP:
@@ -333,7 +394,7 @@ modexDrawSpriteRegion(page_t *page, int x, int y,
 
 		;-- begin plane painting
 		MOV AX, height		; start the row counter
-		MOV rowCounter, AX	; 
+		MOV rowCounter, AX	;
 		MOV DI, poffset		; go to the first pixel
 		MOV SI, bmpOffset	; go to the bmp pixel
 	ROW_LOOP:
@@ -481,7 +542,7 @@ fadePalette(sbyte fade, sbyte start, word iter, byte *palette) {
 
     /* handle the case where we just update */
     if(iter == 0) {
-	modexPalUpdate2(palette);
+	modexPalUpdate1(palette);
 	return;
     }
 
@@ -494,7 +555,7 @@ fadePalette(sbyte fade, sbyte start, word iter, byte *palette) {
 		tmppal[i] = 63;
 	    }
 	}
-        modexPalUpdate2(tmppal);
+        modexPalUpdate1(tmppal);
 	iter--;
 	dim += fade;
     }
@@ -593,17 +654,13 @@ modexPalWhite() {
 void
 modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset)
 {
-//----	static word count=0;
 	byte *p = bmp->palette;
 	word w=0;
 	word q=0;
 	word qq=0;
-	//word ii;
-	static word a[PAL_SIZE/3];
+	static word a[PAL_SIZE];	//palette array of change values!
 	word z=0, aq=0, aa=0, pp=0;
-	//sword aqpw;
 
-	//printf("1	(*i)=%02d\n", (*i)/3);
 	modexWaitBorder();
 	if((*i)==0)
 	{
@@ -621,7 +678,6 @@ modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset)
 //		printf("q: %02d\n", (q));
 //		printf("qq: %02d\n", (qq));
 		//printf("	(*i)-q=%02d\n", (*i)-q);
-//		printf("================\n");
 		outp(PAL_WRITE_REG, qq);  /* start at the beginning of palette */
 	}
 	if((*i)<PAL_SIZE/2 && w==0)
@@ -635,30 +691,25 @@ modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset)
 				w++;
 				break;
 			}
-			else if(qp>0 && (*i)>=(qp*3) && (*i)<((qp*3)+3))
+			else if(qp>0 && (*i)>=(qp) && (*i)<((qp)+3))
 			{
-				/*
-									note to self
-									use a[qp] instead of bmp->offset for this spot!
-				*/
 				//printf("qp=%d\n", qp);
-				//printf("						(*i)=%d\n", (*i)/3);
-				//for(w=(*i); w<()){
-				printf("		(*i)=%d	a[%d]=%d\n", (*i), qp, a[qp]);
-				printf("		%d's color=%d\n", (*i), (a[qp]*3)+(aqoffset*3));//+(aqoffset*3)
-				outp(PAL_DATA_REG, p[(a[qp]*3)+(aqoffset*3)]);
-				if((*i)+1==(qp*3)+3){ /*(*i)++;*/ break; }
+				//printf("		(*i)=%d	a[%d]=%d\n", (*i), qp, a[qp]);
+				printf("		%d's color=%d\n", (*i), (a[qp])-(bmp->offset*3)+qp);
+				//outp(PAL_DATA_REG, p[((a[qp])-(bmp->offset*3)+qp)]);// fix this shit!
+				if((*i)+1==(qp)+3){ w++; /*(*i)++;*/ break; }
 			}
 			else
 			{
 				if(bmp->offset==0 && (*i)<3 && q==0) outp(PAL_DATA_REG, 0);
 				else
 				if(qp==0) outp(PAL_DATA_REG, p[(*i)-q]);
-				else outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3)/*+(aqoffset*3)*/)]);
+				else{ //outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3)+qp)]);
+				printf("p[]=%d	qp=%d	p[]-qp=%d\n", ((*i)-(bmp->offset*3)), qp, ((*i)-(bmp->offset*3))+qp); }
 			}
 		}
 		//if(qp>0) printf("qp=%d\n", qp);
-		if(qp>0) printf("						(*i)=%d\n", (*i)/3);
+		//if(qp>0) printf("						(*i)=%d\n", (*i)/3);
 	}
 	modexWaitBorder();	    /* waits one retrace -- less flicker */
 	if((*i)>=PAL_SIZE/2 && w==0)
@@ -671,32 +722,25 @@ modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset)
 				w++;
 				break;
 			}
-			else if(qp>0 && (*i)>=(qp*3) && (*i)<((qp*3)+3))
+			else if(qp>0 && (*i)>=(qp) && (*i)<((qp)+3))
 			{
-				/*
-									note to self
-									use a[qp] instead of bmp->offset for this spot!
-				*/
 				//printf("qp=%d\n", qp);
-				//printf("						(*i)=%d\n", (*i)/3);
-				printf("	(*i)=%d	bmp->offset*3=%d	(qp*3)=%d\n", (*i), (bmp->offset), (qp));
-				printf("		%d's color=%d\n", (*i)/3, ((*i)-(bmp->offset)+(qp*3)));
-				//printf("		%d's color2=%d\n", (*i)/3, ((*i)-(bmp->offset*3))-(qp*3));
-				//outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3))+()]);
-				(*i)++;
-				break;
+				//printf("		(*i)=%d	a[%d]=%d\n", (*i), qp, a[qp]);
+				printf("		%d's color=%d\n", (*i), (a[qp]-(bmp->offset*3)+qp));
+				//outp(PAL_DATA_REG, p[((a[qp])-(bmp->offset*3)+qp)]);// fix this shit!
+				if((*i)+1==(qp)+3){ w++; /*(*i)++;*/ break; }
 			}
 			else
 			{
 				if(qp==0) outp(PAL_DATA_REG, p[(*i)-q]);
-				else outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3))+(qp*3)]);
+				else{ //outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3)+qp)]);
+				printf("p[]=%d	qp=%d	p[]-qp=%d\n", ((*i)-(bmp->offset*3)), qp, ((*i)-(bmp->offset*3))+qp); }
 			}
 		}
 		//printf("						(*i)=%d\n", (*i)/3);
 	}
 
-//	if(q>0) 
-//	printf("2	(*i)=%02d\n", (*i)/3);
+printf("\nqqqqqqqq\n\n");
 
 	//palette checker~
 	if(q>0 && qp==0)
@@ -709,7 +753,6 @@ modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset)
 		chkcolor(bmp, &q, &a, &aa, &z, i);
 		//printf("2(*i)=%02d\n", (*i)/3);
 		//printf("2z=%02d\n", z/3);
-
 		aq=0;
 aqpee:
 		while(aq<=aa)
@@ -718,9 +761,24 @@ aqpee:
 			if(a[aq]==-1) aq++;
 			else { aqoffset++; break; }
 		}
-
+//update the image data here!
 	for(lq=0; lq<bufSize; lq++)
 	{
+				/*
+									note to self
+									use a[qp] instead of bmp->offset for this spot!
+									NO! wwww
+				*/
+
+				/*
+				Facking bloody point the values of the changed palette to correct values.... major confusion! wwww
+				*/
+
+		//(offset/bmp->offset)*bmp->offset
+
+
+		//printf("%02d ",bmp->data[lq]+bmp->offset);
+		//if(lq > 0 && lq%bmp->width==0) printf("\n");
 		//printf("%02d_", bmp->data[lq]+bmp->offset);
 		/*if(bmp->data[lq]+bmp->offset==aq)
 		{
@@ -761,7 +819,7 @@ aqpee:
 }
 
 void
-modexPalUpdate2(byte *p)
+modexPalUpdate1(byte *p)
 {
 	int i;
 	modexWaitBorder();
@@ -778,7 +836,7 @@ modexPalUpdate2(byte *p)
 }
 
 void
-modexPalUpdate3(byte *p)
+modexPalUpdate0(byte *p)
 {
 	int i;
 	modexWaitBorder();
@@ -806,14 +864,16 @@ void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, wor
 		printf("chkcolor start~\n");
 		printf("1				(*z): %d\n", (*z)/3);
 		printf("1				(*i): %d\n", (*i)/3);
+//		printf("1 offset of color in palette	(*q): %d\n", (*q)/3);
+		printf("wwwwwwwwwwwwwwww\n");
 		//check palette for dups
 		for(; (*z)<PAL_SIZE; (*z)+=3)
 		{
-//			printf("\n		z: %d\n", (*z));
-//			printf("		q: %d\n", (*q));
-//			printf("		z+q: %d\n\n", ((*z)+(*q)));
-			if((*z)%3==0)
-			{
+			//printf("\n		z: %d\n", (*z));
+			//printf("		q: %d\n", (*q));
+			//printf("		z+q: %d\n\n", ((*z)+(*q)));
+			//if((*z)%3==0)
+			//{
 //----				if(pal[(*z)]==pal[(*z)+3] && pal[(*z)+1]==pal[(*z)+4] && pal[(*z)+2]==pal[(*z)+5])
 				if((*z)==(*i))
 				{
@@ -824,11 +884,10 @@ void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, wor
 				}
 				else for(zz=0; zz<(*q); zz+=3)
 				{
-					//zq=(zz+(q-3));
 					//printf("zz: %02d\n", zz/3);
 					if(zz%3==0)
 					{
-						if(pal[((*z)+(*q))]==pal[((*z)+(*q))+3] && pal[((*z)+(*q))+1]==pal[((*z)+(*q))+4] && pal[((*z)+(*q))+2]==pal[((*z)+(*q))+5])
+						if(pal[((*z)+(*q))]==pal[((*z)+(*q))+3] && pal[((*z)+(*q))+1]==pal[((*z)+(*q))+4] && pal[((*z)+(*q))+2]==pal[((*z)+(*q))+5])	//break if duplicate colors found in palette because it have reached the end of the current data of the palette
 						{
 //							(*z)-=3;
 //							(*i)-=3;
@@ -845,9 +904,20 @@ void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, wor
 //							printf("	z : %d	[%02d][%02d][%02d] offset value~\n", (*z)/3, pal[(*z)], pal[(*z)+1], pal[(*z)+2]);
 //++++							(*i)--;
 //							(*z)--;
-							a[(((*z)+(*q))/3)]=zz/3;
-							(*aa)=(((*z)+(*q))/3);
-							printf("!!				a[%02d]: %d\n", (((*z)+(*q))/3), zz/3);
+							//expand dong here
+/*
+planned features that i plan to implement~
+image that has values on the pallete list!
+wwww
+no... wait.... no wwww
+*/
+							//for(zzii=0; zzii<3; zzii++)
+							//{
+								//printf("z+q: %d\n\n", ((*z)+(*q)));
+								a[(((*z)+(*q)))]=zz;
+							//}
+							(*aa)=(((*z)+(*q)));
+							printf("!!					a[%02d]: %d\n", (((*z)+(*q))/3), zz/3);
 //							printf("\n		aa: %d\n\n", (*aa));
 //							printf("	a[%02d]=(%02d) offset array i think the palette should be updated again~\n", ((*z)+(*q))/3, a[((*z)+(*q))/3]);
 //							printf("wwwwwwwwwwwwwwww\n\n");
@@ -863,13 +933,11 @@ void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, wor
 						//printf("[%d]", (zz+q));
 					}
 				}
-				//printf("\nz:	%d\n", z);
-				//printf("q:	%d\n", q);
-				//printf("zz:	%d\n", zz);
-			}
 		}
+		printf("wwwwwwwwwwwwwwww\n");
 		printf("2				(*z): %d\n", (*z)/3);
 		printf("2				(*i): %d\n", (*i)/3);
+//		printf("2 offset of color in palette	(*q): %d\n", (*q)/3);
 		printf("chkcolor end~\n");
 		free(pal);
 }