TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 09:04:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bitstream shadowvar cleanup

Browse source
This commit is contained in:
Azaezel 2018-03-16 20:04:43 -05:00
parent e80b66464e
commit a0b1512857
2 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Engine/source/core/stream/bitStream.cpp
View file

@ -78,7 +78,7 @@ ResizeBitStream::ResizeBitStream(U32 minSpace, U32 initialSize) : BitStream(NULL
ResizeBitStream::~ResizeBitStream() ResizeBitStream::~ResizeBitStream()
{ {
dFree(dataPtr); dFree(mDataPtr);
} }
void ResizeBitStream::validate() void ResizeBitStream::validate()
@ -86,7 +86,7 @@ void ResizeBitStream::validate()
if(getPosition() + mMinSpace > bufSize) if(getPosition() + mMinSpace > bufSize)
{ {
bufSize = getPosition() + mMinSpace * 2; bufSize = getPosition() + mMinSpace * 2;
dataPtr = (U8 *) dRealloc(dataPtr, bufSize); mDataPtr = (U8 *) dRealloc(mDataPtr, bufSize);
maxReadBitNum = bufSize << 3; maxReadBitNum = bufSize << 3;
maxWriteBitNum = bufSize << 3; maxWriteBitNum = bufSize << 3;
@ -148,7 +148,7 @@ HuffmanProcessor HuffmanProcessor::g_huffProcessor;
void BitStream::setBuffer(void *bufPtr, S32 size, S32 maxSize) void BitStream::setBuffer(void *bufPtr, S32 size, S32 maxSize)
{ {
dataPtr = (U8 *) bufPtr; mDataPtr = (U8 *) bufPtr;
bitNum = 0; bitNum = 0;
bufSize = size; bufSize = size;
maxReadBitNum = size << 3; maxReadBitNum = size << 3;
@ -178,7 +178,7 @@ U32 BitStream::getStreamSize()
U8 *BitStream::getBytePtr() U8 *BitStream::getBytePtr()
{ {
return dataPtr + getPosition(); return mDataPtr + getPosition();
} }
@ -194,7 +194,7 @@ U32 BitStream::getWriteByteSize()
void BitStream::clear() void BitStream::clear()
{ {
dMemset(dataPtr, 0, bufSize); dMemset(mDataPtr, 0, bufSize);
} }
void BitStream::writeClassId(U32 classId, U32 classType, U32 classGroup) void BitStream::writeClassId(U32 classId, U32 classType, U32 classGroup)
@ -242,9 +242,9 @@ void BitStream::writeBits(S32 bitCount, const void *bitPtr)
for(S32 srcBitNum = 0;srcBitNum < bitCount;srcBitNum++) for(S32 srcBitNum = 0;srcBitNum < bitCount;srcBitNum++)
{ {
if((*(ptr + (srcBitNum >> 3)) & (1 << (srcBitNum & 0x7))) != 0) if((*(ptr + (srcBitNum >> 3)) & (1 << (srcBitNum & 0x7))) != 0)
*(dataPtr + (bitNum >> 3)) |= (1 << (bitNum & 0x7)); *(mDataPtr + (bitNum >> 3)) |= (1 << (bitNum & 0x7));
else else
*(dataPtr + (bitNum >> 3)) &= ~(1 << (bitNum & 0x7)); *(mDataPtr + (bitNum >> 3)) &= ~(1 << (bitNum & 0x7));
bitNum++; bitNum++;
} }
} }
@ -252,14 +252,14 @@ void BitStream::writeBits(S32 bitCount, const void *bitPtr)
void BitStream::setBit(S32 bitCount, bool set) void BitStream::setBit(S32 bitCount, bool set)
{ {
if(set) if(set)
*(dataPtr + (bitCount >> 3)) |= (1 << (bitCount & 0x7)); *(mDataPtr + (bitCount >> 3)) |= (1 << (bitCount & 0x7));
else else
*(dataPtr + (bitCount >> 3)) &= ~(1 << (bitCount & 0x7)); *(mDataPtr + (bitCount >> 3)) &= ~(1 << (bitCount & 0x7));
} }
bool BitStream::testBit(S32 bitCount) bool BitStream::testBit(S32 bitCount)
{ {
return (*(dataPtr + (bitCount >> 3)) & (1 << (bitCount & 0x7))) != 0; return (*(mDataPtr + (bitCount >> 3)) & (1 << (bitCount & 0x7))) != 0;
} }
bool BitStream::writeFlag(bool val) bool BitStream::writeFlag(bool val)
@ -271,9 +271,9 @@ bool BitStream::writeFlag(bool val)
return false; return false;
} }
if(val) if(val)
*(dataPtr + (bitNum >> 3)) |= (1 << (bitNum & 0x7)); *(mDataPtr + (bitNum >> 3)) |= (1 << (bitNum & 0x7));
else else
*(dataPtr + (bitNum >> 3)) &= ~(1 << (bitNum & 0x7)); *(mDataPtr + (bitNum >> 3)) &= ~(1 << (bitNum & 0x7));
bitNum++; bitNum++;
return (val); return (val);
} }
@ -289,7 +289,7 @@ void BitStream::readBits(S32 bitCount, void *bitPtr)
AssertWarn(false, "Out of range read"); AssertWarn(false, "Out of range read");
return; return;
} }
U8 *stPtr = dataPtr + (bitNum >> 3); U8 *stPtr = mDataPtr + (bitNum >> 3);
S32 byteCount = (bitCount + 7) >> 3; S32 byteCount = (bitCount + 7) >> 3;
U8 *ptr = (U8 *) bitPtr; U8 *ptr = (U8 *) bitPtr;
@ -298,7 +298,7 @@ void BitStream::readBits(S32 bitCount, void *bitPtr)
S32 upShift = 8 - downShift; S32 upShift = 8 - downShift;
U8 curB = *stPtr; U8 curB = *stPtr;
const U8 *stEnd = dataPtr + bufSize; const U8 *stEnd = mDataPtr + bufSize;
while(byteCount--) while(byteCount--)
{ {
stPtr++; stPtr++;
@ -628,7 +628,7 @@ void InfiniteBitStream::validate(U32 upcomingBytes)
if(getPosition() + upcomingBytes + mMinSpace > bufSize) if(getPosition() + upcomingBytes + mMinSpace > bufSize)
{ {
bufSize = getPosition() + upcomingBytes + mMinSpace; bufSize = getPosition() + upcomingBytes + mMinSpace;
dataPtr = (U8 *) dRealloc(dataPtr, bufSize); mDataPtr = (U8 *) dRealloc(mDataPtr, bufSize);
maxReadBitNum = bufSize << 3; maxReadBitNum = bufSize << 3;
maxWriteBitNum = bufSize << 3; maxWriteBitNum = bufSize << 3;
@ -643,11 +643,11 @@ void InfiniteBitStream::compact()
// Copy things... // Copy things...
bufSize = getPosition() + mMinSpace * 2; bufSize = getPosition() + mMinSpace * 2;
dMemcpy(tmp, dataPtr, oldSize); dMemcpy(tmp, mDataPtr, oldSize);
// And clean up. // And clean up.
dFree(dataPtr); dFree(mDataPtr);
dataPtr = tmp; mDataPtr = tmp;
maxReadBitNum = bufSize << 3; maxReadBitNum = bufSize << 3;
maxWriteBitNum = bufSize << 3; maxWriteBitNum = bufSize << 3;
@ -655,7 +655,7 @@ void InfiniteBitStream::compact()
void InfiniteBitStream::writeToStream(Stream &s) void InfiniteBitStream::writeToStream(Stream &s)
{ {
s.write(getPosition(), dataPtr); s.write(getPosition(), mDataPtr);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -781,7 +781,7 @@ void HuffmanProcessor::generateCodes(BitStream& rBS, S32 index, S32 depth)
// leaf node, copy the code in, and back out... // leaf node, copy the code in, and back out...
HuffLeaf& rLeaf = m_huffLeaves[-(index + 1)]; HuffLeaf& rLeaf = m_huffLeaves[-(index + 1)];
dMemcpy(&rLeaf.code, rBS.dataPtr, sizeof(rLeaf.code)); dMemcpy(&rLeaf.code, rBS.mDataPtr, sizeof(rLeaf.code));
rLeaf.numBits = depth; rLeaf.numBits = depth;
} else { } else {
HuffNode& rNode = m_huffNodes[index]; HuffNode& rNode = m_huffNodes[index];

6
Engine/source/core/stream/bitStream.h
View file

@ -53,7 +53,7 @@ class QuatF;
class BitStream : public Stream class BitStream : public Stream
{ {
protected: protected:
U8 *dataPtr; U8 *mDataPtr;
S32 bitNum; S32 bitNum;
S32 bufSize; S32 bufSize;
bool error; bool error;
@ -68,7 +68,7 @@ public:
static void sendPacketStream(const NetAddress *addr); static void sendPacketStream(const NetAddress *addr);
void setBuffer(void *bufPtr, S32 bufSize, S32 maxSize = 0); void setBuffer(void *bufPtr, S32 bufSize, S32 maxSize = 0);
U8* getBuffer() { return dataPtr; } U8* getBuffer() { return mDataPtr; }
U8* getBytePtr(); U8* getBytePtr();
U32 getReadByteSize(); U32 getReadByteSize();
@ -337,7 +337,7 @@ inline bool BitStream::readFlag()
return false; return false;
} }
S32 mask = 1 << (bitNum & 0x7); S32 mask = 1 << (bitNum & 0x7);
bool ret = (*(dataPtr + (bitNum >> 3)) & mask) != 0; bool ret = (*(mDataPtr + (bitNum >> 3)) & mask) != 0;
bitNum++; bitNum++;
return ret; return ret;
} }