X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fplanrpcx.c;h=4a8295920fb72b3b9421a3b42c8f55e8de87faf4;hb=fade6fa668b20579a9c4744597a4bf67f31fe972;hp=b8c8578423af721902c077667ce8e763c65e85d8;hpb=f79335f0b025aa7c3dab4abaf6cdc147dd32ef1a;p=16.git

diff --git a/src/planrpcx.c b/src/planrpcx.c
index b8c85784..4a829592 100755
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -28,59 +28,38 @@
 #include "src/lib/planar.h"
 
 global_game_variables_t gvar;
-
-
-void
-DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, byte sprite)
-{
-	word 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]);
-				offset+=p->width;
-				offset++;
-		}
-	}
-	}
-}
-
+bitmap_t bmp;
+planar_buf_t *p;
 
 void main(int argc, char *argv[])
 {
-	bitmap_t bmp;
-	planar_buf_t *p;
 	int i;
-	//word start;
+	word start;
 	int plane;
-	//float t1, t2;
+	float t1, t2;
 	int x,y;
-	sword bakapee;
+	word px,py;
+	sword baka;
+	char *bakapeee;
+
+	bakapeee = malloc(64);
 
-	if(argv[1]) bakapee = atoi(argv[1]);
-	else bakapee = 1;
-//0000	bmp = bitmapLoadPcx("data/koishi~~.pcx");
-//	bmp = bitmapLoadPcx("data/chikyuu.pcx");
-	bmp = bitmapLoadPcx("data/koishi^^.pcx");
+	if(argv[1]) bakapeee = argv[1];
+	else bakapeee = "data/koishi~.pcx";
+
+	if(argv[2]) baka = atoi(argv[2]);
+	else baka = 1;
+
+	bmp = bitmapLoadPcx(bakapeee);
 	p = planar_buf_from_bitmap(&bmp);
-	VGAmodeX(bakapee, &gvar);
+	VGAmodeX(baka, &gvar);
 	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
-	gvar.video.page[0].sw+=32;
-	gvar.video.page[0].sh+=32;
 
 	/* fix up the palette and everything */
 	modexPalUpdate1(bmp.palette);
 
 	/* clear and draw one sprite and one bitmap */
-	modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].sw, gvar.video.page[0].sh, 1);
+	modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].sw, gvar.video.page[0].sh, 0);
 
 	/* update display~*/
 	gvar.video.page[0].dx+=32;
@@ -88,32 +67,22 @@ void main(int argc, char *argv[])
 	modexShowPage(&gvar.video.page[0]);
 
 	/* non sprite comparison */
-// 	start = *clockw;
+	start = *clockw;
 // 		oldDrawBmp(VGA, 20, 20, &bmp, 0);
-
-// 	start = *clockw;
-//0000		modexDrawBmp(&gvar.video.page[0], 20, 20, &bmp);
-// 		modexDrawBmp(&gvar.video.page[0], 160, 120, &bmp);
-// 	t1 = (*clockw-start) /18.2;
-
+	for(i=0; i<100 ;i++) {
+		modexDrawBmp(&gvar.video.page[0], 32, 32, &bmp);
+	}
+	t1 = (*clockw-start) /18.2;
 // 	start = *clockw;
-//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;
-// 		oldDrawBmp(VGA, 20, 20, &bmp, 1);
-
-
-// 	start = *clockw;
-//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);
+	start = *clockw;
+	for(i=0; i<100 ;i++) {
+		DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);
+	}
+	t2 = (*clockw-start) /18.2;
 	while(!kbhit())
 	{
-		DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);
 	}
 	VGAmodeX(0, &gvar);
 	/*printf("\nmain=%Fp\n\n", &i);
@@ -121,23 +90,28 @@ void main(int argc, char *argv[])
 	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));
-
 	/* print out the contents of each plane */
 	for(plane=0; plane < 4; plane++) {
 		i=0;
 		printf("Plane %d\n", plane);
-		for(y=0; y < p->height; y++) {
-			for(x=0; x < p->pwidth; x++) {
+		for(py=0; py < p->height; py++) {
+			for(px=0; px < p->pwidth; px++) {
 				printf("%02X ", (int) p->plane[plane][i++]);
 			}
 			printf("\n");
 		}
 	}
-	fprintf(stderr, "\n");
-// 	fprintf(stderr, "CPU to VGA: %f\n", t1);
-// 	fprintf(stderr, "VGA to VGA: %f\n", t2);
+	fprintf(stderr,"Project 16 planrpcx.exe. This is just a test file!\n");
+	fprintf(stderr,"version %s\n", VERSION);
+	fprintf(stderr,"%d\n", sizeof(p->plane));
+	fprintf(stderr,"pw=%d\n", p->width);
+	fprintf(stderr,"ph=%d\n", p->height);
+	fprintf(stderr,"ppw=%d\n", p->pwidth);
+	fprintf(stderr,"%d\n", sizeof(bmp));
+	fprintf(stderr,"%dx%d\n", gvar.video.page[0].sw-(p->width), gvar.video.page[0].sh-(p->height));
+	planar_buf_free(p);
+	fprintf(stderr, "modexDrawBmp:	%f\n", t1);
+	fprintf(stderr, "DrawPBuf:	%f\n", t2);
 	fprintf(stderr, "gvar.video.page[0].width: %u\n", gvar.video.page[0].width);
 	fprintf(stderr, "gvar.video.page[0].height: %u\n", gvar.video.page[0].height);
 	return;