X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fpcxtest.c;h=f423b6a522b7042aebfb8fda2359832dfecbcdcf;hb=b673eb589dee543a4dd0cbe2eb6fda1994e99aca;hp=07a4795d487aac8355418a993378365fb7702030;hpb=007099230dad9fac10cfd7c3c3b82eedd2df0bae;p=16.git

diff --git a/src/pcxtest.c b/src/pcxtest.c
index 07a4795d..f423b6a5 100755
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -27,56 +27,29 @@
 #include "src/lib/bitmap.h"
 #include "src/lib/planar.h"
 
-word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
-
-/*
-void
-DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, 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 < p->width; px+=4) {
-		offset=px;
-		for(py=0; py<p->height/2; py++) {
-		SELECT_ALL_PLANES();
-		if(!sprite || p->plane[offset])
-			page->data = p->plane;
-		//offset+=p->width;
-		//offset++;
-		}
-	}
-	}
-}
-*/
+global_game_variables_t gvar;
 
 void main() {
 	bitmap_t bmp;
 	planar_buf_t *p;
 	int i;
-	page_t page;
 	word start;
 	int plane;
 	float t1, t2;
 
-	page=modexDefaultPage();
-
 //0000	bmp = bitmapLoadPcx("data/koishi~~.pcx");
 //	bmp = bitmapLoadPcx("data/chikyuu.pcx");
 	bmp = bitmapLoadPcx("data/koishi^^.pcx");
 //	bmp = bitmapLoadPcx("16/PCX_LIB/chikyuu.pcx");
 	p = planar_buf_from_bitmap(&bmp);
-	modexEnter();
+	VGAmodeX(1, &gvar);
+	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 
 	/* fix up the palette and everything */
 	modexPalUpdate1(bmp.palette);
 
 	/* clear and draw one sprite and one bitmap */
-	modexClearRegion(&page, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 1);
+	modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].sw, gvar.video.page[0].sh, 1);
 
 	/* non sprite comparison */
 	start = *clockw;
@@ -86,15 +59,15 @@ void main() {
 
 	start = *clockw;
 	//for(i=0; i<100 ;i++) {
-//0000		modexDrawBmp(&page, 20, 20, &bmp);
-		modexDrawBmp(&page, 160, 120, &bmp);
+//0000		modexDrawBmp(&gvar.video.page[0], 20, 20, &bmp);
+		modexDrawBmp(&gvar.video.page[0], 160, 120, &bmp);
 	//}
 	t1 = (*clockw-start) /18.2;
 
 	start = *clockw;
 	//for(i=0; i<100; i++) {
-//0000		modexCopyPageRegion(&page, &page, 20, 20, 128, 20, 64, 64);
-		modexCopyPageRegion(&page, &page, 0, 0, 0, 0, 320, 240);
+//0000		modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 20, 20, 128, 20, 64, 64);
+		modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 0, 0, 0, 0, 320, 240);
 	//}
 	t2 = (*clockw-start)/18.2;
 
@@ -107,16 +80,16 @@ void main() {
 
 	start = *clockw;
 	//for(i=0; i<100 ;i++) {
-//0000		modexDrawSprite(&page, 20, 20, &bmp);
-		modexDrawSprite(&page, 160, 120, &bmp);
+//0000		modexDrawSprite(&gvar.video.page[0], 20, 20, &bmp);
+		modexDrawSprite(&gvar.video.page[0], 160, 120, &bmp);
 	//}
-	//_fmemset(MK_FP(0xA000, 0), (int)p->plane, SCREEN_WIDTH*(SCREEN_HEIGHT*2));
-	//modexDrawBmp(&page, 0, 0, &bmp);
+	//_fmemset(MK_FP(0xA000, 0), (int)p->plane, gvar.video.page[0].sw*(gvar.video.page[0].sh*2));
+	//modexDrawBmp(&gvar.video.page[0], 0, 0, &bmp);
 	while(!kbhit())
 	{
-		//DrawPBuf(&page, 0, 0, p, 0);
+		//DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);
 	}
-	modexLeave();
+	VGAmodeX(0, &gvar);
 	/*printf("\nmain=%Fp\n\n", &i);
 	printf("bmp.data=%Fp\n", bmp.data);
 	printf("*bmp.data=%Fp\n", *(bmp.data));
@@ -132,5 +105,7 @@ void main() {
 	}*/
 	printf("CPU to VGA: %f\n", t1);
 	printf("VGA to VGA: %f\n", t2);
+	printf("gvar.video.page[0].width: %u\n", gvar.video.page[0].width);
+	printf("gvar.video.page[0].height: %u\n", gvar.video.page[0].height);
 	return;
 }