X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fmodex16.c;h=3bf65ee40fa12bc96c404d3b1b7cfb21bd26e38f;hb=2fa06f324b3d3f955a4f6dc59bc9eb57e0ca22a6;hp=fc1456dbf2ff7be6763dc892240ad09832d9e919;hpb=fa22c78a917561d4abf178f8c4f51b9526f665cf;p=16.git
diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index fc1456db..3bf65ee4 100644
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -1,3 +1,25 @@
+/* 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
@@ -6,7 +28,6 @@
#include
#include "src/lib/modex16.h"
-
byte far* VGA=(byte far*) 0xA0000000; /* this points to video memory. */
static void fadePalette(sbyte fade, sbyte start, word iter, byte *palette);
@@ -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) */
@@ -226,7 +287,7 @@ void
modexDrawBmpRegion(page_t *page, int x, int y,
int rx, int ry, int rw, int rh, bitmap_t *bmp) {
word poffset = (word) page->data + y*(page->width/4) + x/4;
- byte far *data = bmp->data;//+bmp->offset;
+ byte *data = bmp->data;//+bmp->offset;
word bmpOffset = (word) data + ry * bmp->width + rx;
word width = rw;
word height = rh;
@@ -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:
@@ -307,7 +368,7 @@ void
modexDrawSpriteRegion(page_t *page, int x, int y,
int rx, int ry, int rw, int rh, bitmap_t *bmp) {
word poffset = (word)page->data + y*(page->width/4) + x/4;
- byte far *data = bmp->data;//+bmp->offset;
+ byte *data = bmp->data;//+bmp->offset;
word bmpOffset = (word) data + ry * bmp->width + rx;
word width = rw;
word height = rh;
@@ -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: