X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_spri.c;h=e46b7c96cef197a74219528d72de7b52bf432d3b;hb=a565be31ce92d6168ae6983042da75b0b683e52b;hp=502ed4a43a29a119b029d30329aed83aabf67eef;hpb=ea82069949d35f517679d02184787b70a74c2fc2;p=16.git

diff --git a/src/lib/16_spri.c b/src/lib/16_spri.c
index 502ed4a4..e46b7c96 100755
--- a/src/lib/16_spri.c
+++ b/src/lib/16_spri.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2019 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -22,6 +22,193 @@
 
 #include "src/lib/16_spri.h"
 #include <hw/vga/vrl1xdrc.h>
+
+#define VRS_USECAMMPM
+
+void VRS_ReadVRS(char *filename, entity_t *enti, global_game_variables_t *gvar){	VRS_OpenVRS(filename, enti, 1, gvar);	}
+void VRS_LoadVRS(char *filename, entity_t *enti, global_game_variables_t *gvar){	VRS_OpenVRS(filename, enti, 0, gvar);	}
+void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_variables_t *gvar)
+{
+#ifndef VRS_USECAMMPM
+	vrl1_vgax_offset_t **vrl_line_offsets;
+#endif
+	uint16_t far *vrl_id_iter;
+	uint32_t far *vrl_headers_offsets;
+	struct vrl1_vgax_header far *curr_vrl;
+	uint16_t vrl_size;
+	int num_of_vrl,i;
+
+	switch(rlsw)
+	{
+		case 1:
+//TODO ++++			CA_ReadFile(filename, &gvar->ca.spribuff, gvar);
+			CA_ReadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);
+		break;
+		case 0:
+//TODO ++++			CA_LoadFile(filename, &gvar->ca.spribuff, gvar);
+			CA_LoadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);
+		break;
+	}
+
+	// Insert sanity cheks later
+//TODO ++++	enti->spri.spritesheet.buffer = gvar->ca.spribuff;
+	enti->spri.spritesheet.buffer = enti->spri.spritesheet.spribuff;	//TODO: merge these 2 vars into 1
+	enti->spri.spritesheet.data_size = sizeof(enti->spri.spritesheet.buffer) - sizeof(struct vrl1_vgax_header);
+	num_of_vrl = 0;
+	vrl_id_iter = (uint16_t far *)(enti->spri.spritesheet.buffer + enti->spri.spritesheet.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);
+	while(vrl_id_iter[num_of_vrl]){
+		num_of_vrl++;
+	}
+
+	// Allocate memory for vrl line offsets table
+#ifndef VRS_USECAMMPM
+	vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);//TODO: USE MM_ CA_ AND PM_
+#else
+	switch(rlsw)
+	{
+		case 0:
+#ifdef __DEBUG_MM__
+			dbg_debugmm=0;
+#endif
+//			MM_GetPtr(MEMPTRCONV gvar->ca.grsegs, sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);
+//			enti->spri.spritesheet.vrl_line_offsets = (vrl1_vgax_offset_t **)gvar->ca.grsegs;
+			MM_GetPtr(gvar->ca.spribuff, sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);
+			enti->spri.spritesheet.vrl_line_offsets = (vrl1_vgax_offset_t **)(gvar->ca.spribuff);
+//			MM_GetPtr(spribuff, sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);
+//			enti->spri.spritesheet.vrl_line_offsets = (vrl1_vgax_offset_t **)spribuff;
+		break;
+	}
+#endif
+
+	vrl_headers_offsets = (uint32_t far *)(enti->spri.spritesheet.buffer + enti->spri.spritesheet.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 *)(enti->spri.spritesheet.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 = enti->spri.spritesheet.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);
+		}
+#ifndef VRS_USECAMMPM
+		vrl_line_offsets[i] = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);
+#else
+		enti->spri.spritesheet.vrl_line_offsets[i] = vrl1_vgax_genlineoffsets((struct vrl1_vgax_header *)curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);
+#endif
+	}
+#ifndef VRS_USECAMMPM
+	enti->spri.spritesheet.vrl_line_offsets = vrl_line_offsets;
+#endif
+//	printf("VRS_OpenVRS\n");
+//	printf("	vrl_size=%lu\n\n",vrl_size);
+}
+
+#if 0
+//
+void VRS_ReadVRL(char *filename, entity_t *enti, global_game_variables_t *gvar){	VRS_OpenVRL(filename, enti, 1, gvar);	}
+void VRS_LoadVRL(char *filename, entity_t *enti, global_game_variables_t *gvar){	VRS_OpenVRL(filename, enti, 0, gvar);	}
+void VRS_OpenVRL(char *filename, entity_t *enti, boolean rlsw, global_game_variables_t *gvar)
+{
+#ifndef VRL_USECAMMPM
+	vrl1_vgax_offset_t *line_offsets;
+#endif
+//	uint32_t far *vrl_headers_offsets;
+	struct vrl1_vgax_header far *curr_vrl;
+
+	switch(rlsw)
+	{
+		case 1:
+			CA_ReadFile(filename, &enti->spri.spritesheet.spribuff, gvar);
+		break;
+		case 0:
+			CA_LoadFile(filename, &enti->spri.spritesheet.spribuff, gvar);
+		break;
+	}
+
+	// Insert sanity cheks later
+	enti->spri.sprite_vrl_cont.buffer = enti->spri.spritesheet.spribuff;
+	enti->spri.sprite_vrl_cont.data_size = sizeof(enti->spri.spritesheet.buffer) - sizeof(struct vrl1_vgax_header);
+
+	// Allocate memory for vrl line offsets table
+#ifndef VRL_USECAMMPM
+	line_offsets = malloc(sizeof(vrl1_vgax_offset_t *));//TODO: USE MM_ CA_ AND PM_
+#else
+	MM_GetPtr(MEMPTRCONV gvar->ca.grsegs[0], sizeof(vrl1_vgax_offset_t *), gvar);
+	enti->spri.sprite_vrl_cont.line_offsets = (vrl1_vgax_offset_t *)gvar->ca.grsegs[0];
+#endif
+
+	//vrl_headers_offsets = (uint32_t far *)(enti->spri.sprite_vrl_cont.buffer + enti->spri.sprite_vrl_cont.vrs_hdr->offset_table[VRL_HEADER_OFFSET_VRL_LIST]);
+	// Calculate line offsets for each vrl
+		curr_vrl = (struct vrl1_vgax_header far *)(enti->spri.sprite_vrl_cont.buffer);// + vrl_headers_offsets);
+
+#ifndef VRL_USECAMMPM
+		line_offsets = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), sizeof(enti->spri.spritesheet.buffer));
+#else
+		enti->spri.sprite_vrl_cont.line_offsets = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), sizeof(enti->spri.spritesheet.buffer));
+#endif
+
+#ifndef VRL_USECAMMPM
+	enti->spri.sprite_vrl_cont.line_offsets = line_offsets;
+#endif
+	printf("VRS_OpenVRL\n");
+	printf("	vrl_size=%lu\n\n",sizeof(enti->spri.spritesheet.buffer));
+}
+//
+#endif
+
+// Seek and return a specified .vrl blob from .vrs blob in far memory
+int get_vrl_by_id(struct vrs_container far *vrs_cont, uint16_t id, struct vrl_container *vrl_cont){
+	uint16_t far *ids;
+	uint32_t far *vrl_offs_list;
+	int counter = 0;
+
+	// If id is invalid, return -1
+	if(id == 0){
+		// Probably add an error message?
+		return -1;
+	}
+
+	// Get id list from .vrs blob (base + offset)
+	ids = (uint16_t far*)(vrs_cont->buffer +
+		vrs_cont->vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);
+
+	// Loop through the id list until we found the right one or hit the end of the list
+	// Counter is keeping track of the offset(in ids/vrl blobs)
+	while(ids[counter] != id && ids[counter]){
+		counter++;
+	}
+	// Return -2 if we couldn't find the requested id
+	if(!ids[counter]){
+		// Error message?
+		return -2;
+	}
+
+	// Get vrl offsets list from .vrs blob (base + offset)
+	vrl_offs_list = (uint32_t far *)(vrs_cont->buffer +
+					vrs_cont->vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);
+
+	// Get vrl_header from .vrs (base + offset from vrl_list)
+	// Counter is number of vrls to skip (ids and vrls are aligned according to the .vrs specification)
+	vrl_cont->vrl_header = (struct vrl1_vgax_header far *)(vrs_cont->buffer + vrl_offs_list[counter]);
+
+	// Get .vrl size by integer arithmetics (next vrl offset - current vrl offset)
+	if(ids[counter+1]){
+		vrl_cont->data_size = vrl_offs_list[counter+1] - vrl_offs_list[counter] - sizeof(struct vrl1_vgax_header);
+	}
+	// If we are retriving the last vrl, size is ids_list offset - current vrl offset, as next vrl offs is 0
+	else{
+		vrl_cont->data_size = vrs_cont->vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST] - vrl_offs_list[counter] - sizeof(struct vrl1_vgax_header);
+	}
+
+	// Retrive line offsets form .vrs
+	vrl_cont->line_offsets = vrs_cont->vrl_line_offsets[counter];
+
+	return 0;
+}
+
 //void draw_vrl1_vgax_modex_strip(unsigned char far *draw,unsigned char far *s);
 
 //===========================================================================
@@ -107,7 +294,7 @@ void init_anim(struct sprite *spri, int anim_index)
 	spri->curr_spri_id = anim_list[0].sprite_id;
 	spri->delay = anim_list[0].delay;
 
-	spri->curr_anim_list = anim_list;
+	spri->curr_anim_list = (struct vrs_animation_list_entry_t *)anim_list;
 }
 
 int set_anim_by_id(struct sprite *spri, int anim_id)
@@ -159,7 +346,6 @@ void animate_spri(entity_t *enti, video_t *video)
 #define INC_PER_FRAME if(enti->q&1) enti->persist_aniframe++; if(enti->persist_aniframe>4) enti->persist_aniframe = 1;
 	unsigned int i,o,o2; int j;
 	int x,y,rx,ry,w,h;
-	static struct glob_game_vars *ggvv;
 	VGA_RAM_PTR omemptr = (VGA_RAM_PTR)video->page[0].data;// save original mem ptr
 
 	x=enti->spri.x;
@@ -264,7 +450,11 @@ void animate_spri(entity_t *enti, video_t *video)
 //	if(ggvv->player[0].enti.q<5)
 	if(dbg_delayanimation)
 	{
-		IN_Ack(ggvv);// delay(250);//{ while(!IN_KeyDown(sc_Space)/* && !IN_KeyDown(sc_Escape)*/){} delay(250); }
+		{
+			delay(250);
+		//	static struct glob_game_vars *ggvv; IN_Ack(ggvv);
+		//	{ while(!IN_KeyDown(sc_Space)/* && !IN_KeyDown(sc_Escape)*/){} delay(250); }
+		}
 	}
 #endif
 	if(!video->vga_state.rss)