OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Convert custom HeadSpin integer types to standard types from stdint.h

Browse Source
This commit is contained in:
Adam Johnson
2012-01-19 21:19:26 -05:00
parent a0d54e2644
commit 5027b5a4ac
1301 changed files with 14497 additions and 14532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp
View File

@ -924,7 +924,7 @@ pfObjectFlocker::~pfObjectFlocker()
plgDispatch::Dispatch()->UnRegisterForExactType(plEvalMsg::Index(), GetKey());
}
void pfObjectFlocker::SetNumBoids(UInt8 val)
void pfObjectFlocker::SetNumBoids(uint8_t val)
{
fNumBoids = val;
}
@ -979,7 +979,7 @@ hsBool pfObjectFlocker::MsgReceive(plMessage* msg)
return plSingleModifier::MsgReceive(msg);
}
hsBool pfObjectFlocker::IEval(double secs, hsScalar del, UInt32 dirty)
hsBool pfObjectFlocker::IEval(double secs, hsScalar del, uint32_t dirty)
{
fFlock.Update(fTarget, del);

4
Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.h
View File

@ -408,7 +408,7 @@ public:
virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr);
void SetNumBoids(UInt8 val);
void SetNumBoids(uint8_t val);
void SetBoidKey(plKey key) { fBoidKey = key; }
float GoalWeight() const {return fFlock.GoalWeight();}
@ -448,7 +448,7 @@ protected:
hsBool fUseTargetRotation;
hsBool fRandomizeAnimationStart;
virtual hsBool IEval(double secs, hsScalar del, UInt32 dirty);
virtual hsBool IEval(double secs, hsScalar del, uint32_t dirty);
};
#endif

2
Sources/Plasma/FeatureLib/pfAnimation/plBlower.cpp
View File

@ -145,7 +145,7 @@ void plBlower::IBlow(double secs, hsScalar delSecs)
fCurrDel = del;
}
hsBool plBlower::IEval(double secs, hsScalar delSecs, UInt32 dirty)
hsBool plBlower::IEval(double secs, hsScalar delSecs, uint32_t dirty)
{
const hsScalar kMaxDelSecs = 0.1f;
if( delSecs > kMaxDelSecs )

2
Sources/Plasma/FeatureLib/pfAnimation/plBlower.h
View File

@ -86,7 +86,7 @@ protected:
void ISetTargetTransform();
void IBlow(double secs, hsScalar delSecs);
virtual hsBool IEval(double secs, hsScalar del, UInt32 dirty);
virtual hsBool IEval(double secs, hsScalar del, uint32_t dirty);
public:
~plBlower();
plBlower();

6
Sources/Plasma/FeatureLib/pfAnimation/plFilterCoordInterface.h
View File

@ -58,7 +58,7 @@ public:
kNoNothing = kNoRotation | kNoMove
};
protected:
UInt32 fFilterMask;
uint32_t fFilterMask;
hsMatrix44 fRefParentLocalToWorld;
virtual void IRecalcTransforms();
@ -73,8 +73,8 @@ public:
virtual void Write(hsStream* stream, hsResMgr* mgr);
void SetFilterMask(UInt32 f) { fFilterMask = f; }
UInt32 GetFilterMask() const { return fFilterMask; }
void SetFilterMask(uint32_t f) { fFilterMask = f; }
uint32_t GetFilterMask() const { return fFilterMask; }
void SetRefLocalToWorld(const hsMatrix44& m) { fRefParentLocalToWorld = m; }
const hsMatrix44& GetRefLocalToWorld() const { return fRefParentLocalToWorld; }

2
Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.cpp
View File

@ -218,7 +218,7 @@ void plFollowMod::IMoveTarget()
GetTarget()->SetTransform(l2w, w2l);
}
hsBool plFollowMod::IEval(double secs, hsScalar del, UInt32 dirty)
hsBool plFollowMod::IEval(double secs, hsScalar del, uint32_t dirty)
{
if( ICheckLeader() )
IMoveTarget();

10
Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.h
View File

@ -76,8 +76,8 @@ public:
};
protected:
FollowLeaderType fLeaderType;
UInt8 fMode;
UInt8 fLeaderSet;
uint8_t fMode;
uint8_t fLeaderSet;
plSceneObject* fLeader; // may be nil if Leader isn't a sceneobject
@ -87,7 +87,7 @@ protected:
hsBool ICheckLeader();
void IMoveTarget();
virtual hsBool IEval(double secs, hsScalar del, UInt32 dirty);
virtual hsBool IEval(double secs, hsScalar del, uint32_t dirty);
public:
plFollowMod();
@ -106,8 +106,8 @@ public:
void SetType(FollowLeaderType t) { fLeaderType = t; }
FollowLeaderType GetType() const { return fLeaderType; }
void SetMode(UInt8 m) { fMode = m; }
UInt8 GetMode() const { return fMode; }
void SetMode(uint8_t m) { fMode = m; }
uint8_t GetMode() const { return fMode; }
void Activate();
void Deactivate();

8
Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.cpp
View File

@ -165,10 +165,10 @@ void plLineFollowMod::Read(hsStream* stream, hsResMgr* mgr)
mgr->ReadKeyNotifyMe(stream, TRACKED_NEW plGenRefMsg(GetKey(), plRefMsg::kOnCreate, 0, kRefStereizer), plRefFlags::kPassiveRef);
}
UInt32 f = stream->ReadLE32();
uint32_t f = stream->ReadLE32();
SetFollowMode(FollowMode(f & 0xffff));
fFollowFlags = (UInt16)((f >> 16) & 0xffff);
fFollowFlags = (uint16_t)((f >> 16) & 0xffff);
if( fFollowFlags & kOffset )
{
@ -203,7 +203,7 @@ void plLineFollowMod::Write(hsStream* stream, hsResMgr* mgr)
for( i = 0; i < fStereizers.GetCount(); i++ )
mgr->WriteKey(stream, fStereizers[i]->GetKey());
UInt32 f = UInt32(fFollowMode) | (UInt32(fFollowFlags) << 16);
uint32_t f = uint32_t(fFollowMode) | (uint32_t(fFollowFlags) << 16);
stream->WriteLE32(f);
if( fFollowFlags & kOffset )
@ -337,7 +337,7 @@ void plLineFollowMod::IRegister()
}
}
hsBool plLineFollowMod::IEval(double secs, hsScalar del, UInt32 dirty)
hsBool plLineFollowMod::IEval(double secs, hsScalar del, uint32_t dirty)
{
if( !fPath )
return false;

4
Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.h
View File

@ -81,7 +81,7 @@ public:
};
protected:
FollowMode fFollowMode;
UInt16 fFollowFlags;
uint16_t fFollowFlags;
plAnimPath* fPath;
plSceneObject* fPathParent;
@ -97,7 +97,7 @@ protected:
hsScalar fOffsetClamp;
hsScalar fSpeedClamp;
virtual hsBool IEval(double secs, hsScalar del, UInt32 dirty);
virtual hsBool IEval(double secs, hsScalar del, uint32_t dirty);
virtual hsBool IGetSearchPos();
virtual void ISetTargetTransform(int iTarg, const hsMatrix44& tgtXfm);

16
Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.h
View File

@ -66,11 +66,11 @@ protected:
// These are only lightly synched, the only synched state is whether
// they are currently active.
UInt8 fState;
uint8_t fState;
hsBitVector fExcluded;
Int8 fCurrent;
UInt8 fMode; // static, if it becomes dynamic, move to SynchedValue
int8_t fCurrent;
uint8_t fMode; // static, if it becomes dynamic, move to SynchedValue
hsTArray<double> fEndTimes;
hsScalar fMinDelay;
@ -94,7 +94,7 @@ protected:
virtual void IPlayNext() = 0;
// We only act in response to messages.
virtual hsBool IEval(double secs, hsScalar del, UInt32 dirty) { return false; }
virtual hsBool IEval(double secs, hsScalar del, uint32_t dirty) { return false; }
public:
plRandomCommandMod();
@ -109,11 +109,11 @@ public:
virtual void Write(hsStream* s, hsResMgr* mgr);
// Export only
void SetMode(UInt8 m) { fMode = m; }
UInt8 GetMode() const { return fMode; }
void SetMode(uint8_t m) { fMode = m; }
uint8_t GetMode() const { return fMode; }
void SetState(UInt8 s) { fState = s; }
UInt8 GetState() const { return fState; }
void SetState(uint8_t s) { fState = s; }
uint8_t GetState() const { return fState; }
void SetMinDelay(hsScalar f) { fMinDelay = f; }
hsScalar GetMinDelay() const { return fMinDelay; }

2
Sources/Plasma/FeatureLib/pfAnimation/plStereizer.cpp
View File

@ -119,7 +119,7 @@ hsBool plStereizer::MsgReceive(plMessage* msg)
return plSingleModifier::MsgReceive(msg);
}
hsBool plStereizer::IEval(double secs, hsScalar del, UInt32 dirty)
hsBool plStereizer::IEval(double secs, hsScalar del, uint32_t dirty)
{
return false;
}

2
Sources/Plasma/FeatureLib/pfAnimation/plStereizer.h
View File

@ -82,7 +82,7 @@ protected:
hsVector3 fListDirection;
hsVector3 fListUp;
virtual hsBool IEval(double secs, hsScalar del, UInt32 dirty);
virtual hsBool IEval(double secs, hsScalar del, uint32_t dirty);
hsPoint3 IGetLocalizedPos(const hsVector3& posToList, hsScalar distToList) const;
hsPoint3 IGetAmbientPos() const;

2
Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.cpp
View File

@ -129,7 +129,7 @@ void plViewFaceModifier::SetTarget(plSceneObject* so)
plgDispatch::Dispatch()->RegisterForExactType(plArmatureUpdateMsg::Index(), GetKey());
}
hsBool plViewFaceModifier::IEval(double secs, hsScalar del, UInt32 dirty)
hsBool plViewFaceModifier::IEval(double secs, hsScalar del, uint32_t dirty)
{
return false;
}

2
Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.h
View File

@ -84,7 +84,7 @@ protected:
hsBounds3Ext fMaxBounds;
virtual hsBool IFacePoint(plPipeline* pipe, const hsPoint3& at);
virtual hsBool IEval(double secs, hsScalar del, UInt32 dirty);
virtual hsBool IEval(double secs, hsScalar del, uint32_t dirty);
enum RefType
{