X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fplanrpcx.c;h=fdbc6df30271b8d7b7bd0d946443292650667a71;hb=b4b0b1050a3f3d2e2d9f71a42520bb84bff86a43;hp=dda07176094fa417887619ac22e1ed4893616afd;hpb=2eb78909ad7e8079fbec7dbe794fe0eac01e15de;p=16.git

diff --git a/src/planrpcx.c b/src/planrpcx.c
index dda07176..fdbc6df3 100755
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -24,19 +24,17 @@
 #include <dos.h>
 #include <string.h>
 #include "src/lib/modex16.h"
-#include "src/lib/bitmap.h"
-#include "src/lib/planar.h"
+#include "src/lib/modex16/planar16.h"
 
 global_game_variables_t gvar;
-bitmap_t bmp, ptmpbt;
-planar_buf_t *p, *ptmp;
+planar_buf_t huge p, ptmp;
 
 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;
@@ -55,15 +53,13 @@ void main(int argc, char *argv[])
 //	else
 baka = 1;
 
-	bmp = bitmapLoadPcx(bakapeee);
-	p = planar_buf_from_bitmap(&bmp);
-	ptmpbt = bitmapLoadPcx("data/ptmp.pcx");
-	ptmp = planar_buf_from_bitmap(&bmp);
+	p = planarLoadPcx(bakapeee);
+	ptmp = planarLoadPcx("data/ptmp.pcx");
 	VGAmodeX(baka, &gvar);
 	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 
 	/* fix up the palette and everything */
-	modexPalUpdate1(bmp.palette);
+	modexPalUpdate1(p.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, 0);
@@ -77,7 +73,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, p.width, p.height, &p);
+//		modexDrawBmpPBuf		(&gvar.video.page[0], 32, 32, p);
 	}
 	t1 = (*clockw-start) /18.2;
 // 	start = *clockw;
@@ -85,39 +82,36 @@ baka = 1;
 // 	t2 = (*clockw-start)/18.2;
 	start = *clockw;
 	for(i=0; i<100 ;i++) {
-		modexDrawPBuf(&gvar.video.page[0], 0, 0, p, 0);
+		modexDrawPBuf(&gvar.video.page[0], 0, 0, &p, 0);
 	}
 	t2 = (*clockw-start) /18.2;
 	getch();
-	modexPalUpdate1(ptmpbt.palette);
-	modexDrawPBufRegion(&gvar.video.page[0], 140, 140, 48, 32, 24, 32, ptmp, 1);
+	modexPalUpdate1(ptmp.palette);
+	//modexDrawBmpPBufRegion(&gvar.video.page[0], 64, 64, 48, 32, 24, 32, ptmp);
+	modexDrawPBuf(&gvar.video.page[0], 64, 64, &ptmp, 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 < ptmp.height; py++) {
+			for(px=0; px < ptmp.pwidth; px++) {
+				printf("%02X ", (int) ptmp.plane[plane][i++]);
 			}
 			printf("\n");
 		}
 	}
 	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;
@@ -130,20 +124,21 @@ 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(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,"%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(p));
+	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, "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;