Merge pull request #2056 from Bloodknight/afx_merge_main

Afx merge main
This commit is contained in:
Areloch 2017-10-11 08:47:47 -05:00 committed by GitHub
commit 35d649b57e
301 changed files with 59625 additions and 1480 deletions

View file

@ -20,6 +20,11 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
// Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
// Copyright (C) 2015 Faust Logic, Inc.
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
#ifndef _BITSTREAM_H_
#define _BITSTREAM_H_
@ -254,6 +259,7 @@ public:
U32 getPosition() const;
bool setPosition(const U32 in_newPosition);
U32 getStreamSize();
S32 getMaxWriteBitNum() const { return maxWriteBitNum; }
};
class ResizeBitStream : public BitStream