mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-19 19:59:09 +00:00
Convert custom HeadSpin integer types to standard types from stdint.h
This commit is contained in:
@ -492,7 +492,7 @@ void hsOscillator::SetNumWaves(int n)
|
||||
fWaves[i].Kill();
|
||||
}
|
||||
|
||||
void hsOscillator::Init(Int32 nParams, hsScalar* params)
|
||||
void hsOscillator::Init(int32_t nParams, hsScalar* params)
|
||||
{
|
||||
// NumWaves = 1
|
||||
// AttenScale = 2
|
||||
|
@ -137,7 +137,7 @@ public:
|
||||
|
||||
virtual void AdjustWorldBounds(const hsMatrix44& l2w, const hsMatrix44& w2l, hsBounds3Ext& bnd) const;
|
||||
|
||||
virtual UInt32 GetType() const { return kTypeOscillator; }
|
||||
virtual uint32_t GetType() const { return kTypeOscillator; }
|
||||
|
||||
// Don't call these, use base class LabelAndWrite() and CreateAndRead()
|
||||
virtual void Read(hsStream* s);
|
||||
@ -167,11 +167,11 @@ public:
|
||||
const hsBounds3Ext& GetWorldCenterBounds() const { return fWorldCenterBounds; }
|
||||
|
||||
void SetNumWaves(int n);
|
||||
UInt32 GetNumWaves() const { return fWaves.GetCount(); }
|
||||
uint32_t GetNumWaves() const { return fWaves.GetCount(); }
|
||||
hsWave& GetWeakestWave(hsScalar secs);
|
||||
hsWave& GetTempWave(hsScalar secs);
|
||||
|
||||
virtual void Init(Int32 nParams, hsScalar* params);
|
||||
virtual void Init(int32_t nParams, hsScalar* params);
|
||||
|
||||
static hsGTriMesh* MakeWaveMesh(int nSpokes, const hsPoint3& center, hsScalar minRad, hsScalar maxRad, hsScalar uRange, hsScalar vRange, hsScalar attenStartFrac, hsBool32 stitch);
|
||||
|
||||
|
@ -96,7 +96,7 @@ hsPerterber* hsPerterber::CreateAndRead(hsStream* s)
|
||||
{
|
||||
hsPerterber* retVal = nil;
|
||||
|
||||
UInt32 t = s->ReadSwap32();
|
||||
uint32_t t = s->ReadSwap32();
|
||||
switch( t )
|
||||
{
|
||||
case kTypeOscillator:
|
||||
@ -203,8 +203,8 @@ struct hsPertDesc
|
||||
{
|
||||
|
||||
char fName[256];
|
||||
UInt32 fType;
|
||||
UInt32 fNumParams;
|
||||
uint32_t fType;
|
||||
uint32_t fNumParams;
|
||||
hsScalar fParams[kMaxPertParams];
|
||||
};
|
||||
|
||||
|
@ -81,7 +81,7 @@ public:
|
||||
|
||||
virtual void AdjustWorldBounds(const hsMatrix44& l2w, const hsMatrix44& w2l, hsBounds3Ext& bnd) const = 0;
|
||||
|
||||
virtual UInt32 GetType() const = 0;
|
||||
virtual uint32_t GetType() const = 0;
|
||||
|
||||
virtual void Write(hsStream* s) = 0;
|
||||
virtual void Read(hsStream* s) = 0;
|
||||
@ -95,7 +95,7 @@ public:
|
||||
void LabelAndWrite(hsStream* s);
|
||||
static hsPerterber* CreateAndRead(hsStream* s);
|
||||
|
||||
virtual void Init(Int32 nParams, hsScalar* params) = 0;
|
||||
virtual void Init(int32_t nParams, hsScalar* params) = 0;
|
||||
|
||||
#if 0 // Used Registry...need to change paulg
|
||||
static void InitSystem(plResMgr* reg);
|
||||
|
Reference in New Issue
Block a user