X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2F0.c;h=47a0e29ac66bbc8d195d96b5088cca2679bc2be7;hb=4ecf82fc48a4a19ff72cd89bce7d0bda18cf2f0c;hp=c0f215374d7aad49b59ca6b664db3df9b0e18c50;hpb=310f4da6ca5a87f9b69e8de7cbe4407703415f54;p=16.git

diff --git a/src/0.c b/src/0.c
index c0f21537..47a0e29a 100755
--- a/src/0.c
+++ b/src/0.c
@@ -5,32 +5,41 @@
 
 #include "src/tesuto.h"
 
-#define FILENAME_1 "data/aconita.vrl"
-#define FILENAME_2 "data/aconita.pal"
+//#define FILENAME_1 "data/aconita.vrl"
+//#define FILENAME_2 "data/aconita.pal"
+#define FILENAME_1 "data/spri/chikyuu.vrl"
+#define FILENAME_2 "data/spri/chikyuu.pal"
+
+//#define PATTERN
+#define INITTNUM 1
 
 static unsigned char palette[768];
-global_game_variables_t gvar;
 player_t player[MaxPlayers];
+map_view_t mv[4];
+pan_t pan;
 
-int main(int argc,char **argv) {
+int main(int argc,char **argv)
+{
+	static global_game_variables_t gvar;
 	struct vrl1_vgax_header *vrl_header;
 	vrl1_vgax_offset_t *vrl_lineoffs;
 	unsigned char *buffer;
 	unsigned int bufsz;
-	int fd;
+	int fd, i;
 	char *bakapee1,*bakapee2;
 
+	boolean anim=1,noanim=1;
+
+	pan.pn=0;
+
 	bakapee1=malloc(64);
 	bakapee2=malloc(1024);
 
-	IN_Startup();
-	IN_Default(0,&player,ctrl_Joystick);
-	IN_initplayer(&player, 0);
-
-	if (argc < 3) {
-		fprintf(stderr,"drawvrl <VRL file> <palette file>\n");
+	if (argc < 2) {
+		//fprintf(stderr,"drawvrl <VRL file> <palette file>\n palette file optional\n");
 		bakapee1 = FILENAME_1;//"data/aconita.vrl";
 		bakapee2 = FILENAME_2;//"data/aconita.pal";
+
 	}else{
 		if(argv[1]) bakapee1 = argv[1];
 		if(argv[2]) bakapee2 = argv[2];
@@ -82,13 +91,29 @@ int main(int argc,char **argv) {
 	vrl_lineoffs = vrl1_vgax_genlineoffsets(vrl_header,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));
 	if (vrl_lineoffs == NULL) return 1;
 
+	IN_Startup();
+	IN_Default(0,&player,ctrl_Keyboard1);
+	IN_initplayer(&player, 0);
+
 	/* setup camera and screen~ */
 	modexHiganbanaPageSetup(&gvar.video);
-	modexShowPage(&(gvar.video.page[0]));
+	modexShowPage(&(gvar.video.page[pan.pn]));
+	for(i=0;i<gvar.video.num_of_pages;i++)
+	{
+		mv[i].page = &gvar.video.page[i];
+		mv[i].video = &gvar.video;
+		mv[i].pan	= &pan;
+		mv[i].tx	= INITTNUM;
+		mv[i].ty	= INITTNUM;
+	}
+	//player[0].tx = INITTNUM; player[0].ty = INITTNUM;
+	//mapinitmapview(mv, player[0].tx, player[0].tx);
+
 
 	#define VMEMHEIGHT gvar.video.page[0].height+gvar.video.page[1].height
 
-	//4	this dose the screen
+	//4	this draws that pattern on the screen
+#ifdef PATTERN
 	{
 		unsigned int i,j,o;
 		/* fill screen with a distinctive pattern */
@@ -99,19 +124,25 @@ int main(int argc,char **argv) {
 				vga_state.vga_graphics_ram[o] = (i^j)&15; // VRL samples put all colors in first 15!
 		}
 	}
+#else
+	TESTBG;
+#endif
 
+	DRAWCORNERBOXES;
 
 	/* make distinctive pattern offscreen, render sprite, copy onscreen.
 	 * this time, we render the distinctive pattern to another offscreen location and just copy.
 	 * note this version is much faster too! */
 	{
-		unsigned int i,j,o,o2;
+		unsigned int i,o,o2;
 		int x,y,rx,ry,w,h;
 		unsigned int overdraw = 1;	// how many pixels to "overdraw" so that moving sprites with edge pixels don't leave streaks.
 						// if the sprite's edge pixels are clear anyway, you can set this to 0.
 		VGA_RAM_PTR omemptr;
 		int xdir=1,ydir=1;
 
+#ifdef PATTERN
+		int j;
 		/* fill pattern offset with a distinctive pattern */
 		for (i=0;i < gvar.video.page[0].width;i++) {
 			o = (i >> 2) + (0x10000UL - (uint16_t)gvar.video.page[1].data);
@@ -119,6 +150,10 @@ int main(int argc,char **argv) {
 			for (j=0;j < VMEMHEIGHT;j++,o += gvar.video.page[0].stridew)
 				vga_state.vga_graphics_ram[o] = (i^j)&15; // VRL samples put all colors in first 15!
 		}
+#else
+	TESTBG;
+#endif
+		DRAWCORNERBOXES;
 
 		/* starting coords. note: this technique is limited to x coordinates of multiple of 4 */
 		x = -(gvar.video.page[0].dx);
@@ -130,73 +165,89 @@ int main(int argc,char **argv) {
 		while(!IN_KeyDown(sc_Escape))
 		{
 			IN_ReadControl(0,&player);
-			if(IN_KeyDown(2)) modexShowPage(&(gvar.video.page[0]));
-			if(IN_KeyDown(3)) modexShowPage(&(gvar.video.page[1]));
-			if(IN_KeyDown(68))	//f10
+			PANKEY0EXE;
+			if(IN_KeyDown(68) || IN_KeyDown(sc_Space))	//f10 and space
 			{
 				//gvar.kurokku.fpscap=!gvar.kurokku.fpscap;
+				anim=!anim;
+				DRAWCORNERBOXES;
 				IN_UserInput(1,1);
 			}
-
-			/* render box bounds. y does not need modification, but x and width must be multiple of 4 */
-			if (x >= overdraw) rx = (x - overdraw) & (~3);
-			else rx = -(gvar.video.page[0].dx);
-			if (y >= overdraw) ry = (y - overdraw);
-			else ry = -(gvar.video.page[0].dy);
-			h = vrl_header->height + overdraw + y - ry;
-			w = (x + vrl_header->width + (overdraw*2) + 3/*round up*/ - rx) & (~3);
-			if ((rx+w) > gvar.video.page[0].width) w = gvar.video.page[0].width-rx;
-			if ((ry+h) > gvar.video.page[0].height) h = (gvar.video.page[0].height)-ry;
-
-			/* block copy pattern to where we will draw the sprite */
-			vga_setup_wm1_block_copy();
-			o2 = gvar.video.page[0].pagesize;
-			o = (0x10000UL - (uint16_t)gvar.video.page[1].data) + (ry * gvar.video.page[0].stridew) + (rx >> 2); // source offscreen
-			for (i=0;i < h;i++,o += gvar.video.page[0].stridew,o2 += (w >> 2)) vga_wm1_mem_block_copy(o2,o,w >> 2);
-			/* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */
-			vga_restore_rm0wm0();
-
-			/* replace VGA stride with our own and mem ptr. then sprite rendering at this stage is just (0,0) */
-			vga_state.vga_draw_stride_limit = (gvar.video.page[0].width + 3/*round up*/ - x) >> 2;
-			vga_state.vga_draw_stride = w >> 2;
-			vga_state.vga_graphics_ram = omemptr + gvar.video.page[0].pagesize;
-
-			/* then the sprite. note modding ram ptr means we just draw to (x&3,0) */
-			draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));
-
-			/* restore ptr */
-			vga_state.vga_graphics_ram = omemptr;
-
-			/* block copy to visible RAM from offscreen */
-			vga_setup_wm1_block_copy();
-			o = gvar.video.page[0].pagesize; // source offscreen
-			o2 = (ry * gvar.video.page[0].stridew) + (rx >> 2); // dest visible (original stride)
-			for (i=0;i < h;i++,o += vga_state.vga_draw_stride,o2 += gvar.video.page[0].stridew) vga_wm1_mem_block_copy(o2,o,w >> 2);
-			/* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */
-			vga_restore_rm0wm0();
-
-			/* restore stride */
-			vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = gvar.video.page[0].stridew;
-
-			/* step */
-			x += xdir; y += ydir;
-			if ((x + vrl_header->width) >= ((gvar.video.page[0].width + gvar.video.page[0].dx) - 1) || x == -(gvar.video.page[0].dx))
-				xdir = -xdir;
-			if ((y + vrl_header->height) >= ((gvar.video.page[0].height + gvar.video.page[0].dy) - 1) || y == -(gvar.video.page[0].dy))
-				ydir = -ydir;
-			//printf("[x%u y%u]	[rx%u ry%u]		[w%u h%u]\n", x, y, rx, ry, w, h);
+			if(IN_KeyDown(sc_R)){
+				gvar.video.page[0].dx=gvar.video.page[0].dy=gvar.video.page[1].dx=gvar.video.page[1].dy=16;
+				mv[0].tx = mv[0].ty = mv[1].tx = mv[1].ty = INITTNUM;
+				modexShowPage(&(gvar.video.page[pan.pn]));
+				player[0].q = 1; player[0].d = 2;
+				x=y=0;
+				xdir=ydir=1;
+			} //R
+			FUNCTIONKEYFUNCTIONS0EXE;
+
+			if(anim/* && !noanim*/)
+			{
+				/* render box bounds. y does not need modification, but x and width must be multiple of 4 */
+				if (x >= overdraw) rx = (x - overdraw) & (~3);
+				else rx = -(gvar.video.page[0].dx);
+				if (y >= overdraw) ry = (y - overdraw);
+				else ry = -(gvar.video.page[0].dy);
+				h = vrl_header->height + overdraw + y - ry;
+				w = (x + vrl_header->width + (overdraw*2) + 3/*round up*/ - rx) & (~3);
+				if ((rx+w) > gvar.video.page[0].width) w = gvar.video.page[0].width-rx;
+				if ((ry+h) > gvar.video.page[0].height) h = gvar.video.page[0].height-ry;
+
+				/* block copy pattern to where we will draw the sprite */
+				vga_setup_wm1_block_copy();
+				o2 = gvar.video.page[0].pagesize;
+				o = (0x10000UL - (uint16_t)gvar.video.page[1].data) + (ry * gvar.video.page[0].stridew) + (rx >> 2); // source offscreen
+				for (i=0;i < h;i++,o += gvar.video.page[0].stridew,o2 += (w >> 2)) vga_wm1_mem_block_copy(o2,o,w >> 2);
+				/* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */
+				vga_restore_rm0wm0();
+
+				/* replace VGA stride with our own and mem ptr. then sprite rendering at this stage is just (0,0) */
+				vga_state.vga_draw_stride_limit = (gvar.video.page[0].width + 3/*round up*/ - x) >> 2;
+				vga_state.vga_draw_stride = w >> 2;
+				vga_state.vga_graphics_ram = omemptr + gvar.video.page[0].pagesize;
+
+				/* then the sprite. note modding ram ptr means we just draw to (x&3,0) */
+draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));
+
+				/* restore ptr */
+				vga_state.vga_graphics_ram = omemptr;
+
+				/* block copy to visible RAM from offscreen */
+				vga_setup_wm1_block_copy();
+				o = gvar.video.page[0].pagesize; // source offscreen
+				o2 = (ry * gvar.video.page[0].stridew) + (rx >> 2); // dest visible (original stride)
+				for (i=0;i < h;i++,o += vga_state.vga_draw_stride,o2 += gvar.video.page[0].stridew) vga_wm1_mem_block_copy(o2,o,w >> 2);
+				/* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */
+				vga_restore_rm0wm0();
+
+				/* restore stride */
+				vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = gvar.video.page[0].stridew;
+
+				/* step */
+				x += xdir; y += ydir;
+				if ((x + vrl_header->width) >= ((gvar.video.page[0].width + gvar.video.page[0].dx) - 1) || x == -(gvar.video.page[0].dx))
+					xdir = -xdir;
+				if ((y + vrl_header->height) >= ((gvar.video.page[0].height + gvar.video.page[0].dy) - 1) || y == -(gvar.video.page[0].dy))
+					ydir = -ydir;
+				//printf("[x%u y%u]	[rx%u ry%u]		[w%u h%u]\n", x, y, rx, ry, w, h);
+			}
 		}
 	}
 
 	IN_UserInput(1,1);
 
-	while(!IN_KeyDown(sc_Escape))
-	{
-		if(IN_KeyDown(2)) modexShowPage(&(gvar.video.page[0]));
-		if(IN_KeyDown(3)) modexShowPage(&(gvar.video.page[1]));
-	}
+// 	while(!IN_KeyDown(sc_Escape))
+// 	{
+// 		IN_ReadControl(0,&player);
+// 		PANKEY0EXE;
+// 	}
+
+//===========================================================================//
 
 	modexShowPage(&(gvar.video.page[0]));
+if(!noanim) {
 	/* another handy "demo" effect using VGA write mode 1.
 	 * we can take what's on screen and vertically squash it like an old analog TV set turning off. */
 	{
@@ -276,7 +327,7 @@ int main(int argc,char **argv) {
 			if (dh < 40) dh_step = 1;
 		}
 	}
-
+}
 	IN_Shutdown();
 	VGAmodeX(0, 1, &gvar);
 	free(vrl_lineoffs);
@@ -285,5 +336,7 @@ int main(int argc,char **argv) {
 	bufsz = 0;
 	free(bakapee1);
 	free(bakapee2);
+	//printf("mv 0\n	tx=%d	ty=%d\n\n", mv[0].tx, mv[0].tx);
+	//printf("mv 1\n	tx=%d	ty=%d\n", mv[1].tx, mv[1].tx);
 	return 0;
 }