X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fvrstest.c;h=142d579d7cab164b9ccd2d960e90985ad3356a44;hb=a565be31ce92d6168ae6983042da75b0b683e52b;hp=d0e370cfc11ed7f0b529cf26180efafd9b36d5cb;hpb=cd333501526a8f715f3e00ac825db3188e226ba6;p=16.git

diff --git a/src/vrstest.c b/src/vrstest.c
index d0e370cf..142d579d 100755
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2019 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -20,124 +20,156 @@
  *
  */
 
-#include <stdio.h>
-#include <dos.h>
-#include <string.h>
-#include "src/lib/modex16.h"
-#include "src/lib/16_sprite.h"
+#include "src/lib/16_head.h"
+#include "src/lib/16_tail.h"
+#include "src/lib/16_vl.h"
+#include "src/lib/16_spri.h"
+#include "src/lib/16_pm.h"
 #include "src/lib/16_ca.h"
 #include "src/lib/16_mm.h"
 
-global_game_variables_t gvar;
+#ifdef __DEBUG_InputMgr__
+extern boolean dbg_nointest;
+#endif
+boolean panswitch;
 
-void main() {
-	mminfo_t mm; mminfotype mmi;
-	__segment sega;
-	void __based(sega)* bigbuffer;
+static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
+
+void main()
+{
+	static global_game_variables_t gvar;
+	//__segment sega;
+	memptr bigbuffer;
 	int i;
-	word start;
-	int plane;
+	word start,w;
 	float t1, t2;
-	boolean baka;
-	byte *pal;
-
-	// DOSLIB: check our environment
-	probe_dos();
-
-	// DOSLIB: what CPU are we using?
-	// NTS: I can see from the makefile Sparky4 intends this to run on 8088 by the -0 switch in CFLAGS.
-	//      So this code by itself shouldn't care too much what CPU it's running on. Except that other
-	//      parts of this project (DOSLIB itself) rely on CPU detection to know what is appropriate for
-	//      the CPU to carry out tasks. --J.C.
-	cpu_probe();
-
-	// DOSLIB: check for VGA
-	if (!probe_vga()) {
-		printf("VGA probe failed\n");
-		return;
+	//boolean baka;
+	entity_t enti;
+	//vrl1_vgax_offset_t * off, *off1;
+/*	struct vrs_container vrs; vrl1_vgax_offset_t **vrl_line_offsets;
+	uint32_t far *vrl_headers_offsets;
+	uint16_t far *vrl_id_iter;
+	uint32_t vrl_size;
+	int num_of_vrl;
+	struct vrl1_vgax_header far *curr_vrl;
+	int size=0;
+*/
+
+#ifdef __DEBUG_InputMgr__
+	dbg_nointest=0;
+#endif
+	Startup16(&gvar);
+
+/*	CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &gvar);
+
+	// Insert sanity cheks later
+	vrs.buffer = bigbuffer;
+	vrs.data_size = size - sizeof(struct vrl1_vgax_header);
+	num_of_vrl = 0;
+	vrl_id_iter = (uint16_t far *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);
+	while(vrl_id_iter[num_of_vrl]){
+		num_of_vrl++;
 	}
-	// hardware must be VGA or higher!
-	if (!(vga_state.vga_flags & VGA_IS_VGA)) {
-		printf("This program requires VGA or higher graphics hardware\n");
-		return;
+
+	// Allocate memory for vrl line offsets table
+	vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);
+
+	vrl_headers_offsets = (uint32_t far *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);
+	// Calculate line offsets for each vrl
+	for(i = 0; i < num_of_vrl; i++){
+		curr_vrl = (struct vrl1_vgax_header far *)(vrs.buffer + vrl_headers_offsets[i]);
+
+		// Calc. vrl size as (next_offset - curr_offset)
+		if (i != num_of_vrl - 1){
+			vrl_size = vrl_headers_offsets[i+1] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);
+		}
+		// If it's the last vrl, size is (next_vrs_struct_offset - curr_offset)
+		else{
+			vrl_size = vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);
+		}
+		vrl_line_offsets[i] = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);
 	}
+	vrs.vrl_line_offsets = vrl_line_offsets;
 
-	//bmp = bitmapLoadPcx("data/chikyuu.pcx");
-	VGAmodeX(1, 1, &gvar);
-	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 
-	mm.mmstarted=0;
-	MM_Startup(&mm, &mmi);
-	CA_Startup(&gvar);
-	if(CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &mm, &mmi)) baka=1; else baka=0;
+//	read_vrs(&gvar, "data/spri/chikyuu.vrs", &vrs);
 
-	/* fix up the palette and everything */
-	//modexPalUpdate1(bmp.palette);
-	//modexLoadPalFile("data/spri/chikyuu.pal", &pal);
-	//modexPalUpdate1(pal);
 
-	/* 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);
+	enti.spri.spritesheet = &vrs;
+	enti.spri.sprite_vrl_cont = malloc(sizeof(struct vrl_container));*/
+	VRS_LoadVRS("data/spri/chikyuu.vrs", &enti, &gvar);
+	i = set_anim_by_id(&(enti.spri), 31);
+	if (i == -1)
+	{
+		//Quit(&gvar, "ERROR!! glitch IN FILE!\n");
+	}
+	enti.spri.x = TILEWH-4;
+	enti.spri.y = TILEWH;
 
-	/* non sprite comparison */
-	start = *clockw;
-	//for(i=0; i<100 ;i++) {
-	//	oldDrawBmp(VGA, 20, 20, &bmp, 0);
-	//}
+//	Uncomment to see broken sprites
+/*	sega = mm.bufferseg;
+	if(CA_LoadFile("data/spri/CHUBACW1.vrl", &bigbuffer, &mm, &mmi)) baka=1; else baka=0;*/
 
+	VGAmodeX(1, 1, &gvar);
+	modexHiganbanaPageSetup(&gvar);
+	VL_ShowPage(&gvar.video.page[0], 1, 0);
+
+	/* non sprite comparison */
 	start = *clockw;
-	//for(i=0; i<100 ;i++) {
-//0000		modexDrawBmp(&gvar.video.page[0], 20, 20, &bmp);
-	//	modexDrawBmp(&gvar.video.page[0], 160, 120, &bmp);
-	//}
+	//modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 0, 0, 0, 0, 320, 240);
 	t1 = (*clockw-start) /18.2;
 
 	start = *clockw;
-	//for(i=0; i<100; i++) {
-//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;
 
+	/*modexLoadPalFile("data/spri/chikyuu.pal", &pal);
+	modexPalUpdate(pal);*/
+	//modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 2);
+	VL_LoadPalFile("data/spri/chikyuu.pal", &gvar.video.palette, &gvar);
+	for (i = 0; i < 10; i++){
+		enti.spri.delay = 1;
 
-	start = *clockw;
-	//for(i=0; i<100 ;i++) {
-	//	oldDrawBmp(VGA, 20, 20, &bmp, 1);
-	//}
+		if(i==5) set_anim_by_id(&enti.spri, 21);
 
+		animate_spri(&enti, &gvar.video);// enti.spri.x += 16;
+		delay(500);
+	}
 
-	start = *clockw;
-	//for(i=0; i<100 ;i++) {
-//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);
-	while(!kbhit())
+	while(!gvar.in.inst->Keyboard[sc_Escape])
 	{
-		//DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);
+		switch(w)
+		{
+			case 768:
+//				modexPalUpdate0(pal);
+				w=0;
+			default:
+				w++;
+//				gvar.video.palette[w]=rand();
+			break;
+		}
+		TAIL_FUNCTIONKEYDRAWJUNKNOMV
+		if(gvar.in.inst->Keyboard[sc_F7]){ VL_ShowPage(&gvar.video.page[0], 1, 1);							IN_UserInput(1, &gvar); }
+		if(gvar.in.inst->Keyboard[sc_F6]){ VL_ShowPage(&gvar.video.page[0], 1, 0);							IN_UserInput(1, &gvar); }
+		if(gvar.in.inst->Keyboard[25]){ modexpdump(0, &gvar);  IN_UserInput(1, &gvar); } //p
 	}
 	VGAmodeX(0, 1, &gvar);
-	MM_FreePtr(&bigbuffer, &mm);
-	MM_Shutdown(&mm);
-	CA_Shutdown(&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));*/
-
-	/*for(i=0; i<(320*240); i++)
-	{
-		fprintf(stdout, "%d", bmp.data[i]);
-		if(i%bmp.width==0) fprintf(stdout, "\n");
-	}*/
-	printf("CPU to VGA: %f\n", t1);
-	printf("VGA to VGA: %f\n", t2);
-	printf("gvar.video.page[0].width: %u\n", gvar.video.page[0].width);
-	printf("gvar.video.page[0].height: %u\n", gvar.video.page[0].height);
-	if(baka) printf("\nyay!\n");
-	else printf("\npoo!\n");
+	MM_ShowMemory(&gvar);
+	MM_DumpData(&gvar);
+	MM_Report_(&gvar);
+	Shutdown16(&gvar);
+	MM_FreePtr(&bigbuffer, &gvar);
+	//MM_FreePtr(&((void __based(sega)*)enti.spri.spritesheet->buffer), &mm);
+	//printf("CPU to VGA: %f\n", t1);
+	//printf("VGA to VGA: %f\n", t2);
+	//HC_heapdump(&gvar);
+	printf("Project 16 vrstest.exe. This is just a test file!\n");
+	printf("version %s\n", VERSION);
+	printf("t1: %f\n", t1);
+	printf("t2: %f\n", t2);
+//0000	printf("gvar.video.page[0].width: %u\n", gvar.video.page[0].width);
+//0000	printf("gvar.video.page[0].height: %u\n", gvar.video.page[0].height);
+//	printf("Num %d", num_of_vrl);
+//	if(baka) printf("\nyay!\n");
+//	else printf("\npoo!\n");
 }