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

Fix Endian functions names in hsTypes and hsStream.

Browse Source 
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:
Joseph Davies
2011-10-23 14:01:54 -07:00
committed by Darryl Pogue
parent ab37a4a486
commit e462ef04b3
255 changed files with 2676 additions and 2676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.cpp
View File

@ -226,10 +226,10 @@ void plAGAnim::Read(hsStream *stream, hsResMgr *mgr)
// read in the name of the animation itself
fName = stream->ReadSafeString();
fStart = stream->ReadSwapScalar();
fEnd = stream->ReadSwapScalar();
fStart = stream->ReadLEScalar();
fEnd = stream->ReadLEScalar();
int numApps = stream->ReadSwap32();
int numApps = stream->ReadLE32();
fApps.reserve(numApps); // pre-allocate for performance
int i;
@ -250,12 +250,12 @@ void plAGAnim::Write(hsStream *stream, hsResMgr *mgr)
stream->WriteSafeString(fName);
stream->WriteSwapScalar(fStart);
stream->WriteSwapScalar(fEnd);
stream->WriteLEScalar(fStart);
stream->WriteLEScalar(fEnd);
int numApps = fApps.size();
stream->WriteSwap32(numApps);
stream->WriteLE32(numApps);
int i;
for (i = 0; i < numApps; i++)
@ -404,42 +404,42 @@ void plATCAnim::Read(hsStream *stream, hsResMgr *mgr)
{
plAGAnim::Read(stream, mgr);
fInitial = stream->ReadSwapScalar();
fInitial = stream->ReadLEScalar();
fAutoStart = stream->Readbool();
fLoopStart = stream->ReadSwapScalar();
fLoopEnd = stream->ReadSwapScalar();
fLoopStart = stream->ReadLEScalar();
fLoopEnd = stream->ReadLEScalar();
fLoop = stream->Readbool();
fEaseInType = stream->ReadByte();
fEaseInMin = stream->ReadSwapScalar();
fEaseInMax = stream->ReadSwapScalar();
fEaseInLength = stream->ReadSwapScalar();
fEaseInMin = stream->ReadLEScalar();
fEaseInMax = stream->ReadLEScalar();
fEaseInLength = stream->ReadLEScalar();
fEaseOutType = stream->ReadByte();
fEaseOutMin = stream->ReadSwapScalar();
fEaseOutMax = stream->ReadSwapScalar();
fEaseOutLength = stream->ReadSwapScalar();
fEaseOutMin = stream->ReadLEScalar();
fEaseOutMax = stream->ReadLEScalar();
fEaseOutLength = stream->ReadLEScalar();
int i;
int numMarkers = stream->ReadSwap32();
int numMarkers = stream->ReadLE32();
for (i = 0; i < numMarkers; i++)
{
char *name = stream->ReadSafeString();
float time = stream->ReadSwapFloat();
float time = stream->ReadLEFloat();
fMarkers[name] = time;
}
int numLoops = stream->ReadSwap32();
int numLoops = stream->ReadLE32();
for (i = 0; i < numLoops; i++)
{
char *name = stream->ReadSafeString();
float begin = stream->ReadSwapScalar();
float end = stream->ReadSwapScalar();
float begin = stream->ReadLEScalar();
float end = stream->ReadLEScalar();
fLoops[name] = std::pair<float,float>(begin,end);
}
int numStops = stream->ReadSwap32();
int numStops = stream->ReadLE32();
for (i = 0; i < numStops; i++)
fStopPoints.push_back(stream->ReadSwapScalar());
fStopPoints.push_back(stream->ReadLEScalar());
}
// Write ---------------------------------------------
@ -448,41 +448,41 @@ void plATCAnim::Write(hsStream *stream, hsResMgr *mgr)
{
plAGAnim::Write(stream, mgr);
stream->WriteSwapScalar(fInitial);
stream->WriteLEScalar(fInitial);
stream->Writebool(fAutoStart);
stream->WriteSwapScalar(fLoopStart);
stream->WriteSwapScalar(fLoopEnd);
stream->WriteLEScalar(fLoopStart);
stream->WriteLEScalar(fLoopEnd);
stream->Writebool(fLoop);
stream->WriteByte(fEaseInType);
stream->WriteSwapScalar(fEaseInMin);
stream->WriteSwapScalar(fEaseInMax);
stream->WriteSwapScalar(fEaseInLength);
stream->WriteLEScalar(fEaseInMin);
stream->WriteLEScalar(fEaseInMax);
stream->WriteLEScalar(fEaseInLength);
stream->WriteByte(fEaseOutType);
stream->WriteSwapScalar(fEaseOutMin);
stream->WriteSwapScalar(fEaseOutMax);
stream->WriteSwapScalar(fEaseOutLength);
stream->WriteLEScalar(fEaseOutMin);
stream->WriteLEScalar(fEaseOutMax);
stream->WriteLEScalar(fEaseOutLength);
stream->WriteSwap32(fMarkers.size());
stream->WriteLE32(fMarkers.size());
for (MarkerMap::iterator it = fMarkers.begin(); it != fMarkers.end(); it++)
{
stream->WriteSafeString(it->first);
stream->WriteSwapFloat(it->second);
stream->WriteLEFloat(it->second);
}
stream->WriteSwap32(fLoops.size());
stream->WriteLE32(fLoops.size());
for (LoopMap::iterator loopIt = fLoops.begin(); loopIt != fLoops.end(); loopIt++)
{
stream->WriteSafeString(loopIt->first);
std::pair<float,float>& loop = loopIt->second;
stream->WriteSwapFloat(loop.first);
stream->WriteSwapFloat(loop.second);
stream->WriteLEFloat(loop.first);
stream->WriteLEFloat(loop.second);
}
int i;
stream->WriteSwap32(fStopPoints.size());
stream->WriteLE32(fStopPoints.size());
for (i = 0; i < fStopPoints.size(); i++)
stream->WriteSwapScalar(fStopPoints[i]);
stream->WriteLEScalar(fStopPoints[i]);
}
// CheckLoop --------------
@ -629,8 +629,8 @@ void plEmoteAnim::Read(hsStream *stream, hsResMgr *mgr)
plATCAnim::Read(stream, mgr);
// plAGAnim::RegisterEmote(fName, this);
fFadeIn = stream->ReadSwapScalar();
fFadeOut = stream->ReadSwapScalar();
fFadeIn = stream->ReadLEScalar();
fFadeOut = stream->ReadLEScalar();
fBodyUsage = static_cast<BodyUsage>(stream->ReadByte());
}
@ -640,8 +640,8 @@ void plEmoteAnim::Read(hsStream *stream, hsResMgr *mgr)
void plEmoteAnim::Write(hsStream *stream, hsResMgr *mgr)
{
plATCAnim::Write(stream, mgr);
stream->WriteSwapScalar(fFadeIn);
stream->WriteSwapScalar(fFadeOut);
stream->WriteLEScalar(fFadeIn);
stream->WriteLEScalar(fFadeOut);
stream->WriteByte(static_cast<UInt8>(fBodyUsage));
}

8
Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.cpp
View File

@ -91,8 +91,8 @@ void plAGMasterMod::Write(hsStream *stream, hsResMgr *mgr)
plModifier::Write(stream, mgr);
int length = 0;
stream->WriteSwap32(length); // backwards compatability. Nuke on next format change.
stream->WriteSwap32(fPrivateAnims.size());
stream->WriteLE32(length); // backwards compatability. Nuke on next format change.
stream->WriteLE32(fPrivateAnims.size());
int i;
for (i = 0; i < fPrivateAnims.size(); i++)
{
@ -111,14 +111,14 @@ void plAGMasterMod::Read(hsStream * stream, hsResMgr *mgr)
plModifier::Read(stream, mgr);
//////////////////////////////////////////
int nameLength = stream->ReadSwap32(); // Unused. Nuke next format change.
int nameLength = stream->ReadLE32(); // Unused. Nuke next format change.
char *junk = TRACKED_NEW char[nameLength+1]; //
stream->Read(nameLength, junk); //
junk[nameLength] = 0; //
delete [] junk; //
//////////////////////////////////////////
int numPrivateAnims = stream->ReadSwap32();
int numPrivateAnims = stream->ReadLE32();
fPrivateAnims.reserve(numPrivateAnims); // pre-allocate for performance
int i;
for (i = 0; i < numPrivateAnims; i++)

40
Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp
View File

@ -744,41 +744,41 @@ void plAnimStage::Read(hsStream *stream, hsResMgr *mgr)
delete [] fAnimName;
fAnimName = stream->ReadSafeString();
fNotify = stream->ReadByte();
fForwardType = (ForwardType)stream->ReadSwap32();
fBackType = (BackType)stream->ReadSwap32();
fAdvanceType = (AdvanceType)stream->ReadSwap32();
fRegressType = (RegressType)stream->ReadSwap32();
fLoops = stream->ReadSwap32();
fForwardType = (ForwardType)stream->ReadLE32();
fBackType = (BackType)stream->ReadLE32();
fAdvanceType = (AdvanceType)stream->ReadLE32();
fRegressType = (RegressType)stream->ReadLE32();
fLoops = stream->ReadLE32();
fDoAdvanceTo = stream->Readbool();
fAdvanceTo = stream->ReadSwap32();
fAdvanceTo = stream->ReadLE32();
fDoRegressTo = stream->Readbool();
fRegressTo = stream->ReadSwap32();
fRegressTo = stream->ReadLE32();
}
void plAnimStage::Write(hsStream *stream, hsResMgr *mgr)
{
stream->WriteSafeString(fAnimName);
stream->WriteByte(fNotify);
stream->WriteSwap32(fForwardType);
stream->WriteSwap32(fBackType);
stream->WriteSwap32(fAdvanceType);
stream->WriteSwap32(fRegressType);
stream->WriteSwap32(fLoops);
stream->WriteLE32(fForwardType);
stream->WriteLE32(fBackType);
stream->WriteLE32(fAdvanceType);
stream->WriteLE32(fRegressType);
stream->WriteLE32(fLoops);
stream->Writebool(fDoAdvanceTo);
stream->WriteSwap32(fAdvanceTo);
stream->WriteLE32(fAdvanceTo);
stream->Writebool(fDoRegressTo);
stream->WriteSwap32(fRegressTo);
stream->WriteLE32(fRegressTo);
}
// SAVEAUX
void plAnimStage::SaveAux(hsStream *stream, hsResMgr *mgr)
{
stream->WriteSwapScalar(fLocalTime);
stream->WriteSwapScalar(fLength);
stream->WriteSwap32(fCurLoop);
stream->WriteLEScalar(fLocalTime);
stream->WriteLEScalar(fLength);
stream->WriteLE32(fCurLoop);
stream->Writebool(fAttached);
// no ephemeral stage at the moment
}
@ -786,9 +786,9 @@ void plAnimStage::SaveAux(hsStream *stream, hsResMgr *mgr)
// LOADAUX
void plAnimStage::LoadAux(hsStream *stream, hsResMgr *mgr, double time)
{
fLocalTime = stream->ReadSwapScalar();
fLength = stream->ReadSwapScalar();
fCurLoop = stream->ReadSwap32();
fLocalTime = stream->ReadLEScalar();
fLength = stream->ReadLEScalar();
fCurLoop = stream->ReadLE32();
// This should actually be Readbool (lowercase), but I won't fix it since that
// would require a version change
fAttached = (stream->Readbool() != 0);

4
Sources/Plasma/PubUtilLib/plAvatar/plArmatureEffects.cpp
View File

@ -83,7 +83,7 @@ void plArmatureEffectsMgr::Read(hsStream *s, hsResMgr *mgr)
{
hsKeyedObject::Read(s, mgr);
int numEffects = s->ReadSwap32();
int numEffects = s->ReadLE32();
while (numEffects > 0)
{
plRefMsg *msg = TRACKED_NEW plGenRefMsg(GetKey(), plRefMsg::kOnCreate, -1, -1);
@ -98,7 +98,7 @@ void plArmatureEffectsMgr::Write(hsStream *s, hsResMgr *mgr)
{
hsKeyedObject::Write(s, mgr);
s->WriteSwap32(fEffects.GetCount());
s->WriteLE32(fEffects.GetCount());
int i;
for (i = 0; i < fEffects.GetCount(); i++)
mgr->WriteKey(s, fEffects[i]->GetKey());

36
Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp
View File

@ -214,20 +214,20 @@ void plArmatureModBase::Read(hsStream * stream, hsResMgr *mgr)
plAGMasterMod::Read(stream, mgr);
int i;
int meshKeyCount = stream->ReadSwap32();
int meshKeyCount = stream->ReadLE32();
for(i = 0; i < meshKeyCount; i++)
{
plKey meshKey = mgr->ReadKey(stream);
fMeshKeys.push_back(meshKey);
plKeyVector *vec = TRACKED_NEW plKeyVector;
int boneCount = stream->ReadSwap32();
int boneCount = stream->ReadLE32();
for(int j = 0; j < boneCount; j++)
vec->push_back(mgr->ReadKey(stream));
fUnusedBones.push_back(vec);
}
int nBrains = stream->ReadSwap32();
int nBrains = stream->ReadLE32();
for (i = 0; i < nBrains; i++)
{
plArmatureBrain * brain = (plArmatureBrain *)mgr->ReadCreatable(stream);
@ -241,20 +241,20 @@ void plArmatureModBase::Write(hsStream *stream, hsResMgr *mgr)
int i;
int meshKeyCount = fMeshKeys.size();
stream->WriteSwap32(meshKeyCount);
stream->WriteLE32(meshKeyCount);
for (i = 0; i < meshKeyCount; i++)
{
plKey meshKey = fMeshKeys[i];
mgr->WriteKey(stream, meshKey);
// Should be a list per mesh key
stream->WriteSwap32(fUnusedBones[i]->size());
stream->WriteLE32(fUnusedBones[i]->size());
for(int j = 0; j < fUnusedBones[i]->size(); j++)
mgr->WriteKey(stream, (*fUnusedBones[i])[j]);
}
int nBrains = fBrains.size();
stream->WriteSwap32(nBrains);
stream->WriteLE32(nBrains);
for (i = 0; i < nBrains; i++)
{
mgr->WriteCreatable(stream, fBrains[i]);
@ -1721,7 +1721,7 @@ void plArmatureMod::Write(hsStream *stream, hsResMgr *mgr)
mgr->WriteKey(stream, fMeshKeys[0]);
stream->WriteSafeString(fRootName);
int nBrains = fBrains.size();
stream->WriteSwap32(nBrains);
stream->WriteLE32(nBrains);
for (int i = 0; i < nBrains; i++)
mgr->WriteCreatable(stream, fBrains[i]);
@ -1735,7 +1735,7 @@ void plArmatureMod::Write(hsStream *stream, hsResMgr *mgr)
mgr->WriteKey(stream, fClothingOutfit->GetKey());
}
stream->WriteSwap32(fBodyType);
stream->WriteLE32(fBodyType);
if( fEffects == nil )
stream->WriteBool( false );
else
@ -1744,8 +1744,8 @@ void plArmatureMod::Write(hsStream *stream, hsResMgr *mgr)
mgr->WriteKey(stream, fEffects->GetKey());
}
stream->WriteSwapFloat(fPhysHeight);
stream->WriteSwapFloat(fPhysWidth);
stream->WriteLEFloat(fPhysHeight);
stream->WriteLEFloat(fPhysWidth);
stream->WriteSafeString(fAnimationPrefix.c_str());
stream->WriteSafeString(fBodyAgeName.c_str());
@ -1764,7 +1764,7 @@ void plArmatureMod::Read(hsStream * stream, hsResMgr *mgr)
fRootName = stream->ReadSafeString();
// read in the brains
int nBrains = stream->ReadSwap32();
int nBrains = stream->ReadLE32();
for (int i = 0; i < nBrains; i++)
{
plArmatureBrain * brain = (plArmatureBrain *)mgr->ReadCreatable(stream);
@ -1776,7 +1776,7 @@ void plArmatureMod::Read(hsStream * stream, hsResMgr *mgr)
else
fClothingOutfit = nil;
fBodyType = stream->ReadSwap32();
fBodyType = stream->ReadLE32();
if( stream->ReadBool() )
{
@ -1825,8 +1825,8 @@ void plArmatureMod::Read(hsStream * stream, hsResMgr *mgr)
else
fEffects = nil;
fPhysHeight = stream->ReadSwapFloat();
fPhysWidth = stream->ReadSwapFloat();
fPhysHeight = stream->ReadLEFloat();
fPhysWidth = stream->ReadLEFloat();
char* temp = stream->ReadSafeString();
fAnimationPrefix = temp;
@ -2608,14 +2608,14 @@ void plArmatureLODMod::Read(hsStream *stream, hsResMgr *mgr)
plArmatureMod::Read(stream, mgr);
fMeshKeys.clear();
int meshKeyCount = stream->ReadSwap32();
int meshKeyCount = stream->ReadLE32();
for(int i = 0; i < meshKeyCount; i++)
{
plKey meshKey = mgr->ReadKey(stream);
fMeshKeys.push_back(meshKey);
plKeyVector *vec = TRACKED_NEW plKeyVector;
int boneCount = stream->ReadSwap32();
int boneCount = stream->ReadLE32();
for(int j = 0; j < boneCount; j++)
vec->push_back(mgr->ReadKey(stream));
fUnusedBones.push_back(vec);
@ -2628,7 +2628,7 @@ void plArmatureLODMod::Write(hsStream *stream, hsResMgr *mgr)
plArmatureMod::Write(stream, mgr);
int meshKeyCount = fMeshKeys.size();
stream->WriteSwap32(meshKeyCount);
stream->WriteLE32(meshKeyCount);
for(int i = 0; i < meshKeyCount; i++)
{
@ -2636,7 +2636,7 @@ void plArmatureLODMod::Write(hsStream *stream, hsResMgr *mgr)
mgr->WriteKey(stream, meshKey);
// Should be a list per mesh key
stream->WriteSwap32(fUnusedBones[i]->size());
stream->WriteLE32(fUnusedBones[i]->size());
for(int j = 0; j < fUnusedBones[i]->size(); j++)
mgr->WriteKey(stream, (*fUnusedBones[i])[j]);
}

16
Sources/Plasma/PubUtilLib/plAvatar/plAvBrain.cpp
View File

@ -132,13 +132,13 @@ void plArmatureBrain::Write(hsStream *stream, hsResMgr *mgr)
plCreatable::Write(stream, mgr);
// plAvBrain
stream->WriteSwap32(0);
stream->WriteLE32(0);
stream->WriteBool(false);
// plAvBrainUser
stream->WriteSwap32(0);
stream->WriteSwapScalar(0.f);
stream->WriteSwapDouble(0.f);
stream->WriteLE32(0);
stream->WriteLEScalar(0.f);
stream->WriteLEDouble(0.f);
}
void plArmatureBrain::Read(hsStream *stream, hsResMgr *mgr)
@ -146,14 +146,14 @@ void plArmatureBrain::Read(hsStream *stream, hsResMgr *mgr)
plCreatable::Read(stream, mgr);
// plAvBrain
stream->ReadSwap32();
stream->ReadLE32();
if (stream->ReadBool())
mgr->ReadKey(stream);
// plAvBrainUser
stream->ReadSwap32();
stream->ReadSwapScalar();
stream->ReadSwapDouble();
stream->ReadLE32();
stream->ReadLEScalar();
stream->ReadLEDouble();
}
// MSGRECEIVE

12
Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCoop.cpp
View File

@ -199,8 +199,8 @@ void plAvBrainCoop::Read(hsStream *stream, hsResMgr *mgr)
{
plAvBrainGeneric::Read(stream, mgr);
fInitiatorID = stream->ReadSwap32();
fInitiatorSerial = stream->ReadSwap16();
fInitiatorID = stream->ReadLE32();
fInitiatorSerial = stream->ReadLE16();
if(stream->Readbool())
{
@ -212,7 +212,7 @@ void plAvBrainCoop::Read(hsStream *stream, hsResMgr *mgr)
}
fWaitingForClick = stream->Readbool();
unsigned numRecipients = stream->ReadSwap16();
unsigned numRecipients = stream->ReadLE16();
for (unsigned i = 0; i < numRecipients; i++)
fRecipients.push_back(mgr->ReadKey(stream));
}
@ -223,8 +223,8 @@ void plAvBrainCoop::Write(hsStream *stream, hsResMgr *mgr)
{
plAvBrainGeneric::Write(stream, mgr);
stream->WriteSwap32(fInitiatorID);
stream->WriteSwap16(fInitiatorSerial);
stream->WriteLE32(fInitiatorID);
stream->WriteLE16(fInitiatorSerial);
bool hasHostKey = (fHostKey != nil);
bool hasGuestKey = (fGuestKey != nil);
@ -239,7 +239,7 @@ void plAvBrainCoop::Write(hsStream *stream, hsResMgr *mgr)
stream->Writebool(fWaitingForClick);
stream->WriteSwap16(fRecipients.size());
stream->WriteLE16(fRecipients.size());
for (unsigned i = 0; i < fRecipients.size(); i++)
mgr->WriteKey(stream, fRecipients[i]);
}

24
Sources/Plasma/PubUtilLib/plAvatar/plAvBrainGeneric.cpp
View File

@ -779,7 +779,7 @@ void plAvBrainGeneric::Write(hsStream *stream, hsResMgr *mgr)
{
plArmatureBrain::Write(stream, mgr);
int numStages = fStages->size();
stream->WriteSwap32(numStages);
stream->WriteLE32(numStages);
for(int i = 0; i < numStages; i++)
{
@ -790,9 +790,9 @@ void plAvBrainGeneric::Write(hsStream *stream, hsResMgr *mgr)
stage->SaveAux(stream, mgr); // save ephemeral state
}
stream->WriteSwap32(fCurStage);
stream->WriteSwap32(fType);
stream->WriteSwap32(fExitFlags);
stream->WriteLE32(fCurStage);
stream->WriteLE32(fType);
stream->WriteLE32(fExitFlags);
stream->WriteByte(fMode);
stream->Writebool(fForward);
@ -810,8 +810,8 @@ void plAvBrainGeneric::Write(hsStream *stream, hsResMgr *mgr)
stream->WriteBool(false);
}
stream->WriteSwapScalar(fFadeIn);
stream->WriteSwapScalar(fFadeOut);
stream->WriteLEScalar(fFadeIn);
stream->WriteLEScalar(fFadeOut);
stream->WriteByte(fMoveMode);
stream->WriteByte(fBodyUsage);
mgr->WriteKey(stream, fRecipient);
@ -822,7 +822,7 @@ void plAvBrainGeneric::Write(hsStream *stream, hsResMgr *mgr)
void plAvBrainGeneric::Read(hsStream *stream, hsResMgr *mgr)
{
plArmatureBrain::Read(stream, mgr);
int numStages = stream->ReadSwap32();
int numStages = stream->ReadLE32();
for(int i = 0; i < numStages; i++)
{
@ -834,9 +834,9 @@ void plAvBrainGeneric::Read(hsStream *stream, hsResMgr *mgr)
fStages->push_back(stage);
}
fCurStage = stream->ReadSwap32();
fType = static_cast<plAvBrainGeneric::BrainType>(stream->ReadSwap32());
fExitFlags = stream->ReadSwap32();
fCurStage = stream->ReadLE32();
fType = static_cast<plAvBrainGeneric::BrainType>(stream->ReadLE32());
fExitFlags = stream->ReadLE32();
fMode = static_cast<Mode>(stream->ReadByte());
fForward = stream->Readbool();
@ -851,8 +851,8 @@ void plAvBrainGeneric::Read(hsStream *stream, hsResMgr *mgr)
fEndMessage = nil;
}
fFadeIn = stream->ReadSwapScalar();
fFadeOut = stream->ReadSwapScalar();
fFadeIn = stream->ReadLEScalar();
fFadeOut = stream->ReadLEScalar();
fMoveMode = static_cast<MoveMode>(stream->ReadByte());
fBodyUsage = static_cast<plAGAnim::BodyUsage>(stream->ReadByte());
fRecipient = mgr->ReadKey(stream);

20
Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp
View File

@ -334,26 +334,26 @@ void plAvLadderMod::Read(hsStream *stream, hsResMgr *mgr)
{
plSingleModifier::Read(stream, mgr);
fType = stream->ReadSwap32();
fLoops = stream->ReadSwap32();
fType = stream->ReadLE32();
fLoops = stream->ReadLE32();
fGoingUp = stream->Readbool();
fEnabled = stream->Readbool();
fLadderView.fX = stream->ReadSwapScalar();
fLadderView.fY = stream->ReadSwapScalar();
fLadderView.fZ = stream->ReadSwapScalar();
fLadderView.fX = stream->ReadLEScalar();
fLadderView.fY = stream->ReadLEScalar();
fLadderView.fZ = stream->ReadLEScalar();
}
void plAvLadderMod::Write(hsStream *stream, hsResMgr *mgr)
{
plSingleModifier::Write(stream, mgr);
stream->WriteSwap32(fType);
stream->WriteSwap32(fLoops);
stream->WriteLE32(fType);
stream->WriteLE32(fLoops);
stream->Writebool(fGoingUp);
stream->WriteBool(fEnabled);
stream->WriteSwapScalar(fLadderView.fX);
stream->WriteSwapScalar(fLadderView.fY);
stream->WriteSwapScalar(fLadderView.fZ);
stream->WriteLEScalar(fLadderView.fX);
stream->WriteLEScalar(fLadderView.fY);
stream->WriteLEScalar(fLadderView.fZ);
}
// true is up; false is down

8
Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp
View File

@ -180,7 +180,7 @@ void plClothingItem::Read(hsStream *s, hsResMgr *mgr)
if (s->ReadBool())
mgr->ReadKeyNotifyMe(s, TRACKED_NEW plGenRefMsg(GetKey(), plRefMsg::kOnCreate, -1, -1), plRefFlags::kActiveRef); // thumbnail
int tileCount = s->ReadSwap32();
int tileCount = s->ReadLE32();
int i, j;
for (i = 0; i < tileCount; i++)
{
@ -237,7 +237,7 @@ void plClothingItem::Write(hsStream *s, hsResMgr *mgr)
if (fTextures[i] == nil)
texSkip++;
s->WriteSwap32(fTextures.GetCount() - texSkip);
s->WriteLE32(fTextures.GetCount() - texSkip);
for (i = 0; i < fTextures.GetCount(); i++)
{
if (fTextures[i] == nil)
@ -1184,7 +1184,7 @@ void plClothingOutfit::WearRandomOutfit()
hsBool plClothingOutfit::ReadItems(hsStream* s, hsResMgr* mgr, hsBool broadcast /* = true */)
{
hsBool result = true;
UInt32 numItems = s->ReadSwap32();
UInt32 numItems = s->ReadLE32();
int i;
for (i = 0; i < numItems; i++)
{
@ -1214,7 +1214,7 @@ hsBool plClothingOutfit::ReadItems(hsStream* s, hsResMgr* mgr, hsBool broadcast
void plClothingOutfit::WriteItems(hsStream *s, hsResMgr *mgr)
{
s->WriteSwap32(fItems.GetCount());
s->WriteLE32(fItems.GetCount());
int i;
for (i = 0; i < fItems.GetCount(); i++)
{

16
Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp
View File

@ -482,10 +482,10 @@ void plAvAnimTask::LeaveAge(plArmatureMod *avatar)
void plAvAnimTask::Read(hsStream *stream, hsResMgr *mgr)
{
fAnimName = stream->ReadSafeString();
fInitialBlend = stream->ReadSwapScalar();
fTargetBlend = stream->ReadSwapScalar();
fFadeSpeed = stream->ReadSwapScalar();
fSetTime = stream->ReadSwapScalar();
fInitialBlend = stream->ReadLEScalar();
fTargetBlend = stream->ReadLEScalar();
fFadeSpeed = stream->ReadLEScalar();
fSetTime = stream->ReadLEScalar();
fStart = stream->ReadBool();
fLoop = stream->ReadBool();
fAttach = stream->ReadBool();
@ -495,10 +495,10 @@ void plAvAnimTask::Read(hsStream *stream, hsResMgr *mgr)
void plAvAnimTask::Write(hsStream *stream, hsResMgr *mgr)
{
stream->WriteSafeString(fAnimName);
stream->WriteSwapScalar(fInitialBlend);
stream->WriteSwapScalar(fTargetBlend);
stream->WriteSwapScalar(fFadeSpeed);
stream->WriteSwapScalar(fSetTime);
stream->WriteLEScalar(fInitialBlend);
stream->WriteLEScalar(fTargetBlend);
stream->WriteLEScalar(fFadeSpeed);
stream->WriteLEScalar(fSetTime);
stream->WriteBool(fStart);
stream->WriteBool(fLoop);
stream->WriteBool(fAttach);

8
Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.cpp
View File

@ -211,7 +211,7 @@ void plMultistageBehMod::Read(hsStream *stream, hsResMgr *mgr)
IDeleteStageVec();
fStages = TRACKED_NEW plAnimStageVec;
int numStages = stream->ReadSwap32();
int numStages = stream->ReadLE32();
fStages->reserve(numStages);
int i;
@ -223,7 +223,7 @@ void plMultistageBehMod::Read(hsStream *stream, hsResMgr *mgr)
fStages->push_back(stage);
}
int numReceivers = stream->ReadSwap32();
int numReceivers = stream->ReadLE32();
fReceivers.clear();
fReceivers.reserve(numReceivers);
for (i = 0; i < numReceivers; i++)
@ -242,7 +242,7 @@ void plMultistageBehMod::Write(hsStream *stream, hsResMgr *mgr)
stream->Writebool(fReverseFBControlsOnRelease);
int numStages = fStages->size();
stream->WriteSwap32(numStages);
stream->WriteLE32(numStages);
int i;
for (i = 0; i < numStages; i++)
@ -252,7 +252,7 @@ void plMultistageBehMod::Write(hsStream *stream, hsResMgr *mgr)
}
int numReceivers = fReceivers.size();
stream->WriteSwap32(numReceivers);
stream->WriteLE32(numReceivers);
for (i = 0; i < numReceivers; i++)
{
plKey key = fReceivers[i];

4
Sources/Plasma/PubUtilLib/plAvatar/plOneShotMod.cpp
View File

@ -166,7 +166,7 @@ void plOneShotMod::Read(hsStream *stream, hsResMgr *mgr)
// read in the name of the animation itself
fAnimName = stream->ReadSafeString();
fSeekDuration = stream->ReadSwapScalar();
fSeekDuration = stream->ReadLEScalar();
fDrivable = stream->ReadBool();
fReversable = stream->ReadBool();
fSmartSeek = (float)stream->ReadBool();
@ -178,7 +178,7 @@ void plOneShotMod::Write(hsStream *stream, hsResMgr *mgr)
plMultiModifier::Write(stream, mgr);
stream->WriteSafeString(fAnimName);
stream->WriteSwapScalar(fSeekDuration);
stream->WriteLEScalar(fSeekDuration);
stream->WriteBool(fDrivable);
stream->WriteBool(fReversable);
stream->WriteBool((hsBool)fSmartSeek);

4
Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.cpp
View File

@ -160,13 +160,13 @@ plScalarConstant::~plScalarConstant()
void plScalarConstant::Read(hsStream *stream, hsResMgr *mgr)
{
plScalarChannel::Read(stream, mgr);
fResult = stream->ReadSwapScalar();
fResult = stream->ReadLEScalar();
}
void plScalarConstant::Write(hsStream *stream, hsResMgr *mgr)
{
plScalarChannel::Write(stream, mgr);
stream->WriteSwapScalar(fResult);
stream->WriteLEScalar(fResult);
}

4
Sources/Plasma/PubUtilLib/plAvatar/plSeekPointMod.cpp
View File

@ -87,7 +87,7 @@ void plSeekPointMod::Read(hsStream *stream, hsResMgr *mgr)
plMultiModifier::Read(stream, mgr);
// read in the name of the animation itself
int length = stream->ReadSwap32();
int length = stream->ReadLE32();
if(length > 0)
{
fName = TRACKED_NEW char[length + 1];
@ -102,7 +102,7 @@ void plSeekPointMod::Write(hsStream *stream, hsResMgr *mgr)
plMultiModifier::Write(stream, mgr);
int length = strlen(fName);
stream->WriteSwap32(length);
stream->WriteLE32(length);
if (length > 0)
{
stream->Write(length, fName);

4
Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.cpp
View File

@ -98,7 +98,7 @@ void plSittingModifier::Read(hsStream *stream, hsResMgr *mgr)
fMiscFlags = stream->ReadByte();
int keyCount = stream->ReadSwap32();
int keyCount = stream->ReadLE32();
for (int i = 0; i < keyCount; i++ )
fNotifyKeys.Append(mgr->ReadKey(stream));
}
@ -111,7 +111,7 @@ void plSittingModifier::Write(hsStream *stream, hsResMgr *mgr)
stream->WriteByte(fMiscFlags);
stream->WriteSwap32(fNotifyKeys.GetCount());
stream->WriteLE32(fNotifyKeys.GetCount());
for (int i = 0; i < fNotifyKeys.GetCount(); i++)
mgr->WriteKey(stream, fNotifyKeys[i]);
}

48
Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.cpp
View File

@ -50,18 +50,18 @@ void plSwimRegionInterface::Read(hsStream* s, hsResMgr* mgr)
{
plObjInterface::Read(s, mgr);
fDownBuoyancy = s->ReadSwapScalar();
fUpBuoyancy = s->ReadSwapScalar();
fMaxUpwardVel = s->ReadSwapScalar();
fDownBuoyancy = s->ReadLEScalar();
fUpBuoyancy = s->ReadLEScalar();
fMaxUpwardVel = s->ReadLEScalar();
}
void plSwimRegionInterface::Write(hsStream* s, hsResMgr* mgr)
{
plObjInterface::Write(s, mgr);
s->WriteSwapScalar(fDownBuoyancy);
s->WriteSwapScalar(fUpBuoyancy);
s->WriteSwapScalar(fMaxUpwardVel);
s->WriteLEScalar(fDownBuoyancy);
s->WriteLEScalar(fUpBuoyancy);
s->WriteLEScalar(fMaxUpwardVel);
}
void plSwimRegionInterface::GetCurrent(plPhysicalControllerCore *physical, hsVector3 &linearResult, hsScalar &angularResult, hsScalar elapsed)
@ -86,11 +86,11 @@ void plSwimCircularCurrentRegion::Read(hsStream* stream, hsResMgr* mgr)
{
plSwimRegionInterface::Read(stream, mgr);
fRotation = stream->ReadSwapScalar();
fPullNearDistSq = stream->ReadSwapScalar();
fPullNearVel = stream->ReadSwapScalar();
fPullFarDistSq = stream->ReadSwapScalar();
fPullFarVel = stream->ReadSwapScalar();
fRotation = stream->ReadLEScalar();
fPullNearDistSq = stream->ReadLEScalar();
fPullNearVel = stream->ReadLEScalar();
fPullFarDistSq = stream->ReadLEScalar();
fPullFarVel = stream->ReadLEScalar();
mgr->ReadKeyNotifyMe(stream, TRACKED_NEW plGenRefMsg(GetKey(), plRefMsg::kOnCreate, -1, -1), plRefFlags::kActiveRef); // currentSO
}
@ -98,11 +98,11 @@ void plSwimCircularCurrentRegion::Write(hsStream* stream, hsResMgr* mgr)
{
plSwimRegionInterface::Write(stream, mgr);
stream->WriteSwapScalar(fRotation);
stream->WriteSwapScalar(fPullNearDistSq);
stream->WriteSwapScalar(fPullNearVel);
stream->WriteSwapScalar(fPullFarDistSq);
stream->WriteSwapScalar(fPullFarVel);
stream->WriteLEScalar(fRotation);
stream->WriteLEScalar(fPullNearDistSq);
stream->WriteLEScalar(fPullNearVel);
stream->WriteLEScalar(fPullFarDistSq);
stream->WriteLEScalar(fPullFarVel);
mgr->WriteKey(stream, fCurrentSO);
}
@ -204,10 +204,10 @@ void plSwimStraightCurrentRegion::Read(hsStream* stream, hsResMgr* mgr)
{
plSwimRegionInterface::Read(stream, mgr);
fNearDist = stream->ReadSwapScalar();
fNearVel = stream->ReadSwapScalar();
fFarDist = stream->ReadSwapScalar();
fFarVel = stream->ReadSwapScalar();
fNearDist = stream->ReadLEScalar();
fNearVel = stream->ReadLEScalar();
fFarDist = stream->ReadLEScalar();
fFarVel = stream->ReadLEScalar();
mgr->ReadKeyNotifyMe(stream, TRACKED_NEW plGenRefMsg(GetKey(), plRefMsg::kOnCreate, -1, -1), plRefFlags::kActiveRef); // currentSO
}
@ -215,10 +215,10 @@ void plSwimStraightCurrentRegion::Write(hsStream* stream, hsResMgr* mgr)
{
plSwimRegionInterface::Write(stream, mgr);
stream->WriteSwapScalar(fNearDist);
stream->WriteSwapScalar(fNearVel);
stream->WriteSwapScalar(fFarDist);
stream->WriteSwapScalar(fFarVel);
stream->WriteLEScalar(fNearDist);
stream->WriteLEScalar(fNearVel);
stream->WriteLEScalar(fFarDist);
stream->WriteLEScalar(fFarVel);
mgr->WriteKey(stream, fCurrentSO);
}