X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fplanrpcx.c;h=6fe5ad7f57ac0fdc71f0b09987c33e8f1c912758;hb=acd620ca492b03e6118fd56752456187bd59f5fc;hp=fe3a085aa2f8a0fa56c1b896c5e6fab4aff058ba;hpb=34d0a1776e7bd46db8ac385babb9fdf0a2195f56;p=16.git

diff --git a/src/planrpcx.c b/src/planrpcx.c
index fe3a085a..6fe5ad7f 100755
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -28,60 +28,48 @@
 #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;
-	word i;
-
-	// TODO Make this fast.  It's SLOOOOOOW
-	for(plane=0; plane < 4; plane++) {
-		i=0;
-		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][i++]);
-				offset+=p->width;
-				offset++;
-		}
-	}
-	}
-}
-
+bitmap_t bmp, ptmpbt;
+//planar_buf_t *p, *ptmp;
+planar_buf_t pnp, ptmpnp;
 
 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, tpee;
 	int x,y;
-	sword bakapee;
+	word px,py;
+	sword baka;
+	char *bakapeee;
+
+	byte l[1024];
+	word j,chw,xp,col,bgcol;
+
+
+	bakapeee = malloc(64);
+
+	if(argv[1]) bakapeee = argv[1];
+	else bakapeee = "data/koishi~.pcx";
+
+//	if(argv[2]) baka = atoi(argv[2]);
+//	else
+baka = 1;
 
-	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");
-	p = planar_buf_from_bitmap(&bmp);
-	VGAmodeX(bakapee, &gvar);
+	bmp = bitmapLoadPcx(bakapeee);
+	//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]);
-	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;
@@ -89,56 +77,74 @@ 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++) {
+//		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;
-//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++) {
+		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);
 	while(!kbhit())
 	{
-		DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);
 	}
 	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));*/
-
-	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++) {
-				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, "\n");
-// 	fprintf(stderr, "CPU to VGA: %f\n", t1);
-// 	fprintf(stderr, "VGA to VGA: %f\n", t2);
+	col=0x0d, bgcol=0;
+	/*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);
+		j=4<<8;
+		fprintf(stderr, "j<<=%u\n", j);
+		xp=0;
+		while(j)
+		{
+			//modexputPixel(page, x+xp+chw, y+i, l[i] & j ? col:bgcol);
+			//fprintf(stderr, "%u", l[i] & j ? col:bgcol);
+			xp++;
+			j>>=4;
+			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;