X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=blobdiff_plain;f=src%2Fvrstest.c;h=166a10e0e0ad68ef2eb5fc8c50ab0cd8613fc498;hp=5dd2ffef6737938e77bd3f1b79781aaa6e0316e1;hb=af2715fef8681d909afe82f7baaf5e13baabb76f;hpb=149a7c8a35cbf5f9eb19793b4c923ad1017ec426

diff --git a/src/vrstest.c b/src/vrstest.c
index 5dd2ffef..166a10e0 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-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -20,73 +20,49 @@
  *
  */
 
-#include "src/lib/modex16.h"
-#include "src/lib/16_sprit.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"
 
-void main() {
+extern boolean dbg_nointest;
+boolean panswitch;
+
+static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
+
+void main()
+{
 	static global_game_variables_t gvar;
-	__segment sega;
+	//__segment sega;
 	memptr bigbuffer;
 	int i;
-	word start;
-	int plane;
+	word start,w;
 	float t1, t2;
-	boolean baka;
-	byte *pal;
-	int size, size1;
-	struct sprite spri;
-	vrl1_vgax_offset_t * off, *off1;
-	struct vrs_container vrs;
-	vrl1_vgax_offset_t **vrl_line_offsets;
-	uint32_t huge *vrl_headers_offsets;
-	uint16_t huge *vrl_id_iter;
+	//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 huge *curr_vrl;
-	struct vrl_container *vrl;
-	word w=0;
-
-	// 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;
-	}
-	// 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;
-	}
+	struct vrl1_vgax_header far *curr_vrl;
+	int size=0;
+*/
 
-	//gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
+	dbg_nointest=0;
+	Startup16(&gvar);
 
-	gvar.mm.mmstarted=0;
-	MM_Startup(&gvar);
-	PM_Startup(&gvar);
-	PM_UnlockMainMem(&gvar);
-	CA_Startup(&gvar);
-	// What should be done by read_vrs:
-	//sega = (mm.bufferseg);
-	if(CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &gvar)) baka=1; else baka=0;
+/*	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 huge *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);
+	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++;
 	}
@@ -94,10 +70,10 @@ void main() {
 	// Allocate memory for vrl line offsets table
 	vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);
 
-	vrl_headers_offsets = (uint32_t huge *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);
+	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 huge *)(vrs.buffer + vrl_headers_offsets[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){
@@ -112,68 +88,84 @@ void main() {
 	vrs.vrl_line_offsets = vrl_line_offsets;
 
 
-	//read_vrs(&gvar, "data/spri/chikyuu.vrs", &vrs);
-	spri.spritesheet = &vrs;
-	spri.sprite_vrl_cont = malloc(sizeof(struct vrl_container));
-	i = set_anim_by_id(&spri, 11);
+//	read_vrs(&gvar, "data/spri/chikyuu.vrs", &vrs);
+
+
+	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)
 	{
-		return;
+		//Quit(&gvar, "ERROR!! glitch IN FILE!\n");
 	}
-	spri.x = 5;
-	spri.y = 100;
+	enti.spri.x = TILEWH-4;
+	enti.spri.y = TILEWH;
 
 //	Uncomment to see broken sprites
 /*	sega = mm.bufferseg;
 	if(CA_LoadFile("data/spri/CHUBACW1.vrl", &bigbuffer, &mm, &mmi)) baka=1; else baka=0;*/
 
-	/* clear and draw one sprite and one bitmap */
 	VGAmodeX(1, 1, &gvar);
 	modexHiganbanaPageSetup(&gvar.video);
+	VL_ShowPage(&gvar.video.page[0], 1, 0);
 
 	/* non sprite comparison */
 	start = *clockw;
-	modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 0, 0, 0, 0, 320, 240);
+	//modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 0, 0, 0, 0, 320, 240);
 	t1 = (*clockw-start) /18.2;
 
 	start = *clockw;
 
 	t2 = (*clockw-start)/18.2;
 
-	for (i = 0; i < 5; i++){
-	spri.delay = 1; animate_spri(&spri); spri.x += 20; sleep(1); }
+	/*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);
+	for (i = 0; i < 10; i++){
+		enti.spri.delay = 1;
+
+		if(i==5) set_anim_by_id(&enti.spri, 21);
+
+		animate_spri(&enti, &gvar.video);// enti.spri.x += 16;
+		delay(500);
+	}
 
-	while(!kbhit())
+	while(!IN_KeyDown(sc_Escape))
 	{
 		switch(w)
 		{
-			case 1024:
-				modexPalUpdate0(pal);
+			case 768:
+//				modexPalUpdate0(pal);
 				w=0;
 			default:
 				w++;
+//				gvar.video.palette[w]=rand();
 			break;
 		}
+		TAIL_FUNCTIONKEYDRAWJUNKNOMV
+		if(IN_KeyDown(sc_F7)){ VL_ShowPage(&gvar.video.page[0], 1, 1);							IN_UserInput(1, &gvar); }
+		if(IN_KeyDown(sc_F6)){ VL_ShowPage(&gvar.video.page[0], 1, 0);							IN_UserInput(1, &gvar); }
+		if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[0]);  IN_UserInput(1, &gvar); } //p
 	}
 	VGAmodeX(0, 1, &gvar);
 	MM_ShowMemory(&gvar);
 	MM_DumpData(&gvar);
-	free(spri.sprite_vrl_cont);
+	MM_Report_(&gvar);
+	Shutdown16(&gvar);
 	MM_FreePtr(&bigbuffer, &gvar);
-	//MM_FreePtr(&((void __based(sega)*)spri.spritesheet->buffer), &mm);
-	PM_Shutdown(&gvar);
-	CA_Shutdown(&gvar);
-	MM_Shutdown(&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);
-	heapdump(&gvar);
+	//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);
-	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);
-	printf("Num %d", num_of_vrl);
-	if(baka) printf("\nyay!\n");
-	else printf("\npoo!\n");
+//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");
 }