X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fplanrpcx.c;h=fea908f5d4e3e154067f64527b35f929b8a4afbc;hb=b86d6405d4000f67776b98d6cee575d08dd736a6;hp=7ed2b7b95bb07214034bf5680575e335a8043be6;hpb=2ac6d138ce852064f3c792957880a87b5f3d4523;p=16.git

diff --git a/src/planrpcx.c b/src/planrpcx.c
index 7ed2b7b9..fea908f5 100755
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -28,15 +28,16 @@
 #include "src/lib/planar.h"
 
 global_game_variables_t gvar;
-bitmap_t bmp;
-planar_buf_t *p;
+bitmap_t bmp, ptmpbt;
+//planar_buf_t *p, *ptmp;
+planar_buf_t pnp, ptmpnp;
 
 void main(int argc, char *argv[])
 {
 	int i;
 	word start;
 	int plane;
-	float t1, t2;
+	float t1, t2, tpee;
 	int x,y;
 	word px,py;
 	sword baka;
@@ -56,7 +57,11 @@ void main(int argc, char *argv[])
 baka = 1;
 
 	bmp = bitmapLoadPcx(bakapeee);
-	p = planar_buf_from_bitmap(&bmp);
+	//p = planar_buf_from_bitmap(&bmp);
+	pnp = planar_buf_from_bitmap0(&bmp);
+	ptmpbt = bitmapLoadPcx("data/ptmp.pcx");
+	//ptmp = planar_buf_from_bitmap(&ptmpbt);
+	ptmpnp = planar_buf_from_bitmap0(&ptmpbt);
 	VGAmodeX(baka, &gvar);
 	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 
@@ -75,7 +80,8 @@ baka = 1;
 	start = *clockw;
 // 		oldDrawBmp(VGA, 20, 20, &bmp, 0);
 	for(i=0; i<100 ;i++) {
-		modexDrawBmp(&gvar.video.page[0], 32, 32, &bmp);
+//		modexDrawBmpPBufRegion	(&gvar.video.page[0], 32, 32, 0, 0, pnp.width, pnp.height, &pnp);
+		modexDrawBmpPBuf		(&gvar.video.page[0], 32, 32, &pnp);
 	}
 	t1 = (*clockw-start) /18.2;
 // 	start = *clockw;
@@ -83,50 +89,36 @@ baka = 1;
 // 	t2 = (*clockw-start)/18.2;
 	start = *clockw;
 	for(i=0; i<100 ;i++) {
-		DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);
+		modexDrawPBuf(&gvar.video.page[0], 0, 0, &pnp, 0);
 	}
 	t2 = (*clockw-start) /18.2;
+	getch();
+	modexPalUpdate1(ptmpbt.palette);
+	//modexDrawBmpPBufRegion(&gvar.video.page[0], 64, 64, 48, 32, 24, 32, &ptmpnp);
+	modexDrawPBuf(&gvar.video.page[0], 64, 64, &ptmpnp, 0);
 	while(!kbhit())
 	{
 	}
 	VGAmodeX(0, &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));*/
 
 	/* print out the contents of each plane */
 	for(plane=0; plane < 4; plane++) {
 		i=0;
 		printf("Plane %d\n", plane);
-		for(py=0; py < p->height; py++) {
-			for(px=0; px < p->pwidth; px++) {
-				printf("%02X ", (int) p->plane[plane][i++]);
+		for(py=0; py < ptmpnp.height; py++) {
+			for(px=0; px < ptmpnp.pwidth; px++) {
+				printf("%02X ", (int) ptmpnp.plane[plane][i++]);
 			}
 			printf("\n");
 		}
 	}
-	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);
-	free(bakapeee);
-	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);
 	col=0x0d, bgcol=0;
-	for(i=0; i<8; i++)
+	/*for(i=0; i<8; i++)
 	{
-		/*modexSelectPlane(PLANE(x));
-		j=1<<8;
-		*bakapee=(l[i] & j ? col:bgcol);
-		_fmemcpy(page->data + (((page->width/4) * (y+page->dy+i)) + ((x+page->dx+chw) / 4)), bakapee, 8);*/
+		//modexSelectPlane(PLANE(x));
+		//j=1<<8;
+		//*bakapee=(l[i] & j ? col:bgcol);
+		//_fmemcpy(page->data + (((page->width/4) * (y+page->dy+i)) + ((x+page->dx+chw) / 4)), bakapee, 8);
 		j=4<<8;
 		fprintf(stderr, "j<<=%u\n", j);
 		xp=0;
@@ -139,7 +131,22 @@ baka = 1;
 			fprintf(stderr, "	j>>=%u\n", j);
 		}
 		//fprintf(stderr, "\n");
-	}
+	}*/
 	chw += xp;
+	fprintf(stderr,"Project 16 planrpcx.exe. This is just a test file!\n");
+	fprintf(stderr,"version %s\n", VERSION);
+	fprintf(stderr,"%d\n", sizeof(pnp.plane));
+	fprintf(stderr,"pw=%d\n", pnp.width);
+	fprintf(stderr,"ph=%d\n", pnp.height);
+	fprintf(stderr,"ppw=%d\n", pnp.pwidth);
+	fprintf(stderr,"%d\n", sizeof(bmp));
+	fprintf(stderr,"%dx%d\n", gvar.video.page[0].sw-(pnp.width), gvar.video.page[0].sh-(pnp.height));
+	//planar_buf_free(p);
+	free(bakapeee);
+	fprintf(stderr, "modexDrawBmpPBuf:	%f\n", t1);
+	fprintf(stderr, "modexDrawPBuf:	%f\n", t2);
+	fprintf(stderr, "speed difference	%f\n", t2/t1);
+	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;
 }