mirror of
https://github.com/ZDoom/raze-gles.git
synced 2025-01-12 03:00:38 +00:00
Move structs out of animlib.cpp and into animlib.h.
Patch from Striker. git-svn-id: https://svn.eduke32.com/eduke32@7515 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266
Christoph Oelckers
parent
ee6326c2a0
commit
f4b3d57ddb
2 changed files with 60 additions and 60 deletions
|
|
@ -39,6 +39,66 @@ Modifications for JonoF's port by Jonathon Fowler (jf@jonof.id.au)
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
# pragma pack(push,1)
|
||||
|
||||
/* structure declarations for deluxe animate large page files, doesn't
|
||||
need to be in the header because there are no exposed functions
|
||||
that use any of this directly */
|
||||
|
||||
typedef struct lpfileheaderstruct
|
||||
{
|
||||
uint32_t id; /* 4 uint8_tacter ID == "LPF " */
|
||||
uint16_t maxLps; /* max # largePages allowed. 256 FOR NOW. */
|
||||
uint16_t nLps; /* # largePages in this file. */
|
||||
uint32_t nRecords; /* # records in this file. 65534 is current limit + ring */
|
||||
uint16_t maxRecsPerLp; /* # records permitted in an lp. 256 FOR NOW. */
|
||||
uint16_t lpfTableOffset; /* Absolute Seek position of lpfTable. 1280 FOR NOW. */
|
||||
uint32_t contentType; /* 4 character ID == "ANIM" */
|
||||
uint16_t width; /* Width of screen in pixels. */
|
||||
uint16_t height; /* Height of screen in pixels. */
|
||||
uint8_t variant; /* 0==ANIM. */
|
||||
uint8_t version; /* 0==frame rate in 18/sec, 1= 70/sec */
|
||||
uint8_t hasLastDelta; /* 1==Last record is a delta from last-to-first frame. */
|
||||
uint8_t lastDeltaValid; /* 0==Ignore ring frame. */
|
||||
uint8_t pixelType; /* 0==256 color. */
|
||||
uint8_t CompressionType; /* 1==(RunSkipDump) Only one used FOR NOW. */
|
||||
uint8_t otherRecsPerFrm; /* 0 FOR NOW. */
|
||||
uint8_t bitmaptype; /* 1==320x200, 256-color. Only one implemented so far. */
|
||||
uint8_t recordTypes[32]; /* Not yet implemented. */
|
||||
uint32_t nFrames; /* Number of actual frames in the file, includes ring frame. */
|
||||
uint16_t framesPerSecond; /* Number of frames to play per second. */
|
||||
uint16_t pad2[29]; /* 58 bytes of filler to round up to 128 bytes total. */
|
||||
}
|
||||
lpfileheader; /* (comments from original source) */
|
||||
|
||||
// this is the format of a large page structure
|
||||
typedef struct
|
||||
{
|
||||
uint16_t baseRecord; // Number of first record in this large page.
|
||||
uint16_t nRecords; // Number of records in lp.
|
||||
// bit 15 of "nRecords" == "has continuation from previous lp".
|
||||
// bit 14 of "nRecords" == "final record continues on next lp".
|
||||
uint16_t nBytes; // Total number of bytes of contents, excluding header.
|
||||
} lp_descriptor;
|
||||
|
||||
#pragma pack(pop)
|
||||
|
||||
#define IMAGEBUFFERSIZE 0x10000
|
||||
|
||||
typedef struct
|
||||
{
|
||||
uint16_t framecount; // current frame of anim
|
||||
lpfileheader * lpheader; // file header will be loaded into this structure
|
||||
lp_descriptor * LpArray; // arrays of large page structs used to find frames
|
||||
uint16_t curlpnum; // initialize to an invalid Large page number
|
||||
lp_descriptor * curlp; // header of large page currently in memory
|
||||
uint16_t * thepage; // buffer where current large page is loaded
|
||||
uint8_t imagebuffer[IMAGEBUFFERSIZE]; // buffer where anim frame is decoded
|
||||
uint8_t * buffer;
|
||||
uint8_t pal[768];
|
||||
int32_t currentframe;
|
||||
} anim_t;
|
||||
|
||||
//****************************************************************************
|
||||
//
|
||||
// ANIM_LoadAnim ()
|
||||
|
|
|
|||
|
|
@ -34,66 +34,6 @@ Modifications for JonoF's port by Jonathon Fowler (jf@jonof.id.au)
|
|||
//
|
||||
//****************************************************************************
|
||||
|
||||
# pragma pack(push,1)
|
||||
|
||||
/* structure declarations for deluxe animate large page files, doesn't
|
||||
need to be in the header because there are no exposed functions
|
||||
that use any of this directly */
|
||||
|
||||
typedef struct lpfileheaderstruct
|
||||
{
|
||||
uint32_t id; /* 4 uint8_tacter ID == "LPF " */
|
||||
uint16_t maxLps; /* max # largePages allowed. 256 FOR NOW. */
|
||||
uint16_t nLps; /* # largePages in this file. */
|
||||
uint32_t nRecords; /* # records in this file. 65534 is current limit + ring */
|
||||
uint16_t maxRecsPerLp; /* # records permitted in an lp. 256 FOR NOW. */
|
||||
uint16_t lpfTableOffset; /* Absolute Seek position of lpfTable. 1280 FOR NOW. */
|
||||
uint32_t contentType; /* 4 character ID == "ANIM" */
|
||||
uint16_t width; /* Width of screen in pixels. */
|
||||
uint16_t height; /* Height of screen in pixels. */
|
||||
uint8_t variant; /* 0==ANIM. */
|
||||
uint8_t version; /* 0==frame rate in 18/sec, 1= 70/sec */
|
||||
uint8_t hasLastDelta; /* 1==Last record is a delta from last-to-first frame. */
|
||||
uint8_t lastDeltaValid; /* 0==Ignore ring frame. */
|
||||
uint8_t pixelType; /* 0==256 color. */
|
||||
uint8_t CompressionType; /* 1==(RunSkipDump) Only one used FOR NOW. */
|
||||
uint8_t otherRecsPerFrm; /* 0 FOR NOW. */
|
||||
uint8_t bitmaptype; /* 1==320x200, 256-color. Only one implemented so far. */
|
||||
uint8_t recordTypes[32]; /* Not yet implemented. */
|
||||
uint32_t nFrames; /* Number of actual frames in the file, includes ring frame. */
|
||||
uint16_t framesPerSecond; /* Number of frames to play per second. */
|
||||
uint16_t pad2[29]; /* 58 bytes of filler to round up to 128 bytes total. */
|
||||
}
|
||||
lpfileheader; /* (comments from original source) */
|
||||
|
||||
// this is the format of a large page structure
|
||||
typedef struct
|
||||
{
|
||||
uint16_t baseRecord; // Number of first record in this large page.
|
||||
uint16_t nRecords; // Number of records in lp.
|
||||
// bit 15 of "nRecords" == "has continuation from previous lp".
|
||||
// bit 14 of "nRecords" == "final record continues on next lp".
|
||||
uint16_t nBytes; // Total number of bytes of contents, excluding header.
|
||||
} lp_descriptor;
|
||||
|
||||
#pragma pack(pop)
|
||||
|
||||
#define IMAGEBUFFERSIZE 0x10000
|
||||
|
||||
typedef struct
|
||||
{
|
||||
uint16_t framecount; // current frame of anim
|
||||
lpfileheader * lpheader; // file header will be loaded into this structure
|
||||
lp_descriptor * LpArray; // arrays of large page structs used to find frames
|
||||
uint16_t curlpnum; // initialize to an invalid Large page number
|
||||
lp_descriptor * curlp; // header of large page currently in memory
|
||||
uint16_t * thepage; // buffer where current large page is loaded
|
||||
uint8_t imagebuffer[IMAGEBUFFERSIZE]; // buffer where anim frame is decoded
|
||||
uint8_t * buffer;
|
||||
uint8_t pal[768];
|
||||
int32_t currentframe;
|
||||
} anim_t;
|
||||
|
||||
static anim_t * anim = NULL;
|
||||
|
||||
//****************************************************************************
|
||||
|
|
|
|||
Loading…
Reference in a new issue