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

diff --git a/src/planrpcx.c b/src/planrpcx.c
index db3c9612..4a829592 100755
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -28,32 +28,29 @@
 #include "src/lib/planar.h"
 
 global_game_variables_t gvar;
+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;
 	word px,py;
 	sword baka;
-	//char *pee;
 	char *bakapeee;
 
 	bakapeee = malloc(64);
 
- 	if(argv[1]) bakapeee = argv[1];
- 	else bakapeee = "data/koishi~.pcx";
+	if(argv[1]) bakapeee = argv[1];
+	else bakapeee = "data/koishi~.pcx";
 
-// 	if(argv[2]) baka = atoi(argv[2]);
-// 	else
-baka = 1;
-//0000	bmp = bitmapLoadPcx("data/koishi~~.pcx");
- 	bmp = bitmapLoadPcx(bakapeee);
-	//bmp = bitmapLoadPcx("data/koishi~.pcx");
+	if(argv[2]) baka = atoi(argv[2]);
+	else baka = 1;
+
+	bmp = bitmapLoadPcx(bakapeee);
 	p = planar_buf_from_bitmap(&bmp);
 	VGAmodeX(baka, &gvar);
 	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
@@ -62,7 +59,7 @@ baka = 1;
 	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;
@@ -70,30 +67,23 @@ baka = 1;
 	modexShowPage(&gvar.video.page[0]);
 
 	/* non sprite comparison */
-// 	start = *clockw;
+	start = *clockw;
 // 		oldDrawBmp(VGA, 20, 20, &bmp, 0);
+	for(i=0; i<100 ;i++) {
+		modexDrawBmp(&gvar.video.page[0], 32, 32, &bmp);
+	}
+	t1 = (*clockw-start) /18.2;
 // 	start = *clockw;
-//0000		modexDrawBmp(&gvar.video.page[0], 20, 20, &bmp);
-// 		modexDrawBmp(&gvar.video.page[0], 160, 120, &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);
-//i=0;
-//plane=0;
-//	_fmemset(VGA, (int) p->plane[plane++][i++], p->width*p->height);
-	//modexDrawBmp(&gvar.video.page[0], 0, 0, &bmp);
-	DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);
+	start = *clockw;
+	for(i=0; i<100 ;i++) {
+		DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);
+	}
+	t2 = (*clockw-start) /18.2;
 	while(!kbhit())
 	{
-		//if(argv[2]) pee = strcpy(VGA, &(p->plane[plane][24]));
-	}//gvar.video.page[0].data
+	}
 	VGAmodeX(0, &gvar);
 	/*printf("\nmain=%Fp\n\n", &i);
 	printf("bmp.data=%Fp\n", bmp.data);
@@ -111,17 +101,17 @@ baka = 1;
 			printf("\n");
 		}
 	}
-	printf("Project 16 planrpcx.exe. This is just a test file!\n");
-	printf("version %s\n", VERSION);
+	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,"%s\n", *pee);
-// 	fprintf(stderr, "CPU to VGA: %f\n", t1);
-// 	fprintf(stderr, "VGA to VGA: %f\n", t2);
+	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;