X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fplanrpcx.c;h=bb473178e11221650b389cf03611fa484b4ed352;hb=544ccf6efbf54ec3bf18c0dc1a71a9943f493905;hp=7a703c2615560f17d5742ebdcabd51901e1b2966;hpb=6c3ff0c690efc48321f0cd69177601dfbfcc5c37;p=16.git

diff --git a/src/planrpcx.c b/src/planrpcx.c
index 7a703c26..bb473178 100755
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -24,26 +24,26 @@
 #include <dos.h>
 #include <string.h>
 #include "src/lib/modex16.h"
-#include "src/lib/modex16/planar16.h"
 
 global_game_variables_t gvar;
-planar_buf_t huge p, ptmp;
+planar_buf_t p, ptmp;
+int i;
+word start;//,	w;
+int plane;
+float t1, t2, t3, t4, tpee;
+int x,y;
+word px,py;
+sword baka;
+char *bakapeee;
 
 void main(int argc, char *argv[])
 {
-	int i;
-	word start;
-	int plane;
-	float t1, t2, tpee;
-	int x,y;
-	word px,py;
-	sword baka;
-	char *bakapeee;
 
-	byte l[1024];
+	//byte l[1024];
 	word j,chw,xp,col,bgcol;
 
-
+//w=0;
+//printf("%u ", w++);
 	bakapeee = malloc(64);
 
 	if(argv[1]) bakapeee = argv[1];
@@ -52,10 +52,15 @@ void main(int argc, char *argv[])
 //	if(argv[2]) baka = atoi(argv[2]);
 //	else
 baka = 1;
-
+//fprintf(stderr, "%u ", w++);
 	p = planarLoadPcx(bakapeee);
-	ptmp = planarLoadPcx("data/ptmp.pcx");
-/*	VGAmodeX(baka, &gvar);
+//fprintf(stderr, "%u ", w++);
+//	ptmp = planarLoadPcx("data/ptmp.pcx");
+//fprintf(stderr, "%u ", w++);
+//fprintf(stderr, "^^;", w++);
+//getch();
+
+	VGAmodeX(baka, &gvar);
 	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 
 	//fix up the palette and everything
@@ -73,40 +78,50 @@ baka = 1;
 	start = *clockw;
 // 		oldDrawBmp(VGA, 20, 20, &bmp, 0);
 	for(i=0; i<100 ;i++) {
-		modexDrawBmpPBufRegion	(&gvar.video.page[0], 32, 32, 0, 0, p.width, p.height, &p);
-//		modexDrawBmpPBuf		(&gvar.video.page[0], 32, 32, p);
+		//modexDrawBmpPBuf		(&gvar.video.page[0], 32, 32, &p);
 	}
 	t1 = (*clockw-start) /18.2;
+	for(i=0; i<100 ;i++) {
+		modexDrawBmpPBufRegion	(&gvar.video.page[0], p.width+32, 32, 0, 0, p.width, p.height, &p);
+	}
+	t2 = (*clockw-start) /18.2;
+	getch();
 // 	start = *clockw;
 // 		modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 0, 0, 0, 0, 320, 240);
 // 	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(ptmp.palette);
+	t3 = (*clockw-start) /18.2;
+getch();
+	for(i=0; i<100 ;i++) {
+						//(page_t *page, int x, int y, int rx, int ry, int rw, int rh, planar_buf_t *p, boolean sprite);
+		modexDrawPBufRegion	(&gvar.video.page[0], p.width, 0, p.width-16, p.height-16, 16, 16, &p, 0);//(&gvar.video.page[0], 0, 0, 0+p.width, 0, p.width, p.height, &p, 0);
+	}
+	t4 = (*clockw-start) /18.2;
+	//++++	modexPalUpdate1(ptmp.palette);
 	//modexDrawBmpPBufRegion(&gvar.video.page[0], 64, 64, 48, 32, 24, 32, ptmp);
-	modexDrawPBuf(&gvar.video.page[0], 64, 64, &ptmp, 0);
+	//modexDrawPBuf(&gvar.video.page[0], 64, 64, &ptmp, 0);
 	while(!kbhit())
 	{
 	}
-	VGAmodeX(0, &gvar);*/
+	VGAmodeX(0, &gvar);
 
 	//print out the contents of each plane
 	for(plane=0; plane < 4; plane++) {
 		i=0;
 		printf("Plane %d\n", plane);
-		for(py=0; py < ptmp.height; py++) {
-			for(px=0; px < ptmp.pwidth; px++) {
-				printf("%02X ", (int) ptmp.plane[plane][i++]);
+		for(py=0; py < p.height; py++) {
+			for(px=0; px < p.pwidth; px++) {
+				printf("%02X ", (int) p.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;
@@ -134,12 +149,10 @@ baka = 1;
 	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, "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;
+	fprintf(stderr, "modexDrawPBuf:	%f\n", t3);
+	fprintf(stderr, "speed difference	%f\n", t3/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);
 }