X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fpcxtest.c;h=c05cff5f7f79a2093cb17ba3d895d468a671f6ee;hb=7cbfb3d1f53e33107205d1d8a5ed215898246504;hp=d955fdc9858b0f9f20d7b35ccb5150532b3fe892;hpb=2b0d2cafcea89594a31a2993efd8766cc1017725;p=16.git

diff --git a/src/pcxtest.c b/src/pcxtest.c
old mode 100644
new mode 100755
index d955fdc9..c05cff5f
--- a/src/pcxtest.c
+++ b/src/pcxtest.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.
  *
@@ -27,106 +27,85 @@
 #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, 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;
-	for(i=0; i<100 ;i++) {
+	//for(i=0; i<100 ;i++) {
 		oldDrawBmp(VGA, 20, 20, &bmp, 0);
-	}
+	//}
 
 	start = *clockw;
-	for(i=0; i<100 ;i++) {
-//0000		modexDrawBmp(&page, 20, 20, &bmp);
-		modexDrawBmp(&page, 0, 0, &bmp);
-	}
+	//for(i=0; i<100 ;i++) {
+//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);
-	}
+	//for(i=0; i<100; i++) {
+//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;
 
 
 	start = *clockw;
-	for(i=0; i<100 ;i++) {
+	//for(i=0; i<100 ;i++) {
 		oldDrawBmp(VGA, 20, 20, &bmp, 1);
-	}
+	//}
 
 
 	start = *clockw;
-	for(i=0; i<100 ;i++) {
-//0000		modexDrawSprite(&page, 20, 20, &bmp);
-		modexDrawSprite(&page, 0, 0, &bmp);
-	}
-	//_fmemset(MK_FP(0xA000, 0), (int)p->plane, SCREEN_WIDTH*(SCREEN_HEIGHT*2));
-	modexDrawBmp(&page, 0, 0, &bmp);
+	//for(i=0; i<100 ;i++) {
+//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, 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, 1, &gvar);
+	/*printf("\nmain=%Fp\n\n", &i);
+	printf("bmp.data=%Fp\n", bmp.data);
+	printf("*bmp.data=%Fp\n", *(bmp.data));
+	printf("&bmp.data=%Fp\n", &(bmp.data));
 
 	printf("\n%d\n", sizeof(p->plane));
-	printf("%d\n", sizeof(bmp));
+	printf("%d\n", sizeof(bmp));*/
 
-	for(i=0; i<(320*240); i++)
+	/*for(i=0; i<(320*240); i++)
 	{
 		fprintf(stdout, "%d", bmp.data[i]);
-		if(i%320==0) fprintf(stdout, "\n");
-	}
+		if(i%bmp.width==0) fprintf(stdout, "\n");
+	}*/
 	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;
 }