X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fplanrpcx.c;h=eea4796ca6dc515ba0eedc765c0087a0d88857a9;hb=f3c21c71444277afd8389f577439ab655620ce51;hp=72f2fb8f52337f0ef9619604e3a7018656a4736b;hpb=4c9eee501e6c8d422a2b6bd1c6e6294b1e99d81b;p=16.git

diff --git a/src/planrpcx.c b/src/planrpcx.c
index 72f2fb8f..eea4796c 100755
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -24,23 +24,25 @@
 #include <dos.h>
 #include <string.h>
 #include "src/lib/modex16.h"
+#include "src/lib/modex16/16planar.h"
 
 global_game_variables_t gvar;
 planar_buf_t p, ptmp;
 int i;
 word start;//,	w;
 int plane;
-float t1, t2, tpee;
+float t1, t2, t3, t4, tpee;
 int x,y;
 word px,py;
 sword baka;
 char *bakapeee;
 
+
 void main(int argc, char *argv[])
 {
 
-	//byte l[1024];
-	word j,chw,xp,col,bgcol;
+	byte l[1024];
+	byte pee[2];
 
 //w=0;
 //printf("%u ", w++);
@@ -54,14 +56,14 @@ void main(int argc, char *argv[])
 baka = 1;
 //fprintf(stderr, "%u ", w++);
 	p = planarLoadPcx(bakapeee);
-	exit(0);
 //fprintf(stderr, "%u ", w++);
 //	ptmp = planarLoadPcx("data/ptmp.pcx");
 //fprintf(stderr, "%u ", w++);
 //fprintf(stderr, "^^;", w++);
 //getch();
 
-	VGAmodeX(baka, &gvar);
+	textInit();
+	VGAmodeX(baka, 1, &gvar);
 	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 
 	//fix up the palette and everything
@@ -79,71 +81,60 @@ 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, p.width-(p.width/4), p.height-(p.height/4), p.width/4, p.height/4, &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;
-//++++	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-(p.width/4), p.height-(p.height/4), p.width/4, p.height/4, &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, 1, &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++)
-	{
-		//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(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));
+	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));
 	free(bakapeee);
-	//fprintf(stderr, "modexDrawBmpPBuf:	%f\n", t1);
-	//fprintf(stderr, "modexDrawPBuf:	%f\n", t2);
-	//fprintf(stderr, "speed difference	%f\n", t2/t1);
+	fprintf(stderr, "modexDrawBmpPBufRegion:	%f\n", t2);
+	fprintf(stderr, "modexDrawPBufRegion:	%f\n", t4);
+	fprintf(stderr, "speed difference	%f\n", t2/t4);
 	//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);
 }