dahjah/hostile-takeover
1
0
Fork 0
mirror of https://github.com/spiffcode/hostile-takeover.git synced 2026-04-09 20:31:27 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Animation read updated anir structure

Browse Source 
- StripData count is now dword
- Added chars for bitmap and bitmap2 name
- ibm and ibm2 are now words

acrunch max structure was updated in commit 33420b0970728fde92292c525e588cfbdffd7373
This commit is contained in:
Nathan Fulton 2017-04-29 21:42:22 -04:00
parent 119cf11f08
commit 00a92e2f6c
2 changed files with 89 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
game/Animation.cpp
View File

@ -2,6 +2,11 @@
namespace wi {
// OPT: dynamically build an index of pointers to each StripData, FrameData if perf critical
#define GetStripDataPtr(nStrip) ((StripData *)(((byte *)m_panih) + BigDword(m_panih->aoffStpd[nStrip])))
#define GetFrameDataPtr(nStrip, nFrame) (GetStripDataPtr(nStrip)->GetFrameData(nFrame))
AnimationData *LoadAnimationData(const char *pszAniName)
{
AnimationData *panid = new AnimationData();
@ -20,14 +25,19 @@ AnimationData *LoadAnimationData(const char *pszAniName)
AnimationData::AnimationData()
{
m_panih = NULL;
m_ptbm = NULL;
m_aptbm = NULL;
m_ctbm = 0;
}
AnimationData::~AnimationData()
{
if (m_panih != NULL)
gpakr.UnmapFile(&m_fmap);
delete m_ptbm;
for (int n = 0; n < m_ctbm; n++) {
if (m_aptbm[n] != NULL)
delete m_aptbm[n];
}
delete[] m_aptbm;
}
bool AnimationData::Init(const char *pszAniName)
@ -36,6 +46,7 @@ bool AnimationData::Init(const char *pszAniName)
if (m_panih == NULL)
return false;
#if 0
// UNDONE: incorporate the bitmaps directly inside the animation file?
char szTbmName[kcbFilename];
@ -50,23 +61,64 @@ bool AnimationData::Init(const char *pszAniName)
szTbmName[cch - 4] = 0;
strcat(szTbmName, "tbm");
m_ptbm = LoadTBitmap(szTbmName);
m_ptbm = LoadHTBitmap(szTbmName);
if (m_ptbm == NULL) {
Assert("unable to load TBitmap %s", szTbmName);
Assert("unable to load HTBitmap %s", szTbmName);
return false;
}
#endif
// Iterate over all the strips and frames to get a total count
// of images necessary
for (int nStrip = 0; nStrip < GetStripCount(); nStrip++) {
int nStripFrames = GetStripDataPtr(nStrip)->GetFrameCount();
for (int nFrame = 0; nFrame < nStripFrames; nFrame++) {
FrameData *pfrmd = GetFrameDataPtr(nStrip, nFrame);
if (BigWord(pfrmd->ibm) != 65535)
m_ctbm++;
if (BigWord(pfrmd->ibm2) != 65535)
m_ctbm++;
}
}
m_aptbm = new TBitmap*[m_ctbm]();
if (m_aptbm == NULL)
return false;
for (int nStrip = 0; nStrip < GetStripCount(); nStrip++) {
int nStripFrames = GetStripDataPtr(nStrip)->GetFrameCount();
for (int nFrame = 0; nFrame < nStripFrames; nFrame++) {
FrameData *pfrmd = GetFrameDataPtr(nStrip, nFrame);
word ibm = BigWord(pfrmd->ibm);
word ibm2 = BigWord(pfrmd->ibm2);
if (ibm != 65535) {
m_aptbm[ibm] = CreateTBitmap(pfrmd->szName);
if (m_aptbm[ibm] == NULL)
return false;
}
if (ibm2 != 65535) {
m_aptbm[ibm2] = CreateTBitmap(pfrmd->szName2);
if (m_aptbm[ibm2] == NULL)
return false;
}
}
}
return true;
}
// OPT: dynamically build an index of pointers to each StripData, FrameData if perf critical
#define GetStripDataPtr(nStrip) ((StripData *)(((byte *)m_panih) + BigWord(m_panih->aoffStpd[nStrip])))
#define GetFrameDataPtr(nStrip, nFrame) (GetStripDataPtr(nStrip)->GetFrameData(nFrame))
int AnimationData::GetStripCount()
{
return BigWord(m_panih->cstpd);
return BigDword(m_panih->cstpd);
}
int AnimationData::GetFrameCount(int nStrip)
@ -116,10 +168,10 @@ void AnimationData::GetBounds(int nStrip, int nFrame, Rect *prc)
// If there is no first bitmap (e.g., delay-only frame) set the bounds
// to empty.
if (pfrmd->ibm == 255) {
if (BigWord(pfrmd->ibm) == 65535) {
prc->SetEmpty();
} else {
m_ptbm->GetSize(pfrmd->ibm, &siz);
m_aptbm[BigWord(pfrmd->ibm)]->GetSize(&siz);
prc->left = -pfrmd->xOrigin;
prc->right = prc->left + siz.cx;
prc->top = -pfrmd->yOrigin;
@ -129,8 +181,8 @@ void AnimationData::GetBounds(int nStrip, int nFrame, Rect *prc)
// If there is a second bitmap return the union of its bounds and
// the bounds of the first bitmap.
if (pfrmd->ibm2 != 255) {
m_ptbm->GetSize(pfrmd->ibm2, &siz);
if (BigWord(pfrmd->ibm2) != 65535) {
m_aptbm[BigWord(pfrmd->ibm2)]->GetSize(&siz);
int xL = -pfrmd->xOrigin2;
if (prc->left > xL)
prc->left = xL;
@ -152,19 +204,19 @@ void AnimationData::DrawFrame(int nStrip, int nFrame, DibBitmap *pbm, int x, int
Assert(nFrame >= 0 && nFrame < GetStripDataPtr(nStrip)->GetFrameCount());
FrameData *pfrmd = GetFrameDataPtr(nStrip, nFrame);
if (pfrmd->ibm2 != 255)
m_ptbm->BltTo(pfrmd->ibm2, pbm, x - pfrmd->xOrigin2, y - pfrmd->yOrigin2, side, prcSrc);
if (pfrmd->ibm != 255)
m_ptbm->BltTo(pfrmd->ibm, pbm, x - pfrmd->xOrigin, y - pfrmd->yOrigin, side, prcSrc);
if (BigWord(pfrmd->ibm2) != 65535)
m_aptbm[BigWord(pfrmd->ibm2)]->BltTo(pbm, x - pfrmd->xOrigin2, y - pfrmd->yOrigin2, side, prcSrc);
if (BigWord(pfrmd->ibm) != 65535)
m_aptbm[BigWord(pfrmd->ibm)]->BltTo(pbm, x - pfrmd->xOrigin, y - pfrmd->yOrigin, side, prcSrc);
}
int AnimationData::GetStripIndex(const char *pszStripName)
{
// OPT: Can switch to a binary search if needed
word *poffStpd = m_panih->aoffStpd;
dword *poffStpd = m_panih->aoffStpd;
int cstpd = GetStripCount();
for (int i = 0; i < cstpd; i++, poffStpd++) {
StripData *pstpd = (StripData *)(((byte *)m_panih) + BigWord(*poffStpd));
StripData *pstpd = (StripData *)(((byte *)m_panih) + BigDword(*poffStpd));
if (stricmp(pszStripName, pstpd->GetName()) == 0)
return i;
}
@ -332,4 +384,4 @@ void Animation::MPValidate(Animation *paniRemote)
}
#endif
} // namespace wi
} // namespace wi

29
game/ht.h
View File

@ -1555,17 +1555,19 @@ private:
struct FrameData // frmd
{
byte ibm; // bitmap index
byte ibm2; // second bitmap index
byte cHold; // frame delay
char xOrigin; // x offset for drawing
char yOrigin; // y offset for drawing
char xOrigin2; // x offset for drawing second bitmap
char yOrigin2; // y offset for drawing second bitmap
byte bCustomData1; // first custom data value
byte bCustomData2; // second custom data value
char szName[64]; // name of bm
char szName2[64]; // name of bm2
word ibm; // bitmap index
word ibm2; // second bitmap index
byte cHold; // frame delay
char xOrigin; // x offset for drawing
char yOrigin; // y offset for drawing
char xOrigin2; // x offset for drawing second bitmap
char yOrigin2; // y offset for drawing second bitmap
byte bCustomData1; // first custom data value
byte bCustomData2; // second custom data value
};
#define kcbFrameData 9
#define kcbFrameData 139
class StripData // stpd
{
@ -1603,8 +1605,8 @@ public:
struct AnimationFileHeader // anih
{
word cstpd; // count of StripData structures
word aoffStpd[1]; // array of offsets to StripData structures
dword cstpd; // count of StripData structures
dword aoffStpd[1]; // array of offsets to StripData structures
};
class AnimationData // anid
@ -1625,9 +1627,10 @@ public:
int GetFrameDelay(int nStrip, int nFrame) secAnimation;
private:
TBitmap *m_ptbm;
TBitmap **m_aptbm;
FileMap m_fmap;
AnimationFileHeader *m_panih;
int m_ctbm;
};
AnimationData *LoadAnimationData(const char *pszAniName) secAnimation;