mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-18 19:29:09 +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:
@ -219,22 +219,22 @@ void hsGMaterial::SetLayer(plLayerInterface* layer, Int32 which, hsBool insert,
|
||||
|
||||
void hsGMaterial::Write(hsStream* s)
|
||||
{
|
||||
s->WriteSwap32(fLoadFlags);
|
||||
s->WriteSwap32(fCompFlags);
|
||||
s->WriteLE32(fLoadFlags);
|
||||
s->WriteLE32(fCompFlags);
|
||||
|
||||
s->WriteSwap32(GetNumLayers());
|
||||
s->WriteSwap32(GetNumPiggyBacks());
|
||||
s->WriteLE32(GetNumLayers());
|
||||
s->WriteLE32(GetNumPiggyBacks());
|
||||
}
|
||||
|
||||
void hsGMaterial::Read(hsStream* s)
|
||||
{
|
||||
fLoadFlags = s->ReadSwap32();
|
||||
fCompFlags = s->ReadSwap32();
|
||||
fLoadFlags = s->ReadLE32();
|
||||
fCompFlags = s->ReadLE32();
|
||||
|
||||
IClearLayers();
|
||||
int n = s->ReadSwap32();
|
||||
int n = s->ReadLE32();
|
||||
fLayers.SetCountAndZero(n);
|
||||
n = s->ReadSwap32();
|
||||
n = s->ReadLE32();
|
||||
fPiggyBacks.SetCountAndZero(n);
|
||||
}
|
||||
|
||||
|
@ -65,22 +65,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
|
||||
void plGrassWave::Write(hsStream *s)
|
||||
{
|
||||
s->WriteSwapScalar(fDistX);
|
||||
s->WriteSwapScalar(fDistY);
|
||||
s->WriteSwapScalar(fDistZ);
|
||||
s->WriteSwapScalar(fDirX);
|
||||
s->WriteSwapScalar(fDirY);
|
||||
s->WriteSwapScalar(fSpeed);
|
||||
s->WriteLEScalar(fDistX);
|
||||
s->WriteLEScalar(fDistY);
|
||||
s->WriteLEScalar(fDistZ);
|
||||
s->WriteLEScalar(fDirX);
|
||||
s->WriteLEScalar(fDirY);
|
||||
s->WriteLEScalar(fSpeed);
|
||||
}
|
||||
|
||||
void plGrassWave::Read(hsStream *s)
|
||||
{
|
||||
fDistX = s->ReadSwapScalar();
|
||||
fDistY = s->ReadSwapScalar();
|
||||
fDistZ = s->ReadSwapScalar();
|
||||
fDirX = s->ReadSwapScalar();
|
||||
fDirY = s->ReadSwapScalar();
|
||||
fSpeed = s->ReadSwapScalar();
|
||||
fDistX = s->ReadLEScalar();
|
||||
fDistY = s->ReadLEScalar();
|
||||
fDistZ = s->ReadLEScalar();
|
||||
fDirX = s->ReadLEScalar();
|
||||
fDirY = s->ReadLEScalar();
|
||||
fSpeed = s->ReadLEScalar();
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -123,10 +123,10 @@ void plLayer::Read(hsStream* s, hsResMgr* mgr)
|
||||
fAmbientColor->Read(s);
|
||||
fSpecularColor->Read( s );
|
||||
|
||||
*fUVWSrc = s->ReadSwap32();
|
||||
*fOpacity = s->ReadSwapScalar();
|
||||
*fLODBias = s->ReadSwapScalar();
|
||||
*fSpecularPower = s->ReadSwapScalar();
|
||||
*fUVWSrc = s->ReadLE32();
|
||||
*fOpacity = s->ReadLEScalar();
|
||||
*fLODBias = s->ReadLEScalar();
|
||||
*fSpecularPower = s->ReadLEScalar();
|
||||
|
||||
plLayRefMsg* refMsg = TRACKED_NEW plLayRefMsg(GetKey(), plRefMsg::kOnCreate, 0, plLayRefMsg::kTexture);
|
||||
mgr->ReadKeyNotifyMe(s,refMsg, plRefFlags::kActiveRef);
|
||||
@ -154,10 +154,10 @@ void plLayer::Write(hsStream* s, hsResMgr* mgr)
|
||||
fAmbientColor->Write(s);
|
||||
fSpecularColor->Write( s );
|
||||
|
||||
s->WriteSwap32(*fUVWSrc);
|
||||
s->WriteSwapScalar(*fOpacity);
|
||||
s->WriteSwapScalar(*fLODBias);
|
||||
s->WriteSwapScalar(*fSpecularPower);
|
||||
s->WriteLE32(*fUVWSrc);
|
||||
s->WriteLEScalar(*fOpacity);
|
||||
s->WriteLEScalar(*fLODBias);
|
||||
s->WriteLEScalar(*fSpecularPower);
|
||||
|
||||
|
||||
mgr->WriteKey(s, GetTexture());
|
||||
|
@ -57,11 +57,11 @@ void plLayerMultiply::Read(hsStream* s, hsResMgr* mgr)
|
||||
{
|
||||
plLayerInterface::Read(s, mgr);
|
||||
|
||||
fOwnedChannels = s->ReadSwap32();
|
||||
fOwnedChannels = s->ReadLE32();
|
||||
if (fOwnedChannels & kOpacity)
|
||||
{
|
||||
fOpacity = TRACKED_NEW hsScalar;
|
||||
*fOpacity = fSrcOpacity = s->ReadSwapScalar();
|
||||
*fOpacity = fSrcOpacity = s->ReadLEScalar();
|
||||
fDirtyChannels |= kOpacity;
|
||||
}
|
||||
|
||||
@ -102,9 +102,9 @@ void plLayerMultiply::Write(hsStream* s, hsResMgr* mgr)
|
||||
{
|
||||
plLayerInterface::Write(s, mgr);
|
||||
|
||||
s->WriteSwap32(fOwnedChannels);
|
||||
s->WriteLE32(fOwnedChannels);
|
||||
if (fOwnedChannels & kOpacity)
|
||||
s->WriteSwapScalar(fSrcOpacity);
|
||||
s->WriteLEScalar(fSrcOpacity);
|
||||
|
||||
if (fOwnedChannels & kPreshadeColor)
|
||||
fSrcPreshadeColor.Write(s);
|
||||
|
@ -55,18 +55,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
// Little shader const helper
|
||||
void plShaderConst::Read(hsStream* s)
|
||||
{
|
||||
fX = s->ReadSwapScalar();
|
||||
fY = s->ReadSwapScalar();
|
||||
fZ = s->ReadSwapScalar();
|
||||
fW = s->ReadSwapScalar();
|
||||
fX = s->ReadLEScalar();
|
||||
fY = s->ReadLEScalar();
|
||||
fZ = s->ReadLEScalar();
|
||||
fW = s->ReadLEScalar();
|
||||
}
|
||||
|
||||
void plShaderConst::Write(hsStream* s)
|
||||
{
|
||||
s->WriteSwapScalar(fX);
|
||||
s->WriteSwapScalar(fY);
|
||||
s->WriteSwapScalar(fZ);
|
||||
s->WriteSwapScalar(fW);
|
||||
s->WriteLEScalar(fX);
|
||||
s->WriteLEScalar(fY);
|
||||
s->WriteLEScalar(fZ);
|
||||
s->WriteLEScalar(fW);
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////
|
||||
@ -287,13 +287,13 @@ void plShader::Read(hsStream* s, hsResMgr* mgr)
|
||||
|
||||
hsKeyedObject::Read(s, mgr);
|
||||
|
||||
UInt32 n = s->ReadSwap32();
|
||||
UInt32 n = s->ReadLE32();
|
||||
fConsts.SetCount(n);
|
||||
int i;
|
||||
for( i = 0; i < n; i++ )
|
||||
fConsts[i].Read(s);
|
||||
|
||||
plShaderID::ID id = plShaderID::ID(s->ReadSwap32());
|
||||
plShaderID::ID id = plShaderID::ID(s->ReadLE32());
|
||||
SetDecl(plShaderTable::Decl(id));
|
||||
|
||||
fInput = s->ReadByte();
|
||||
@ -304,12 +304,12 @@ void plShader::Write(hsStream* s, hsResMgr* mgr)
|
||||
{
|
||||
hsKeyedObject::Write(s, mgr);
|
||||
|
||||
s->WriteSwap32(fConsts.GetCount());
|
||||
s->WriteLE32(fConsts.GetCount());
|
||||
int i;
|
||||
for( i = 0; i < fConsts.GetCount(); i++ )
|
||||
fConsts[i].Write(s);
|
||||
|
||||
s->WriteSwap32(fDecl->GetID());
|
||||
s->WriteLE32(fDecl->GetID());
|
||||
|
||||
s->WriteByte(fInput);
|
||||
s->WriteByte(fOutput);
|
||||
|
Reference in New Issue
Block a user