/* Project 16 Source Code~\r
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2019 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
*\r
* This file is part of Project 16.\r
*\r
*/\r
\r
#include "src/lib/16_spri.h"\r
+#include <hw/vga/vrl1xdrc.h>\r
+\r
+#define VRS_USECAMMPM\r
+\r
+void VRS_ReadVRS(char *filename, entity_t *enti, global_game_variables_t *gvar){ VRS_OpenVRS(filename, enti, 1, gvar); }\r
+void VRS_LoadVRS(char *filename, entity_t *enti, global_game_variables_t *gvar){ VRS_OpenVRS(filename, enti, 0, gvar); }\r
+void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_variables_t *gvar)\r
+{\r
+#ifndef VRS_USECAMMPM\r
+ vrl1_vgax_offset_t **vrl_line_offsets;\r
+#endif\r
+ uint16_t far *vrl_id_iter;\r
+ uint32_t far *vrl_headers_offsets;\r
+ struct vrl1_vgax_header far *curr_vrl;\r
+ uint16_t vrl_size;\r
+ int num_of_vrl,i;\r
+\r
+ switch(rlsw)\r
+ {\r
+ case 1:\r
+//TODO ++++ CA_ReadFile(filename, &gvar->ca.spribuff, gvar);\r
+ CA_ReadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);\r
+ break;\r
+ case 0:\r
+//TODO ++++ CA_LoadFile(filename, &gvar->ca.spribuff, gvar);\r
+ CA_LoadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);\r
+ break;\r
+ }\r
+\r
+ // Insert sanity cheks later\r
+//TODO ++++ enti->spri.spritesheet.buffer = gvar->ca.spribuff;\r
+ enti->spri.spritesheet.buffer = enti->spri.spritesheet.spribuff; //TODO: merge these 2 vars into 1\r
+ enti->spri.spritesheet.data_size = sizeof(enti->spri.spritesheet.buffer) - sizeof(struct vrl1_vgax_header);\r
+ num_of_vrl = 0;\r
+ vrl_id_iter = (uint16_t far *)(enti->spri.spritesheet.buffer + enti->spri.spritesheet.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);\r
+ while(vrl_id_iter[num_of_vrl]){\r
+ num_of_vrl++;\r
+ }\r
+\r
+ // Allocate memory for vrl line offsets table\r
+#ifndef VRS_USECAMMPM\r
+ vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);//TODO: USE MM_ CA_ AND PM_\r
+#else\r
+ switch(rlsw)\r
+ {\r
+ case 0:\r
+#ifdef __DEBUG_MM__\r
+ dbg_debugmm=0;\r
+#endif\r
+// MM_GetPtr(MEMPTRCONV gvar->ca.grsegs, sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);\r
+// enti->spri.spritesheet.vrl_line_offsets = (vrl1_vgax_offset_t **)gvar->ca.grsegs;\r
+ MM_GetPtr(gvar->ca.spribuff, sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);\r
+ enti->spri.spritesheet.vrl_line_offsets = (vrl1_vgax_offset_t **)(gvar->ca.spribuff);\r
+// MM_GetPtr(spribuff, sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);\r
+// enti->spri.spritesheet.vrl_line_offsets = (vrl1_vgax_offset_t **)spribuff;\r
+ break;\r
+ }\r
+#endif\r
+\r
+ vrl_headers_offsets = (uint32_t far *)(enti->spri.spritesheet.buffer + enti->spri.spritesheet.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
+ // Calculate line offsets for each vrl\r
+ for(i = 0; i < num_of_vrl; i++){\r
+ curr_vrl = (struct vrl1_vgax_header far *)(enti->spri.spritesheet.buffer + vrl_headers_offsets[i]);\r
+\r
+ // Calc. vrl size as (next_offset - curr_offset)\r
+ if (i != num_of_vrl - 1){\r
+ vrl_size = vrl_headers_offsets[i+1] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);\r
+ }\r
+ // If it's the last vrl, size is (next_vrs_struct_offset - curr_offset)\r
+ else{\r
+ vrl_size = enti->spri.spritesheet.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);\r
+ }\r
+#ifndef VRS_USECAMMPM\r
+ vrl_line_offsets[i] = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);\r
+#else\r
+ 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);\r
+#endif\r
+ }\r
+#ifndef VRS_USECAMMPM\r
+ enti->spri.spritesheet.vrl_line_offsets = vrl_line_offsets;\r
+#endif\r
+// printf("VRS_OpenVRS\n");\r
+// printf(" vrl_size=%lu\n\n",vrl_size);\r
+}\r
+\r
+#if 0\r
+//\r
+void VRS_ReadVRL(char *filename, entity_t *enti, global_game_variables_t *gvar){ VRS_OpenVRL(filename, enti, 1, gvar); }\r
+void VRS_LoadVRL(char *filename, entity_t *enti, global_game_variables_t *gvar){ VRS_OpenVRL(filename, enti, 0, gvar); }\r
+void VRS_OpenVRL(char *filename, entity_t *enti, boolean rlsw, global_game_variables_t *gvar)\r
+{\r
+#ifndef VRL_USECAMMPM\r
+ vrl1_vgax_offset_t *line_offsets;\r
+#endif\r
+// uint32_t far *vrl_headers_offsets;\r
+ struct vrl1_vgax_header far *curr_vrl;\r
+\r
+ switch(rlsw)\r
+ {\r
+ case 1:\r
+ CA_ReadFile(filename, &enti->spri.spritesheet.spribuff, gvar);\r
+ break;\r
+ case 0:\r
+ CA_LoadFile(filename, &enti->spri.spritesheet.spribuff, gvar);\r
+ break;\r
+ }\r
+\r
+ // Insert sanity cheks later\r
+ enti->spri.sprite_vrl_cont.buffer = enti->spri.spritesheet.spribuff;\r
+ enti->spri.sprite_vrl_cont.data_size = sizeof(enti->spri.spritesheet.buffer) - sizeof(struct vrl1_vgax_header);\r
+\r
+ // Allocate memory for vrl line offsets table\r
+#ifndef VRL_USECAMMPM\r
+ line_offsets = malloc(sizeof(vrl1_vgax_offset_t *));//TODO: USE MM_ CA_ AND PM_\r
+#else\r
+ MM_GetPtr(MEMPTRCONV gvar->ca.grsegs[0], sizeof(vrl1_vgax_offset_t *), gvar);\r
+ enti->spri.sprite_vrl_cont.line_offsets = (vrl1_vgax_offset_t *)gvar->ca.grsegs[0];\r
+#endif\r
+\r
+ //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]);\r
+ // Calculate line offsets for each vrl\r
+ curr_vrl = (struct vrl1_vgax_header far *)(enti->spri.sprite_vrl_cont.buffer);// + vrl_headers_offsets);\r
+\r
+#ifndef VRL_USECAMMPM\r
+ line_offsets = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), sizeof(enti->spri.spritesheet.buffer));\r
+#else\r
+ 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));\r
+#endif\r
+\r
+#ifndef VRL_USECAMMPM\r
+ enti->spri.sprite_vrl_cont.line_offsets = line_offsets;\r
+#endif\r
+ printf("VRS_OpenVRL\n");\r
+ printf(" vrl_size=%lu\n\n",sizeof(enti->spri.spritesheet.buffer));\r
+}\r
+//\r
+#endif\r
+\r
+// Seek and return a specified .vrl blob from .vrs blob in far memory\r
+int get_vrl_by_id(struct vrs_container far *vrs_cont, uint16_t id, struct vrl_container *vrl_cont){\r
+ uint16_t far *ids;\r
+ uint32_t far *vrl_offs_list;\r
+ int counter = 0;\r
+\r
+ // If id is invalid, return -1\r
+ if(id == 0){\r
+ // Probably add an error message?\r
+ return -1;\r
+ }\r
+\r
+ // Get id list from .vrs blob (base + offset)\r
+ ids = (uint16_t far*)(vrs_cont->buffer +\r
+ vrs_cont->vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);\r
+\r
+ // Loop through the id list until we found the right one or hit the end of the list\r
+ // Counter is keeping track of the offset(in ids/vrl blobs)\r
+ while(ids[counter] != id && ids[counter]){\r
+ counter++;\r
+ }\r
+ // Return -2 if we couldn't find the requested id\r
+ if(!ids[counter]){\r
+ // Error message?\r
+ return -2;\r
+ }\r
+\r
+ // Get vrl offsets list from .vrs blob (base + offset)\r
+ vrl_offs_list = (uint32_t far *)(vrs_cont->buffer +\r
+ vrs_cont->vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
+\r
+ // Get vrl_header from .vrs (base + offset from vrl_list)\r
+ // Counter is number of vrls to skip (ids and vrls are aligned according to the .vrs specification)\r
+ vrl_cont->vrl_header = (struct vrl1_vgax_header far *)(vrs_cont->buffer + vrl_offs_list[counter]);\r
+\r
+ // Get .vrl size by integer arithmetics (next vrl offset - current vrl offset)\r
+ if(ids[counter+1]){\r
+ vrl_cont->data_size = vrl_offs_list[counter+1] - vrl_offs_list[counter] - sizeof(struct vrl1_vgax_header);\r
+ }\r
+ // If we are retriving the last vrl, size is ids_list offset - current vrl offset, as next vrl offs is 0\r
+ else{\r
+ 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);\r
+ }\r
+\r
+ // Retrive line offsets form .vrs\r
+ vrl_cont->line_offsets = vrs_cont->vrl_line_offsets[counter];\r
+\r
+ return 0;\r
+}\r
+\r
+//void draw_vrl1_vgax_modex_strip(unsigned char far *draw,unsigned char far *s);\r
+\r
+//===========================================================================\r
+\r
+//#define NEWVRSDRAWFUN\r
+void DrawVRL (unsigned int x,unsigned int y,struct vrl1_vgax_header *hdr,vrl1_vgax_offset_t *lineoffs/*array hdr->width long*/,unsigned char *data,unsigned int datasz) {\r
+ unsigned char far *draw;\r
+ unsigned int vram_offset = (y * vga_state.vga_draw_stride) + (x >> 2),sx;\r
+ unsigned int vramlimit = vga_state.vga_draw_stride_limit;\r
+ unsigned char vga_plane = (x & 3);\r
+ unsigned char *s;\r
+\r
+// byte outputvars[72][128];\r
+ word a;//,by,bxmax,bymax;\r
+\r
+ printf("DrawVRL:\n");\r
+\r
+ /* draw one by one */\r
+ for (sx=0;sx < hdr->width;sx++) {\r
+ draw = vga_state.vga_graphics_ram + vram_offset;\r
+ vga_write_sequencer(0x02/*map mask*/,1 << vga_plane);\r
+ s = data + lineoffs[sx];\r
+ draw_vrl1_vgax_modex_strip(draw,s);\r
+\r
+ if(!sx)\r
+ for(a=0;a<hdr->height;a++)//hdr->width*\r
+ {\r
+// if((*(s+a)==0x0) && (*(s+(a+1))==0x20) && (*(s+(a+2))==0xff)) a+=2;\r
+// if(*(s+a)<=13)\r
+// if (!(a%4) && a ) printf("\n");\r
+// sprintf(outputvars[sx][by], "%02x", *(s+a));\r
+ printf("[%02u] %u\n", a, *(s+a));\r
+// by++;\r
+ }\r
+\r
+ /* end of a vertical strip. next line? */\r
+ if ((++vga_plane) == 4) {\r
+ if (--vramlimit == 0) break;\r
+ vram_offset++;\r
+ vga_plane = 0;\r
+ }\r
+ }\r
+#if 0\r
+ bxmax = sx; bymax = by;\r
+ for(by=0;by<bymax;by++)\r
+ {\r
+ for(sx=0;sx<bxmax;sx++)\r
+ {\r
+// if (!(sx%hdr->width) && sx ) printf("\n ");\r
+ printf("%02x ", outputvars[sx][by]);\r
+ }\r
+ printf("\n ");\r
+ }\r
+#endif\r
+}\r
+\r
+//===========================================================================\r
\r
char* get_curr_anim_name(struct sprite *spri)\r
{\r
// Retrive animation name list\r
- struct vrs_header far *vrs = spri->spritesheet->vrs_hdr;\r
+ struct vrs_header far *vrs = spri->spritesheet.vrs_hdr;\r
uint32_t far *anim_names_offsets = (uint32_t far *)\r
((byte far *)vrs +\r
vrs->offset_table[VRS_HEADER_OFFSET_ANIMATION_NAME_LIST]);\r
\r
void init_anim(struct sprite *spri, int anim_index)\r
{\r
- struct vrs_header far *vrs = spri->spritesheet->vrs_hdr;\r
+ struct vrs_header far *vrs = spri->spritesheet.vrs_hdr;\r
uint32_t far *anim_lists_offsets = (uint32_t far *)\r
((byte far *)vrs +\r
vrs->offset_table[VRS_HEADER_OFFSET_ANIMATION_LIST]);\r
spri->curr_spri_id = anim_list[0].sprite_id;\r
spri->delay = anim_list[0].delay;\r
\r
- spri->curr_anim_list = anim_list;\r
+ spri->curr_anim_list = (struct vrs_animation_list_entry_t *)anim_list;\r
}\r
\r
int set_anim_by_id(struct sprite *spri, int anim_id)\r
{\r
int new_anim_index = 0;\r
int iter_id;\r
- struct vrs_header far *vrs = spri->spritesheet->vrs_hdr;\r
+ struct vrs_header far *vrs = spri->spritesheet.vrs_hdr;\r
// Retruve animation ids list\r
uint16_t far *anim_ids = (uint16_t far *)\r
((byte far *)vrs +\r
{\r
int new_anim_index = 0;\r
int iter_id;\r
- struct vrs_header far *vrs = spri->spritesheet->vrs_hdr;\r
+ struct vrs_header far *vrs = spri->spritesheet.vrs_hdr;\r
// Retruve animation ids list\r
uint16_t far *anim_ids = (uint16_t far *)\r
((byte far *)vrs +\r
int x,y,rx,ry,w,h;\r
VGA_RAM_PTR omemptr = (VGA_RAM_PTR)video->page[0].data;// save original mem ptr\r
\r
- x=enti->spri->x;\r
- y=enti->spri->y;\r
+ x=enti->spri.x;\r
+ y=enti->spri.y;\r
VL_Initofs(video);\r
\r
// Depending on delay, update indices\r
vga_wm1_mem_block_copy(copy_ofs, display_ofs, vga_state.vga_stride * vga_state.vga_height);\r
vga_restore_rm0wm0();*/\r
\r
- switch(enti->spri->delay)\r
+ switch(enti->spri.delay)\r
{\r
// Delay = 0 means that sprite should loop. Nothing to change here\r
case 0:\r
// Delay = 1 means that on next time unit sprite should be changed\r
case 1:\r
INC_PER_FRAME\r
- enti->spri->curr_anim_spri++;\r
+ enti->spri.curr_anim_spri++;\r
\r
// If we hit the end of an animation sequence, restart it\r
- if(!( enti->spri->curr_spri_id = enti->spri->curr_anim_list[enti->spri->curr_anim_spri].sprite_id)){\r
- enti->spri->curr_anim_spri = 0;\r
- enti->spri->curr_spri_id = enti->spri->curr_anim_list[enti->spri->curr_anim_spri].sprite_id;\r
+ if(!( enti->spri.curr_spri_id = enti->spri.curr_anim_list[enti->spri.curr_anim_spri].sprite_id)){\r
+ enti->spri.curr_anim_spri = 0;\r
+ enti->spri.curr_spri_id = enti->spri.curr_anim_list[enti->spri.curr_anim_spri].sprite_id;\r
}\r
- enti->spri->delay = enti->spri->curr_anim_list[enti->spri->curr_anim_spri].delay;\r
+ enti->spri.delay = enti->spri.curr_anim_list[enti->spri.curr_anim_spri].delay;\r
\r
// Delay > 1 means that we should not change sprite yet. Decrease delay\r
default:\r
- enti->spri->delay--;\r
+ enti->spri.delay--;\r
break;\r
}\r
\r
\r
\r
// Draw sprite\r
- j = get_vrl_by_id(enti->spri->spritesheet, enti->spri->curr_spri_id, enti->spri->sprite_vrl_cont);\r
+ j = get_vrl_by_id(&enti->spri.spritesheet, enti->spri.curr_spri_id, &enti->spri.sprite_vrl_cont);\r
if(j < 0)\r
{\r
//Quit (gv, "Error retriving required sprite");\r
}\r
\r
// render box bounds. y does not need modification, but x and width must be multiple of 4\r
- if(!video->rss)\r
+ if(!video->vga_state.rss)\r
{\r
if (x >= enti->overdraww) rx = (x - enti->overdraww) & (~3);\r
else rx = -(video->page[0].dx);\r
if (y >= enti->overdrawh) ry = (y - enti->overdrawh);\r
else ry = -(video->page[0].dy);\r
- h = enti->spri->sprite_vrl_cont->vrl_header->height + enti->overdrawh + y - ry;\r
- w = (x + enti->spri->sprite_vrl_cont->vrl_header->width + (enti->overdraww*2) + 3 - rx) & (~3) - enti->overdraww;//round up\r
+ h = enti->spri.sprite_vrl_cont.vrl_header->height + enti->overdrawh + y - ry;\r
+ w = (x + enti->spri.sprite_vrl_cont.vrl_header->width + (enti->overdraww*2) + 3 - rx) & (~3) - enti->overdraww;//round up\r
if ((rx+w) > video->page[0].width) w = video->page[0].width-rx;\r
if ((ry+h) > video->page[0].height) h = video->page[0].height-ry;\r
\r
- if(!video->bgps){\r
+ if(!video->vga_state.bgps){\r
// block copy pattern to where we will draw the sprite\r
vga_setup_wm1_block_copy();\r
o2 = video->ofs.offscreen_ofs;\r
#ifndef SPRITE\r
modexClearRegion(&video->page[0], x, y, 16, 32, 1);\r
#else\r
- draw_vrl1_vgax_modex(\r
+#ifndef NEWVRSDRAWFUN\r
+ draw_vrl1_vgax_modex\r
+#else\r
+ DrawVRL\r
+#endif\r
+ (\r
x-rx,\r
y-ry,\r
- enti->spri->sprite_vrl_cont->vrl_header,\r
- enti->spri->sprite_vrl_cont->line_offsets,\r
- enti->spri->sprite_vrl_cont->buffer + sizeof(struct vrl1_vgax_header),\r
- enti->spri->sprite_vrl_cont->data_size\r
+ enti->spri.sprite_vrl_cont.vrl_header,\r
+ enti->spri.sprite_vrl_cont.line_offsets,\r
+ enti->spri.sprite_vrl_cont.buffer + sizeof(struct vrl1_vgax_header),\r
+ enti->spri.sprite_vrl_cont.data_size\r
);\r
#endif\r
- if(!video->rss)\r
+#ifdef __DEBUG_SPRI__\r
+// if(ggvv->player[0].enti.q<5)\r
+ if(dbg_delayanimation)\r
+ {\r
+ {\r
+ delay(250);\r
+ // static struct glob_game_vars *ggvv; IN_Ack(ggvv);\r
+ // { while(!IN_KeyDown(sc_Space)/* && !IN_KeyDown(sc_Escape)*/){} delay(250); }\r
+ }\r
+ }\r
+#endif\r
+ if(!video->vga_state.rss)\r
{\r
// restore ptr\r
vga_state.vga_graphics_ram = omemptr;\r
\r
- if(!video->bgps){\r
+ if(!video->vga_state.bgps){\r
// block copy to visible RAM from offscreen\r
vga_setup_wm1_block_copy();\r
o = video->ofs.offscreen_ofs; // source offscreen\r
// restore stride\r
vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = video->page[0].stridew;\r
\r
- vga_state.vga_graphics_ram = video->omemptr;\r
+ vga_state.vga_graphics_ram = video->vga_state.omemptr;\r
video->dorender=1;\r
}\r
projects / 16.git / blobdiff