X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.c;h=4717b444a39eaf1a9459d5a7a8ed317ede1102ef;hb=d45a99ed2ea331a9d2f19b20494fec509fc0efb5;hp=eb3f1f38a808795386daa8dca17f5af1a15867a1;hpb=df9c6f84a178425ae77731e2d0a350ed5f9075ba;p=16.git
diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index eb3f1f38..4717b444 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 , or
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
#include
#include
#include
#include
#include
#include
-#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; pyheight; 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;
}
@@ -632,16 +693,10 @@ modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset)
}
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(" (*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!
+ //outp(PAL_DATA_REG, p[((a[qp])-(bmp->offset*3)+qp)]);// fix this shit!
if((*i)+1==(qp)+3){ w++; /*(*i)++;*/ break; }
}
else
@@ -649,8 +704,8 @@ modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset)
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)+qp)]);
- printf("p[]=%d qp=%d p[]-qp=%d\n", ((*i)-(bmp->offset*3)), qp, ((*i)-(bmp->offset*3))+qp);
+ 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);
@@ -669,30 +724,22 @@ modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset)
}
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(" (*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!
+ //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)]);
- printf("p[]=%d qp=%d p[]-qp=%d\n", ((*i)-(bmp->offset*3)), qp, ((*i)-(bmp->offset*3))+qp);
+ 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~
@@ -772,7 +819,7 @@ aqpee:
}
void
-modexPalUpdate2(byte *p)
+modexPalUpdate1(byte *p)
{
int i;
modexWaitBorder();
@@ -789,7 +836,7 @@ modexPalUpdate2(byte *p)
}
void
-modexPalUpdate3(byte *p)
+modexPalUpdate0(byte *p)
{
int i;
modexWaitBorder();
@@ -895,6 +942,23 @@ no... wait.... no wwww
free(pal);
}
+void bputs(/*bmp_t *bmp, */unsigned x, unsigned y, const char *s)
+{
+ byte far *font;
+ //bmp_t src;
+
+ //font = bios_8x8_font();
+ //src.wd = 8;
+ //src.ht = 8;
+ //src.ops = &g_ops1;
+ for(; *s != '\0'; s++)
+ {
+ //src.raster = font + 8 * (*s);
+ //blit1(&src, bmp, x, y);
+ x += 8;
+ }
+}
+
void
modexWaitBorder() {
while(inp(INPUT_STATUS_1) & 8) {