zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-30 13:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed compat.h cruft from animlib code.

Browse source 
This again is code that is under a good license, so use properly licensed utilities instead.
This commit is contained in:
Christoph Oelckers 2020-06-20 12:57:31 +02:00
parent 15d869ccde
commit e4f55d4d90
2 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
source/core/animlib.cpp
View file

@ -25,8 +25,9 @@ Modifications for JonoF's port by Jonathon Fowler (jf@jonof.id.au)
*/ */
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
#include "compat.h"
#include "animlib.h" #include "animlib.h"
#include "m_swap.h"
#include "m_alloc.h"
//**************************************************************************** //****************************************************************************
// //
@ -126,13 +127,13 @@ static void decodeframe(uint8_t * srcP, uint8_t * dstP)
uint8_t color = *(srcP+1); uint8_t color = *(srcP+1);
count = *(uint8_t *)srcP; count = *(uint8_t *)srcP;
srcP += sizeof(int16_t); srcP += sizeof(int16_t);
Bmemset(dstP, color, count); memset(dstP, color, count);
dstP += count; dstP += count;
continue; continue;
} }
else if ((count & 0x80) == 0) /* short copy */ else if ((count & 0x80) == 0) /* short copy */
{ {
Bmemcpy(dstP, srcP, count); memcpy(dstP, srcP, count);
dstP += count; dstP += count;
srcP += count; srcP += count;
continue; continue;
@ -146,7 +147,7 @@ static void decodeframe(uint8_t * srcP, uint8_t * dstP)
{ {
/* long op */ /* long op */
uint16_t count = B_LITTLE16(B_UNBUF16(srcP)); uint16_t count = LittleShort((uint16_t)GetShort(srcP));
srcP += sizeof(int16_t); srcP += sizeof(int16_t);
if (!count) /* stop sign */ if (!count) /* stop sign */
@ -160,13 +161,13 @@ static void decodeframe(uint8_t * srcP, uint8_t * dstP)
{ {
uint8_t color = *srcP++; uint8_t color = *srcP++;
count &= ~0x4000; count &= ~0x4000;
Bmemset(dstP, color, count); memset(dstP, color, count);
dstP += count; dstP += count;
continue; continue;
} }
/* long copy */ /* long copy */
Bmemcpy(dstP, srcP, count); memcpy(dstP, srcP, count);
dstP += count; dstP += count;
srcP += count; srcP += count;
} }
@ -187,13 +188,13 @@ static void renderframe(uint16_t framenumber, uint16_t *pagepointer)
uint16_t offset = 0; uint16_t offset = 0;
uint16_t frame = framenumber - anim->curlp->baseRecord; uint16_t frame = framenumber - anim->curlp->baseRecord;
while (frame--) offset += B_LITTLE16(pagepointer[frame]); while (frame--) offset += LittleShort(pagepointer[frame]);
uint8_t *ppointer = (uint8_t *)(pagepointer) + anim->curlp->nRecords*2 + offset + 4; uint8_t *ppointer = (uint8_t *)(pagepointer) + anim->curlp->nRecords*2 + offset + 4;
if ((ppointer-4)[1]) if ((ppointer-4)[1])
{ {
uint16_t const temp = B_LITTLE16(((uint16_t *)(ppointer-4))[1]); uint16_t const temp = LittleShort(((uint16_t *)(ppointer-4))[1]);
ppointer += temp + (temp & 1); ppointer += temp + (temp & 1);
} }
@ -221,7 +222,7 @@ int32_t ANIM_LoadAnim(uint8_t *buffer, int32_t length)
if (length < 0) if (length < 0)
return -1; return -1;
anim = (anim_t *)Xrealloc(anim, sizeof(anim_t)); anim = (anim_t *)M_Realloc(anim, sizeof(anim_t));
anim->curlpnum = 0xffff; anim->curlpnum = 0xffff;
anim->currentframe = -1; anim->currentframe = -1;
@ -229,17 +230,17 @@ int32_t ANIM_LoadAnim(uint8_t *buffer, int32_t length)
// this just modifies the data in-place instead of copying it elsewhere now // this just modifies the data in-place instead of copying it elsewhere now
lpfileheader & lpheader = *(anim->lpheader = (lpfileheader *)(anim->buffer = buffer)); lpfileheader & lpheader = *(anim->lpheader = (lpfileheader *)(anim->buffer = buffer));
lpheader.id = B_LITTLE32(lpheader.id); lpheader.id = LittleLong(lpheader.id);
lpheader.maxLps = B_LITTLE16(lpheader.maxLps); lpheader.maxLps = LittleShort(lpheader.maxLps);
lpheader.nLps = B_LITTLE16(lpheader.nLps); lpheader.nLps = LittleShort(lpheader.nLps);
lpheader.nRecords = B_LITTLE32(lpheader.nRecords); lpheader.nRecords = LittleLong(lpheader.nRecords);
lpheader.maxRecsPerLp = B_LITTLE16(lpheader.maxRecsPerLp); lpheader.maxRecsPerLp = LittleShort(lpheader.maxRecsPerLp);
lpheader.lpfTableOffset = B_LITTLE16(lpheader.lpfTableOffset); lpheader.lpfTableOffset = LittleShort(lpheader.lpfTableOffset);
lpheader.contentType = B_LITTLE32(lpheader.contentType); lpheader.contentType = LittleLong(lpheader.contentType);
lpheader.width = B_LITTLE16(lpheader.width); lpheader.width = LittleShort(lpheader.width);
lpheader.height = B_LITTLE16(lpheader.height); lpheader.height = LittleShort(lpheader.height);
lpheader.nFrames = B_LITTLE32(lpheader.nFrames); lpheader.nFrames = LittleLong(lpheader.nFrames);
lpheader.framesPerSecond = B_LITTLE16(lpheader.framesPerSecond); lpheader.framesPerSecond = LittleShort(lpheader.framesPerSecond);
length -= lpheader.nLps * sizeof(lp_descriptor); length -= lpheader.nLps * sizeof(lp_descriptor);
if (length < 0) if (length < 0)
@ -262,9 +263,9 @@ int32_t ANIM_LoadAnim(uint8_t *buffer, int32_t length)
// assuming the utilities to create them can make them that way // assuming the utilities to create them can make them that way
for (lp_descriptor * lp = anim->LpArray, * lp_end = lp+lpheader.nLps; lp < lp_end; ++lp) for (lp_descriptor * lp = anim->LpArray, * lp_end = lp+lpheader.nLps; lp < lp_end; ++lp)
{ {
lp->baseRecord = B_LITTLE16(lp->baseRecord); lp->baseRecord = LittleShort(lp->baseRecord);
lp->nRecords = B_LITTLE16(lp->nRecords); lp->nRecords = LittleShort(lp->nRecords);
lp->nBytes = B_LITTLE16(lp->nBytes); lp->nBytes = LittleShort(lp->nBytes);
} }
return 0; return 0;
@ -273,7 +274,8 @@ int32_t ANIM_LoadAnim(uint8_t *buffer, int32_t length)
void ANIM_FreeAnim(void) void ANIM_FreeAnim(void)
{ {
DO_FREE_AND_NULL(anim); M_Free(anim);
anim = nullptr;
} }

1
source/core/animlib.h
View file

@ -25,6 +25,7 @@ Modifications for JonoF's port by Jonathon Fowler (jf@jonof.id.au)
*/ */
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
#include <stdint.h>
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// ANIMLIB.H // ANIMLIB.H