mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-18 11:19:10 +00:00
Fix Endian functions names in hsTypes and hsStream.
Function and macro names for endianness were previously vague, and on big-endian systems entirely misleading. The names are now properly descriptive of what they actually do.
This commit is contained in:
@ -1032,18 +1032,18 @@ void pfObjectFlocker::Read(hsStream* s, hsResMgr* mgr)
|
||||
SetNumBoids(s->ReadByte());
|
||||
fBoidKey = mgr->ReadKey(s);
|
||||
|
||||
fFlock.SetGoalWeight(s->ReadSwapScalar());
|
||||
fFlock.SetWanderWeight(s->ReadSwapScalar());
|
||||
fFlock.SetGoalWeight(s->ReadLEScalar());
|
||||
fFlock.SetWanderWeight(s->ReadLEScalar());
|
||||
|
||||
fFlock.SetSeparationWeight(s->ReadSwapScalar());
|
||||
fFlock.SetSeparationRadius(s->ReadSwapScalar());
|
||||
fFlock.SetSeparationWeight(s->ReadLEScalar());
|
||||
fFlock.SetSeparationRadius(s->ReadLEScalar());
|
||||
|
||||
fFlock.SetCohesionWeight(s->ReadSwapScalar());
|
||||
fFlock.SetCohesionRadius(s->ReadSwapScalar());
|
||||
fFlock.SetCohesionWeight(s->ReadLEScalar());
|
||||
fFlock.SetCohesionRadius(s->ReadLEScalar());
|
||||
|
||||
fFlock.SetMaxForce(s->ReadSwapScalar());
|
||||
fFlock.SetMaxSpeed(s->ReadSwapScalar());
|
||||
fFlock.SetMinSpeed(s->ReadSwapScalar());
|
||||
fFlock.SetMaxForce(s->ReadLEScalar());
|
||||
fFlock.SetMaxSpeed(s->ReadLEScalar());
|
||||
fFlock.SetMinSpeed(s->ReadLEScalar());
|
||||
|
||||
fUseTargetRotation = s->ReadBool();
|
||||
fRandomizeAnimationStart = s->ReadBool();
|
||||
@ -1058,18 +1058,18 @@ void pfObjectFlocker::Write(hsStream* s, hsResMgr* mgr)
|
||||
s->WriteByte(fNumBoids);
|
||||
mgr->WriteKey(s, fBoidKey);
|
||||
|
||||
s->WriteSwapScalar(fFlock.GoalWeight());
|
||||
s->WriteSwapScalar(fFlock.WanderWeight());
|
||||
s->WriteLEScalar(fFlock.GoalWeight());
|
||||
s->WriteLEScalar(fFlock.WanderWeight());
|
||||
|
||||
s->WriteSwapScalar(fFlock.SeparationWeight());
|
||||
s->WriteSwapScalar(fFlock.SeparationRadius());
|
||||
s->WriteLEScalar(fFlock.SeparationWeight());
|
||||
s->WriteLEScalar(fFlock.SeparationRadius());
|
||||
|
||||
s->WriteSwapScalar(fFlock.CohesionWeight());
|
||||
s->WriteSwapScalar(fFlock.CohesionRadius());
|
||||
s->WriteLEScalar(fFlock.CohesionWeight());
|
||||
s->WriteLEScalar(fFlock.CohesionRadius());
|
||||
|
||||
s->WriteSwapScalar(fFlock.MaxForce());
|
||||
s->WriteSwapScalar(fFlock.MaxSpeed());
|
||||
s->WriteSwapScalar(fFlock.MinSpeed());
|
||||
s->WriteLEScalar(fFlock.MaxForce());
|
||||
s->WriteLEScalar(fFlock.MaxSpeed());
|
||||
s->WriteLEScalar(fFlock.MinSpeed());
|
||||
|
||||
s->WriteBool(fUseTargetRotation);
|
||||
s->WriteBool(fRandomizeAnimationStart);
|
||||
|
@ -193,20 +193,20 @@ void plBlower::Read(hsStream* s, hsResMgr* mgr)
|
||||
{
|
||||
plSingleModifier::Read(s, mgr);
|
||||
|
||||
fMasterPower = s->ReadSwapScalar();
|
||||
fDirectRate = s->ReadSwapScalar();
|
||||
fImpulseRate = s->ReadSwapScalar();
|
||||
fSpringKonst = s->ReadSwapScalar();
|
||||
fMasterPower = s->ReadLEScalar();
|
||||
fDirectRate = s->ReadLEScalar();
|
||||
fImpulseRate = s->ReadLEScalar();
|
||||
fSpringKonst = s->ReadLEScalar();
|
||||
}
|
||||
|
||||
void plBlower::Write(hsStream* s, hsResMgr* mgr)
|
||||
{
|
||||
plSingleModifier::Write(s, mgr);
|
||||
|
||||
s->WriteSwapScalar(fMasterPower);
|
||||
s->WriteSwapScalar(fDirectRate);
|
||||
s->WriteSwapScalar(fImpulseRate);
|
||||
s->WriteSwapScalar(fSpringKonst);
|
||||
s->WriteLEScalar(fMasterPower);
|
||||
s->WriteLEScalar(fDirectRate);
|
||||
s->WriteLEScalar(fImpulseRate);
|
||||
s->WriteLEScalar(fSpringKonst);
|
||||
}
|
||||
|
||||
void plBlower::IInitOscillators()
|
||||
|
@ -94,7 +94,7 @@ void plFilterCoordInterface::Read(hsStream* stream, hsResMgr* mgr)
|
||||
{
|
||||
plCoordinateInterface::Read(stream, mgr);
|
||||
|
||||
fFilterMask = stream->ReadSwap32();
|
||||
fFilterMask = stream->ReadLE32();
|
||||
fRefParentLocalToWorld.Read(stream);
|
||||
}
|
||||
|
||||
@ -102,7 +102,7 @@ void plFilterCoordInterface::Write(hsStream* stream, hsResMgr* mgr)
|
||||
{
|
||||
plCoordinateInterface::Write(stream, mgr);
|
||||
|
||||
stream->WriteSwap32(fFilterMask);
|
||||
stream->WriteLE32(fFilterMask);
|
||||
fRefParentLocalToWorld.Write(stream);
|
||||
}
|
||||
|
||||
|
@ -159,20 +159,20 @@ void plLineFollowMod::Read(hsStream* stream, hsResMgr* mgr)
|
||||
|
||||
mgr->ReadKeyNotifyMe(stream, TRACKED_NEW plGenRefMsg(GetKey(), plRefMsg::kOnCreate, 0, kRefObject), plRefFlags::kPassiveRef);
|
||||
|
||||
int n = stream->ReadSwap32();
|
||||
int n = stream->ReadLE32();
|
||||
while(n--)
|
||||
{
|
||||
mgr->ReadKeyNotifyMe(stream, TRACKED_NEW plGenRefMsg(GetKey(), plRefMsg::kOnCreate, 0, kRefStereizer), plRefFlags::kPassiveRef);
|
||||
}
|
||||
|
||||
UInt32 f = stream->ReadSwap32();
|
||||
UInt32 f = stream->ReadLE32();
|
||||
SetFollowMode(FollowMode(f & 0xffff));
|
||||
|
||||
fFollowFlags = (UInt16)((f >> 16) & 0xffff);
|
||||
|
||||
if( fFollowFlags & kOffset )
|
||||
{
|
||||
fOffset = stream->ReadSwapScalar();
|
||||
fOffset = stream->ReadLEScalar();
|
||||
}
|
||||
if( fFollowFlags & kOffsetAng )
|
||||
{
|
||||
@ -180,11 +180,11 @@ void plLineFollowMod::Read(hsStream* stream, hsResMgr* mgr)
|
||||
}
|
||||
if( fFollowFlags & kOffsetClamp )
|
||||
{
|
||||
fOffsetClamp = stream->ReadSwapScalar();
|
||||
fOffsetClamp = stream->ReadLEScalar();
|
||||
}
|
||||
if( fFollowFlags & kSpeedClamp )
|
||||
{
|
||||
fSpeedClamp = stream->ReadSwapScalar();
|
||||
fSpeedClamp = stream->ReadLEScalar();
|
||||
}
|
||||
}
|
||||
|
||||
@ -198,20 +198,20 @@ void plLineFollowMod::Write(hsStream* stream, hsResMgr* mgr)
|
||||
|
||||
mgr->WriteKey(stream, fRefObj);
|
||||
|
||||
stream->WriteSwap32(fStereizers.GetCount());
|
||||
stream->WriteLE32(fStereizers.GetCount());
|
||||
int i;
|
||||
for( i = 0; i < fStereizers.GetCount(); i++ )
|
||||
mgr->WriteKey(stream, fStereizers[i]->GetKey());
|
||||
|
||||
UInt32 f = UInt32(fFollowMode) | (UInt32(fFollowFlags) << 16);
|
||||
stream->WriteSwap32(f);
|
||||
stream->WriteLE32(f);
|
||||
|
||||
if( fFollowFlags & kOffset )
|
||||
stream->WriteSwapScalar(fOffset);
|
||||
stream->WriteLEScalar(fOffset);
|
||||
if( fFollowFlags & kOffsetClamp )
|
||||
stream->WriteSwapScalar(fOffsetClamp);
|
||||
stream->WriteLEScalar(fOffsetClamp);
|
||||
if( fFollowFlags & kSpeedClamp )
|
||||
stream->WriteSwapScalar(fSpeedClamp);
|
||||
stream->WriteLEScalar(fSpeedClamp);
|
||||
}
|
||||
|
||||
|
||||
|
@ -277,8 +277,8 @@ void plRandomCommandMod::Read(hsStream* s, hsResMgr* mgr)
|
||||
fMode = s->ReadByte();
|
||||
fState = s->ReadByte();
|
||||
|
||||
fMinDelay = s->ReadSwapScalar();
|
||||
fMaxDelay = s->ReadSwapScalar();
|
||||
fMinDelay = s->ReadLEScalar();
|
||||
fMaxDelay = s->ReadLEScalar();
|
||||
|
||||
IReset();
|
||||
}
|
||||
@ -290,8 +290,8 @@ void plRandomCommandMod::Write(hsStream* s, hsResMgr* mgr)
|
||||
s->WriteByte(fMode);
|
||||
s->WriteByte(fState);
|
||||
|
||||
s->WriteSwapScalar(fMinDelay);
|
||||
s->WriteSwapScalar(fMaxDelay);
|
||||
s->WriteLEScalar(fMinDelay);
|
||||
s->WriteLEScalar(fMaxDelay);
|
||||
}
|
||||
|
||||
void plRandomCommandMod::IRetry(hsScalar secs)
|
||||
|
@ -78,13 +78,13 @@ void plStereizer::Read(hsStream* stream, hsResMgr* mgr)
|
||||
{
|
||||
plSingleModifier::Read(stream, mgr);
|
||||
|
||||
fAmbientDist = stream->ReadSwapScalar();
|
||||
fTransition = stream->ReadSwapScalar();
|
||||
fAmbientDist = stream->ReadLEScalar();
|
||||
fTransition = stream->ReadLEScalar();
|
||||
|
||||
fMaxSepDist = stream->ReadSwapScalar();
|
||||
fMinSepDist = stream->ReadSwapScalar();
|
||||
fMaxSepDist = stream->ReadLEScalar();
|
||||
fMinSepDist = stream->ReadLEScalar();
|
||||
|
||||
fTanAng = stream->ReadSwapScalar();
|
||||
fTanAng = stream->ReadLEScalar();
|
||||
|
||||
fInitPos.Read(stream);
|
||||
|
||||
@ -96,13 +96,13 @@ void plStereizer::Write(hsStream* stream, hsResMgr* mgr)
|
||||
{
|
||||
plSingleModifier::Write(stream, mgr);
|
||||
|
||||
stream->WriteSwapScalar(fAmbientDist);
|
||||
stream->WriteSwapScalar(fTransition);
|
||||
stream->WriteLEScalar(fAmbientDist);
|
||||
stream->WriteLEScalar(fTransition);
|
||||
|
||||
stream->WriteSwapScalar(fMaxSepDist);
|
||||
stream->WriteSwapScalar(fMinSepDist);
|
||||
stream->WriteLEScalar(fMaxSepDist);
|
||||
stream->WriteLEScalar(fMinSepDist);
|
||||
|
||||
stream->WriteSwapScalar(fTanAng);
|
||||
stream->WriteLEScalar(fTanAng);
|
||||
|
||||
fInitPos.Write(stream);
|
||||
}
|
||||
|
Reference in New Issue
Block a user