OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 10:52:46 +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

4
Sources/Plasma/PubUtilLib/plDrawable/plActivePrintShape.cpp
View File

@ -65,7 +65,7 @@ void plActivePrintShape::Read(hsStream* stream, hsResMgr* mgr)
{
plPrintShape::Read(stream, mgr);
UInt32 n = stream->ReadSwap32();
UInt32 n = stream->ReadLE32();
fDecalMgrs.SetCount(n);
int i;
for( i = 0; i < n; i++ )
@ -78,7 +78,7 @@ void plActivePrintShape::Write(hsStream* stream, hsResMgr* mgr)
{
plPrintShape::Write(stream, mgr);
stream->WriteSwap32(fDecalMgrs.GetCount());
stream->WriteLE32(fDecalMgrs.GetCount());
int i;
for( i = 0; i < fDecalMgrs.GetCount(); i++ )
mgr->WriteKey(stream, fDecalMgrs[i]);

4
Sources/Plasma/PubUtilLib/plDrawable/plCluster.cpp
View File

@ -69,7 +69,7 @@ void plCluster::Read(hsStream* s, plClusterGroup* grp)
hsAssert(fGroup->GetTemplate(), "Template should have been loaded by now");
const int numVerts = fGroup->GetTemplate()->NumVerts();
const int numInst = s->ReadSwap32();
const int numInst = s->ReadLE32();
fInsts.SetCount(numInst);
int i;
for( i = 0; i < numInst; i++ )
@ -85,7 +85,7 @@ void plCluster::Write(hsStream* s) const
fEncoding.Write(s);
const int numVerts = fGroup->GetTemplate()->NumVerts();
s->WriteSwap32(fInsts.GetCount());
s->WriteLE32(fInsts.GetCount());
int i;
for( i = 0; i < fInsts.GetCount(); i++ )
{

24
Sources/Plasma/PubUtilLib/plDrawable/plClusterGroup.cpp
View File

@ -114,7 +114,7 @@ void plClusterGroup::Read(hsStream* stream, hsResMgr* mgr)
mgr->ReadKeyNotifyMe(stream, TRACKED_NEW plGenRefMsg(GetKey(), plRefMsg::kOnCreate, -1, kRefMaterial), plRefFlags::kActiveRef);
const int numClust = stream->ReadSwap32();
const int numClust = stream->ReadLE32();
fClusters.SetCount(numClust);
for( i = 0; i < numClust; i++ )
{
@ -122,17 +122,17 @@ void plClusterGroup::Read(hsStream* stream, hsResMgr* mgr)
fClusters[i]->Read(stream, this);
}
const int numRegions = stream->ReadSwap32();
const int numRegions = stream->ReadLE32();
for( i = 0; i < numRegions; i++ )
mgr->ReadKeyNotifyMe(stream, TRACKED_NEW plGenRefMsg(GetKey(), plRefMsg::kOnCreate, -1, kRefRegion), plRefFlags::kActiveRef);
const int numLights = stream->ReadSwap32();
const int numLights = stream->ReadLE32();
for( i = 0; i < numLights; i++ )
mgr->ReadKeyNotifyMe(stream, TRACKED_NEW plGenRefMsg(GetKey(), plRefMsg::kOnCreate, -1, kRefLight), plRefFlags::kActiveRef);
fLOD.Read(stream);
fRenderLevel.Set(stream->ReadSwap32());
fRenderLevel.Set(stream->ReadLE32());
fSceneNode = mgr->ReadKey(stream);
@ -150,21 +150,21 @@ void plClusterGroup::Write(hsStream* stream, hsResMgr* mgr)
mgr->WriteKey(stream, fMaterial);
stream->WriteSwap32(fClusters.GetCount());
stream->WriteLE32(fClusters.GetCount());
for( i = 0; i < fClusters.GetCount(); i++ )
fClusters[i]->Write(stream);
stream->WriteSwap32(fRegions.GetCount());
stream->WriteLE32(fRegions.GetCount());
for( i = 0; i < fRegions.GetCount(); i++ )
mgr->WriteKey(stream, fRegions[i]);
stream->WriteSwap32(fLights.GetCount());
stream->WriteLE32(fLights.GetCount());
for( i = 0; i < fLights.GetCount(); i++ )
mgr->WriteKey(stream, fLights[i]);
fLOD.Write(stream);
stream->WriteSwap32(fRenderLevel.Level());
stream->WriteLE32(fRenderLevel.Level());
mgr->WriteKey(stream, fSceneNode);
}
@ -332,12 +332,12 @@ UInt32 plClusterGroup::NumInst() const
void plLODDist::Read(hsStream* s)
{
fMinDist = s->ReadSwapScalar();
fMaxDist = s->ReadSwapScalar();
fMinDist = s->ReadLEScalar();
fMaxDist = s->ReadLEScalar();
}
void plLODDist::Write(hsStream* s) const
{
s->WriteSwapScalar(fMinDist);
s->WriteSwapScalar(fMaxDist);
s->WriteLEScalar(fMinDist);
s->WriteLEScalar(fMaxDist);
}

12
Sources/Plasma/PubUtilLib/plDrawable/plCutter.cpp
View File

@ -62,18 +62,18 @@ void plCutter::Read(hsStream* stream, hsResMgr* mgr)
{
plCreatable::Read(stream, mgr);
fLengthU = stream->ReadSwapScalar();
fLengthV = stream->ReadSwapScalar();
fLengthW = stream->ReadSwapScalar();
fLengthU = stream->ReadLEScalar();
fLengthV = stream->ReadLEScalar();
fLengthW = stream->ReadLEScalar();
}
void plCutter::Write(hsStream* stream, hsResMgr* mgr)
{
plCreatable::Write(stream, mgr);
stream->WriteSwapScalar(fLengthU);
stream->WriteSwapScalar(fLengthV);
stream->WriteSwapScalar(fLengthW);
stream->WriteLEScalar(fLengthU);
stream->WriteLEScalar(fLengthV);
stream->WriteLEScalar(fLengthW);
}

34
Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp
View File

@ -934,12 +934,12 @@ void plDrawableSpans::Read( hsStream* s, hsResMgr* mgr )
plDrawable::Read(s, mgr);
fProps = s->ReadSwap32();
fCriteria = s->ReadSwap32();
fRenderLevel.fLevel = s->ReadSwap32();
fProps = s->ReadLE32();
fCriteria = s->ReadLE32();
fRenderLevel.fLevel = s->ReadLE32();
/// Read in the material keys
count = s->ReadSwap32();
count = s->ReadLE32();
fMaterials.SetCountAndZero( count );
for( i = 0; i < count; i++ )
{
@ -948,7 +948,7 @@ void plDrawableSpans::Read( hsStream* s, hsResMgr* mgr )
}
/// Read the icicles in
count = s->ReadSwap32();
count = s->ReadLE32();
fIcicles.SetCount( count );
for( i = 0; i < count; i++ )
{
@ -960,15 +960,15 @@ void plDrawableSpans::Read( hsStream* s, hsResMgr* mgr )
/// Read the patches in
// FIXME MAJOR VERSION
// no more patches, remove this line
count = s->ReadSwap32();
count = s->ReadLE32();
/// Now read the index array in and use it to create a pointer table
fSpanSourceIndices.Reset();
fSpans.Reset();
count = s->ReadSwap32();
count = s->ReadLE32();
for( i = 0; i < count; i++ )
{
j = s->ReadSwap32();
j = s->ReadLE32();
switch( j & kSpanTypeMask )
{
case kSpanTypeIcicle: fSpans.Append( (plSpan *)&fIcicles[ j & kSpanIDMask ] ); break;
@ -1013,7 +1013,7 @@ void plDrawableSpans::Read( hsStream* s, hsResMgr* mgr )
{
if( fSpans[i]->fProps & plSpan::kPropHasPermaLights )
{
UInt32 lcnt = s->ReadSwap32();
UInt32 lcnt = s->ReadLE32();
int j;
for( j = 0; j < lcnt; j++ )
{
@ -1022,7 +1022,7 @@ void plDrawableSpans::Read( hsStream* s, hsResMgr* mgr )
}
if( fSpans[i]->fProps & plSpan::kPropHasPermaProjs )
{
UInt32 lcnt = s->ReadSwap32();
UInt32 lcnt = s->ReadLE32();
int j;
for( j = 0; j < lcnt; j++ )
{
@ -1032,7 +1032,7 @@ void plDrawableSpans::Read( hsStream* s, hsResMgr* mgr )
}
/// Read in the source spans if necessary
count = s->ReadSwap32();
count = s->ReadLE32();
if( count > 0 )
{
fSourceSpans.SetCount( count );
@ -1049,7 +1049,7 @@ void plDrawableSpans::Read( hsStream* s, hsResMgr* mgr )
fSourceSpans.Reset();
/// Read in the matrix palette (if any)
count = s->ReadSwap32();
count = s->ReadLE32();
fLocalToWorlds.SetCount(count);
fWorldToLocals.SetCount(count);
fLocalToBones.SetCount(count);
@ -1064,21 +1064,21 @@ void plDrawableSpans::Read( hsStream* s, hsResMgr* mgr )
}
/// Read in the drawInterface index arrays
count = s->ReadSwap32();
count = s->ReadLE32();
fDIIndices.SetCountAndZero( count );
for( i = 0; i < count; i++ )
{
fDIIndices[ i ] = TRACKED_NEW plDISpanIndex;
fDIIndices[ i ]->fFlags = (UInt8)(s->ReadSwap32());
count2 = s->ReadSwap32();
fDIIndices[ i ]->fFlags = (UInt8)(s->ReadLE32());
count2 = s->ReadLE32();
fDIIndices[ i ]->SetCountAndZero( count2 );
for( j = 0; j < count2; j++ )
(*fDIIndices[ i ])[ j ] = s->ReadSwap32();
(*fDIIndices[ i ])[ j ] = s->ReadLE32();
}
/// Read the groups in
count = s->ReadSwap32();
count = s->ReadLE32();
while( count-- )
{
group = TRACKED_NEW plGBufferGroup(0, fProps & kPropVolatile, fProps & kPropSortFaces);

34
Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpansExport.cpp
View File

@ -91,33 +91,33 @@ void plDrawableSpans::Write( hsStream* s, hsResMgr* mgr )
// Parent write
plDrawable::Write(s, mgr);
s->WriteSwap32( fProps );
s->WriteSwap32( fCriteria );
s->WriteSwap32( fRenderLevel.fLevel );
s->WriteLE32( fProps );
s->WriteLE32( fCriteria );
s->WriteLE32( fRenderLevel.fLevel );
/// Write out the material keys
s->WriteSwap32( fMaterials.GetCount() );
s->WriteLE32( fMaterials.GetCount() );
for( i = 0; i < fMaterials.GetCount(); i++ )
mgr->WriteKey( s, fMaterials[ i ] );
/// Write out the icicles
s->WriteSwap32( fIcicles.GetCount() );
s->WriteLE32( fIcicles.GetCount() );
for( i = 0; i < fIcicles.GetCount(); i++ )
fIcicles[ i ].Write( s );
/// Write out the patches
// FIXME MAJOR VERSION
// no more patches, remove this line
s->WriteSwap32(0);
s->WriteLE32(0);
/// Write out the index table based on the pointer array
count = fSpans.GetCount();
s->WriteSwap32( count );
s->WriteLE32( count );
for( i = 0; i < count; i++ )
{
UInt8 *icicle = (UInt8 *)fSpans[ i ], *base = (UInt8 *)fIcicles.AcquireArray();
j = (UInt32)( icicle - base ) / sizeof( plIcicle );
s->WriteSwap32( j );
s->WriteLE32( j );
}
/// Write out the common keys
@ -140,7 +140,7 @@ void plDrawableSpans::Write( hsStream* s, hsResMgr* mgr )
if( fSpans[i]->fProps & plSpan::kPropHasPermaLights )
{
UInt32 lcnt = fSpans[i]->fPermaLights.GetCount();
s->WriteSwap32(lcnt);
s->WriteLE32(lcnt);
int j;
for( j = 0; j < lcnt; j++ )
mgr->WriteKey( s, fSpans[i]->fPermaLights[j]);
@ -148,7 +148,7 @@ void plDrawableSpans::Write( hsStream* s, hsResMgr* mgr )
if( fSpans[i]->fProps & plSpan::kPropHasPermaProjs )
{
UInt32 lcnt = fSpans[i]->fPermaProjs.GetCount();
s->WriteSwap32(lcnt);
s->WriteLE32(lcnt);
int j;
for( j = 0; j < lcnt; j++ )
mgr->WriteKey( s, fSpans[i]->fPermaProjs[j]);
@ -156,7 +156,7 @@ void plDrawableSpans::Write( hsStream* s, hsResMgr* mgr )
}
/// Write out the source spans if necessary
s->WriteSwap32( fSourceSpans.GetCount() );
s->WriteLE32( fSourceSpans.GetCount() );
if( fSourceSpans.GetCount() > 0 )
{
for( i = 0; i < fSourceSpans.GetCount(); i++ )
@ -164,7 +164,7 @@ void plDrawableSpans::Write( hsStream* s, hsResMgr* mgr )
}
count = fLocalToWorlds.GetCount();
s->WriteSwap32(count);
s->WriteLE32(count);
for( i = 0; i < count; i++ )
{
fLocalToWorlds[i].Write(s);
@ -175,21 +175,21 @@ void plDrawableSpans::Write( hsStream* s, hsResMgr* mgr )
}
// Write out the drawInterface index arrays
s->WriteSwap32( fDIIndices.GetCount() );
s->WriteLE32( fDIIndices.GetCount() );
for( i = 0; i < fDIIndices.GetCount(); i++ )
{
plDISpanIndex *array = fDIIndices[ i ];
s->WriteSwap32( array->fFlags );
s->WriteSwap32( array->GetCount() );
s->WriteLE32( array->fFlags );
s->WriteLE32( array->GetCount() );
for( j = 0; j < array->GetCount(); j++ )
s->WriteSwap32( (*array)[ j ] );
s->WriteLE32( (*array)[ j ] );
}
// Write the groups out
count = fGroups.GetCount();
s->WriteSwap( count );
s->WriteLE( count );
for( i = 0; i < count; i++ )
{
#ifdef VERT_LOG

56
Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp
View File

@ -198,40 +198,40 @@ void plDynaDecalMgr::Read(hsStream* stream, hsResMgr* mgr)
mgr->ReadKeyNotifyMe(stream, TRACKED_NEW plGenRefMsg(GetKey(), plRefMsg::kOnCreate, 0, kRefMatRTShade), plRefFlags::kActiveRef);
int n = stream->ReadSwap32();
int n = stream->ReadLE32();
int i;
for( i = 0; i < n; i++ )
{
mgr->ReadKeyNotifyMe(stream, TRACKED_NEW plGenRefMsg(GetKey(), plRefMsg::kOnCreate, 0, kRefTarget), plRefFlags::kPassiveRef);
}
// Associated slave particle systems. We read in the scene objects now, and find the associated systems on loaded message.
n = stream->ReadSwap32();
n = stream->ReadLE32();
for( i = 0; i < n; i++ )
{
mgr->ReadKeyNotifyMe(stream, TRACKED_NEW plGenRefMsg(GetKey(), plRefMsg::kOnCreate, 0, kRefPartyObject), plRefFlags::kPassiveRef);
}
fMaxNumVerts = (UInt16)(stream->ReadSwap32());
fMaxNumIdx = (UInt16)(stream->ReadSwap32());
fMaxNumVerts = (UInt16)(stream->ReadLE32());
fMaxNumIdx = (UInt16)(stream->ReadLE32());
fWaitOnEnable = stream->ReadSwap32();
fWaitOnEnable = stream->ReadLE32();
fIntensity = stream->ReadSwapScalar();
fIntensity = stream->ReadLEScalar();
fInitAtten = fIntensity;
fWetLength = stream->ReadSwapScalar();
fRampEnd = stream->ReadSwapScalar();
fDecayStart = stream->ReadSwapScalar();
fLifeSpan = stream->ReadSwapScalar();
fWetLength = stream->ReadLEScalar();
fRampEnd = stream->ReadLEScalar();
fDecayStart = stream->ReadLEScalar();
fLifeSpan = stream->ReadLEScalar();
fGridSizeU = stream->ReadSwapScalar();
fGridSizeV = stream->ReadSwapScalar();
fGridSizeU = stream->ReadLEScalar();
fGridSizeV = stream->ReadLEScalar();
fScale.Read(stream);
fPartyTime = stream->ReadSwapScalar();
fPartyTime = stream->ReadLEScalar();
n = stream->ReadSwap32();
n = stream->ReadLE32();
fNotifies.SetCount(n);
for( i = 0; i < n; i++ )
fNotifies[i] = mgr->ReadKey(stream);
@ -256,7 +256,7 @@ void plDynaDecalMgr::Write(hsStream* stream, hsResMgr* mgr)
mgr->WriteKey(stream, fMatPreShade);
mgr->WriteKey(stream, fMatRTShade);
stream->WriteSwap32(fTargets.GetCount());
stream->WriteLE32(fTargets.GetCount());
int i;
for( i = 0; i < fTargets.GetCount(); i++ )
@ -265,32 +265,32 @@ void plDynaDecalMgr::Write(hsStream* stream, hsResMgr* mgr)
}
// Particle systems (really their associated sceneobjects).
stream->WriteSwap32(fPartyObjects.GetCount());
stream->WriteLE32(fPartyObjects.GetCount());
for( i = 0; i < fPartyObjects.GetCount(); i++ )
{
mgr->WriteKey(stream, fPartyObjects[i]);
}
stream->WriteSwap32(fMaxNumVerts);
stream->WriteSwap32(fMaxNumIdx);
stream->WriteLE32(fMaxNumVerts);
stream->WriteLE32(fMaxNumIdx);
stream->WriteSwap32(fWaitOnEnable);
stream->WriteLE32(fWaitOnEnable);
stream->WriteSwapScalar(fIntensity);
stream->WriteLEScalar(fIntensity);
stream->WriteSwapScalar(fWetLength);
stream->WriteSwapScalar(fRampEnd);
stream->WriteSwapScalar(fDecayStart);
stream->WriteSwapScalar(fLifeSpan);
stream->WriteLEScalar(fWetLength);
stream->WriteLEScalar(fRampEnd);
stream->WriteLEScalar(fDecayStart);
stream->WriteLEScalar(fLifeSpan);
stream->WriteSwapScalar(fGridSizeU);
stream->WriteSwapScalar(fGridSizeV);
stream->WriteLEScalar(fGridSizeU);
stream->WriteLEScalar(fGridSizeV);
fScale.Write(stream);
stream->WriteSwapScalar(fPartyTime);
stream->WriteLEScalar(fPartyTime);
stream->WriteSwap32(fNotifies.GetCount());
stream->WriteLE32(fNotifies.GetCount());
for( i = 0; i < fNotifies.GetCount(); i++ )
mgr->WriteKey(stream, fNotifies[i]);

8
Sources/Plasma/PubUtilLib/plDrawable/plDynaWakeMgr.cpp
View File

@ -117,8 +117,8 @@ void plDynaWakeMgr::Read(hsStream* stream, hsResMgr* mgr)
fDefaultDir.Read(stream);
fAnimPath = plAnimPath::ConvertNoRef(mgr->ReadCreatable(stream));
fAnimWgt = stream->ReadSwapScalar();
fVelWgt = stream->ReadSwapScalar();
fAnimWgt = stream->ReadLEScalar();
fVelWgt = stream->ReadLEScalar();
}
void plDynaWakeMgr::Write(hsStream* stream, hsResMgr* mgr)
@ -128,8 +128,8 @@ void plDynaWakeMgr::Write(hsStream* stream, hsResMgr* mgr)
fDefaultDir.Write(stream);
mgr->WriteCreatable(stream, fAnimPath);
stream->WriteSwapScalar(fAnimWgt);
stream->WriteSwapScalar(fVelWgt);
stream->WriteLEScalar(fAnimWgt);
stream->WriteLEScalar(fVelWgt);
}
hsVector3 plDynaWakeMgr::IGetDirection(const plDynaDecalInfo& info, const hsPoint3& pos) const

68
Sources/Plasma/PubUtilLib/plDrawable/plGeometrySpan.cpp
View File

@ -515,29 +515,29 @@ void plGeometrySpan::Read( hsStream *stream )
fOBBToLocal.Read(stream);
fLocalToOBB.Read(stream);
fBaseMatrix = stream->ReadSwap32();
fBaseMatrix = stream->ReadLE32();
fNumMatrices = stream->ReadByte();
fLocalUVWChans = stream->ReadSwap16();
fMaxBoneIdx = stream->ReadSwap16();
fPenBoneIdx = stream->ReadSwap16();
fLocalUVWChans = stream->ReadLE16();
fMaxBoneIdx = stream->ReadLE16();
fPenBoneIdx = stream->ReadLE16();
fMinDist = stream->ReadSwapScalar();
fMaxDist = stream->ReadSwapScalar();
fMinDist = stream->ReadLEScalar();
fMaxDist = stream->ReadLEScalar();
fFormat = stream->ReadByte();
fProps = stream->ReadSwap32();
fNumVerts = stream->ReadSwap32();
fNumIndices = stream->ReadSwap32();
fProps = stream->ReadLE32();
fNumVerts = stream->ReadLE32();
fNumIndices = stream->ReadLE32();
// FIXME MAJOR VERSION
// remove these two lines. No more patches.
stream->ReadSwap32();
stream->ReadLE32();
stream->ReadByte();
fDecalLevel = stream->ReadSwap32();
fDecalLevel = stream->ReadLE32();
if( fProps & kWaterHeight )
fWaterHeight = stream->ReadSwapScalar();
fWaterHeight = stream->ReadLEScalar();
if( fNumVerts > 0 )
{
@ -556,8 +556,8 @@ void plGeometrySpan::Read( hsStream *stream )
fDiffuseRGBA = TRACKED_NEW UInt32[ fNumVerts ];
fSpecularRGBA = TRACKED_NEW UInt32[ fNumVerts ];
stream->ReadSwap32( fNumVerts, fDiffuseRGBA );
stream->ReadSwap32( fNumVerts, fSpecularRGBA );
stream->ReadLE32( fNumVerts, fDiffuseRGBA );
stream->ReadLE32( fNumVerts, fSpecularRGBA );
}
else
{
@ -571,16 +571,16 @@ void plGeometrySpan::Read( hsStream *stream )
if( fNumIndices > 0 )
{
fIndexData = TRACKED_NEW UInt16[ fNumIndices ];
stream->ReadSwap16( fNumIndices, fIndexData );
stream->ReadLE16( fNumIndices, fIndexData );
}
else
fIndexData = nil;
// Read the group ID, then look up our instanceRef array from it
fInstanceGroupID = stream->ReadSwap32();
fInstanceGroupID = stream->ReadLE32();
if( fInstanceGroupID != kNoGroupID )
{
UInt32 count = stream->ReadSwap32();
UInt32 count = stream->ReadLE32();
fInstanceRefs = IGetInstanceGroup( fInstanceGroupID, count );
fInstanceRefs->Append( this );
@ -607,29 +607,29 @@ void plGeometrySpan::Write( hsStream *stream )
fOBBToLocal.Write(stream);
fLocalToOBB.Write(stream);
stream->WriteSwap32( fBaseMatrix );
stream->WriteLE32( fBaseMatrix );
stream->WriteByte( fNumMatrices );
stream->WriteSwap16(fLocalUVWChans);
stream->WriteSwap16(fMaxBoneIdx);
stream->WriteSwap16((UInt16)fPenBoneIdx);
stream->WriteLE16(fLocalUVWChans);
stream->WriteLE16(fMaxBoneIdx);
stream->WriteLE16((UInt16)fPenBoneIdx);
stream->WriteSwapScalar(fMinDist);
stream->WriteSwapScalar(fMaxDist);
stream->WriteLEScalar(fMinDist);
stream->WriteLEScalar(fMaxDist);
stream->WriteByte( fFormat );
stream->WriteSwap32( fProps );
stream->WriteSwap32( fNumVerts );
stream->WriteSwap32( fNumIndices );
stream->WriteLE32( fProps );
stream->WriteLE32( fNumVerts );
stream->WriteLE32( fNumIndices );
// FIXME MAJOR VERSION
// Remove these two lines.
stream->WriteSwap32(0);
stream->WriteLE32(0);
stream->WriteByte(0);
stream->WriteSwap32( fDecalLevel );
stream->WriteLE32( fDecalLevel );
if( fProps & kWaterHeight )
stream->WriteSwapScalar(fWaterHeight);
stream->WriteLEScalar(fWaterHeight);
if( fNumVerts > 0 )
{
@ -642,19 +642,19 @@ void plGeometrySpan::Write( hsStream *stream )
fMultColor[ i ].Write( stream );
fAddColor[ i ].Write( stream );
}
stream->WriteSwap32( fNumVerts, fDiffuseRGBA );
stream->WriteSwap32( fNumVerts, fSpecularRGBA );
stream->WriteLE32( fNumVerts, fDiffuseRGBA );
stream->WriteLE32( fNumVerts, fSpecularRGBA );
}
if( fNumIndices > 0 )
{
stream->WriteSwap16( fNumIndices, fIndexData );
stream->WriteLE16( fNumIndices, fIndexData );
}
// Write the groupID as well as the count for instanceRefs. This way
stream->WriteSwap32( fInstanceGroupID );
stream->WriteLE32( fInstanceGroupID );
if( fInstanceGroupID != kNoGroupID )
stream->WriteSwap32( fInstanceRefs->GetCount() );
stream->WriteLE32( fInstanceRefs->GetCount() );
else
{
hsAssert( fInstanceRefs == nil, "Nil instanceRefs array but no group ID, non sequitur" );

4
Sources/Plasma/PubUtilLib/plDrawable/plInstanceDrawInterface.cpp
View File

@ -57,7 +57,7 @@ void plInstanceDrawInterface::Read(hsStream* stream, hsResMgr* mgr)
{
plDrawInterface::Read(stream, mgr);
fTargetID = stream->ReadSwap32();
fTargetID = stream->ReadLE32();
plSwapSpansRefMsg *sMsg = TRACKED_NEW plSwapSpansRefMsg(GetKey(), plRefMsg::kOnCreate, -1, -1);
mgr->ReadKeyNotifyMe(stream, sMsg, plRefFlags::kActiveRef);
}
@ -66,7 +66,7 @@ void plInstanceDrawInterface::Write(hsStream* stream, hsResMgr* mgr)
{
plDrawInterface::Write(stream, mgr);
stream->WriteSwap32(fTargetID);
stream->WriteLE32(fTargetID);
mgr->WriteKey(stream, fDrawable->GetKey());
}

4
Sources/Plasma/PubUtilLib/plDrawable/plMorphArray.cpp
View File

@ -73,7 +73,7 @@ void plMorphArray::Apply(hsTArray<plAccessSpan>& dst, hsTArray<hsScalar>* weight
void plMorphArray::Read(hsStream* s, hsResMgr* mgr)
{
int n = s->ReadSwap32();
int n = s->ReadLE32();
fDeltas.SetCount(n);
int i;
for( i = 0; i < n; i++ )
@ -82,7 +82,7 @@ void plMorphArray::Read(hsStream* s, hsResMgr* mgr)
void plMorphArray::Write(hsStream* s, hsResMgr* mgr)
{
s->WriteSwap32(fDeltas.GetCount());
s->WriteLE32(fDeltas.GetCount());
int i;
for( i = 0; i < fDeltas.GetCount(); i++ )

16
Sources/Plasma/PubUtilLib/plDrawable/plMorphDelta.cpp
View File

@ -301,15 +301,15 @@ void plMorphDelta::SetDeltas(int iSpan, const hsTArray<plVertDelta>& deltas, int
void plMorphDelta::Read(hsStream* s, hsResMgr* mgr)
{
fWeight = s->ReadSwapScalar();
fWeight = s->ReadLEScalar();
int n = s->ReadSwap32();
int n = s->ReadLE32();
SetNumSpans(n);
int iSpan;
for( iSpan = 0; iSpan < n; iSpan++ )
{
int nDel = s->ReadSwap32();
int nUVW = s->ReadSwap32();
int nDel = s->ReadLE32();
int nUVW = s->ReadLE32();
AllocDeltas(iSpan, nDel, nUVW);
if( nDel )
{
@ -323,17 +323,17 @@ void plMorphDelta::Read(hsStream* s, hsResMgr* mgr)
void plMorphDelta::Write(hsStream* s, hsResMgr* mgr)
{
s->WriteSwapScalar(fWeight);
s->WriteLEScalar(fWeight);
s->WriteSwap32(fSpans.GetCount());
s->WriteLE32(fSpans.GetCount());
int iSpan;
for( iSpan = 0; iSpan < fSpans.GetCount(); iSpan++ )
{
int nDel = fSpans[iSpan].fDeltas.GetCount();
int nUVW = fSpans[iSpan].fNumUVWChans;
s->WriteSwap32(nDel);
s->WriteSwap32(nUVW);
s->WriteLE32(nDel);
s->WriteLE32(nUVW);
if( nDel )
{

12
Sources/Plasma/PubUtilLib/plDrawable/plMorphSequence.cpp
View File

@ -70,7 +70,7 @@ void plMorphDataSet::Read(hsStream* s, hsResMgr* mgr)
{
hsKeyedObject::Read(s, mgr);
int n = s->ReadSwap32();
int n = s->ReadLE32();
fMorphs.SetCount(n);
int i;
for( i = 0; i < n; i++ )
@ -81,7 +81,7 @@ void plMorphDataSet::Write(hsStream* s, hsResMgr* mgr)
{
hsKeyedObject::Write(s, mgr);
s->WriteSwap32(fMorphs.GetCount());
s->WriteLE32(fMorphs.GetCount());
int i;
for( i = 0; i < fMorphs.GetCount(); i++ )
fMorphs[i].Write(s, mgr);
@ -485,13 +485,13 @@ void plMorphSequence::Read(hsStream* s, hsResMgr* mgr)
fMorphFlags = 0;
int n = s->ReadSwap32();
int n = s->ReadLE32();
fMorphs.SetCount(n);
int i;
for( i = 0; i < n; i++ )
fMorphs[i].Read(s, mgr);
n = s->ReadSwap32();
n = s->ReadLE32();
for( i = 0; i < n; i++)
mgr->ReadKeyNotifyMe(s, TRACKED_NEW plGenRefMsg(GetKey(), plRefMsg::kOnCreate, -1, -1), plRefFlags::kActiveRef);
}
@ -500,12 +500,12 @@ void plMorphSequence::Write(hsStream* s, hsResMgr* mgr)
{
plSingleModifier::Write(s, mgr);
s->WriteSwap32(fMorphs.GetCount());
s->WriteLE32(fMorphs.GetCount());
int i;
for( i = 0; i < fMorphs.GetCount(); i++ )
fMorphs[i].Write(s, mgr);
s->WriteSwap32(fSharedMeshes.GetCount());
s->WriteLE32(fSharedMeshes.GetCount());
for( i = 0; i < fSharedMeshes.GetCount(); i++ )
mgr->WriteKey(s, fSharedMeshes[i].fMesh);
}

12
Sources/Plasma/PubUtilLib/plDrawable/plPrintShape.cpp
View File

@ -61,17 +61,17 @@ void plPrintShape::Read(hsStream* stream, hsResMgr* mgr)
{
plObjInterface::Read(stream, mgr);
fWidth = stream->ReadSwapScalar();
fLength = stream->ReadSwapScalar();
fHeight = stream->ReadSwapScalar();
fWidth = stream->ReadLEScalar();
fLength = stream->ReadLEScalar();
fHeight = stream->ReadLEScalar();
}
void plPrintShape::Write(hsStream* stream, hsResMgr* mgr)
{
plObjInterface::Write(stream, mgr);
stream->WriteSwapScalar(fWidth);
stream->WriteSwapScalar(fLength);
stream->WriteSwapScalar(fHeight);
stream->WriteLEScalar(fWidth);
stream->WriteLEScalar(fLength);
stream->WriteLEScalar(fHeight);
}

4
Sources/Plasma/PubUtilLib/plDrawable/plSharedMesh.cpp
View File

@ -108,7 +108,7 @@ void plSharedMesh::Read(hsStream* s, hsResMgr* mgr)
hsKeyedObject::Read(s, mgr);
int i;
fSpans.SetCount(s->ReadSwap32());
fSpans.SetCount(s->ReadLE32());
for (i = 0; i < fSpans.GetCount(); i++)
{
fSpans[i] = TRACKED_NEW plGeometrySpan;
@ -124,7 +124,7 @@ void plSharedMesh::Write(hsStream* s, hsResMgr* mgr)
hsKeyedObject::Write(s, mgr);
int i;
s->WriteSwap32(fSpans.GetCount());
s->WriteLE32(fSpans.GetCount());
for (i = 0; i < fSpans.GetCount(); i++)
fSpans[i]->Write(s);

30
Sources/Plasma/PubUtilLib/plDrawable/plSpaceTree.cpp
View File

@ -60,10 +60,10 @@ void plSpaceTreeNode::Read(hsStream* s)
{
fWorldBounds.Read(s);
fFlags = s->ReadSwap16();
fParent = s->ReadSwap16();
fChildren[0] = s->ReadSwap16();
fChildren[1] = s->ReadSwap16();
fFlags = s->ReadLE16();
fParent = s->ReadLE16();
fChildren[0] = s->ReadLE16();
fChildren[1] = s->ReadLE16();
}
@ -71,14 +71,14 @@ void plSpaceTreeNode::Write(hsStream* s)
{
fWorldBounds.Write(s);
s->WriteSwap16(fFlags);
s->WriteSwap16(fParent);
s->WriteSwap16(fChildren[0]);
s->WriteLE16(fFlags);
s->WriteLE16(fParent);
s->WriteLE16(fChildren[0]);
if( fFlags & kIsLeaf )
// Temp for now to play nice with binary patches
s->WriteSwap16( 0 );
s->WriteLE16( 0 );
else
s->WriteSwap16(fChildren[1]);
s->WriteLE16(fChildren[1]);
}
plSpaceTree::plSpaceTree()
@ -545,11 +545,11 @@ void plSpaceTree::Read(hsStream* s, hsResMgr* mgr)
{
plCreatable::Read(s, mgr);
fRoot = s->ReadSwap16();
fRoot = s->ReadLE16();
fNumLeaves = UInt16(s->ReadSwap32());
fNumLeaves = UInt16(s->ReadLE32());
UInt32 n = s->ReadSwap32();
UInt32 n = s->ReadLE32();
fTree.SetCount(n);
int i;
for( i = 0; i < n; i++ )
@ -560,11 +560,11 @@ void plSpaceTree::Write(hsStream* s, hsResMgr* mgr)
{
plCreatable::Write(s, mgr);
s->WriteSwap16(fRoot);
s->WriteLE16(fRoot);
s->WriteSwap32(fNumLeaves);
s->WriteLE32(fNumLeaves);
s->WriteSwap32(fTree.GetCount());
s->WriteLE32(fTree.GetCount());
int i;
for( i = 0; i < fTree.GetCount(); i++ )
{

4
Sources/Plasma/PubUtilLib/plDrawable/plSpanInstance.cpp
View File

@ -49,13 +49,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
void plSpanEncoding::Read(hsStream* s)
{
fCode = s->ReadByte();
fPosScale = s->ReadSwapScalar();
fPosScale = s->ReadLEScalar();
}
void plSpanEncoding::Write(hsStream* s) const
{
s->WriteByte((UInt8)fCode);
s->WriteSwapScalar(fPosScale);
s->WriteLEScalar(fPosScale);
}

12
Sources/Plasma/PubUtilLib/plDrawable/plSpanTemplate.cpp
View File

@ -108,9 +108,9 @@ void plSpanTemplate::DeAlloc()
void plSpanTemplate::Read(hsStream* stream)
{
fNumVerts = stream->ReadSwap16();
fFormat = stream->ReadSwap16();
fNumTris = stream->ReadSwap16();
fNumVerts = stream->ReadLE16();
fFormat = stream->ReadLE16();
fNumTris = stream->ReadLE16();
Alloc(fFormat, fNumVerts, fNumTris);
@ -120,9 +120,9 @@ void plSpanTemplate::Read(hsStream* stream)
void plSpanTemplate::Write(hsStream* stream) const
{
stream->WriteSwap16(fNumVerts);
stream->WriteSwap16(fFormat);
stream->WriteSwap16(fNumTris);
stream->WriteLE16(fNumVerts);
stream->WriteLE16(fFormat);
stream->WriteLE16(fNumTris);
stream->Write(VertSize(), fData);
stream->Write(IndexSize(), fIndices);

80
Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.cpp
View File

@ -68,28 +68,28 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
void plSpan::Read( hsStream *stream )
{
fSubType = (UInt16)(stream->ReadSwap32());
fSubType = (UInt16)(stream->ReadLE32());
fFogEnvironment = nil;
fMaterialIdx = stream->ReadSwap32();
fMaterialIdx = stream->ReadLE32();
fLocalToWorld.Read( stream );
fWorldToLocal.Read( stream );
fProps = stream->ReadSwap32();
fProps = stream->ReadLE32();
fLocalBounds.Read( stream );
fWorldBounds.Read( stream );
fNumMatrices = (UInt8)(stream->ReadSwap32());
fBaseMatrix = stream->ReadSwap32();
fNumMatrices = (UInt8)(stream->ReadLE32());
fBaseMatrix = stream->ReadLE32();
fLocalUVWChans = stream->ReadSwap16();
fMaxBoneIdx = stream->ReadSwap16();
fPenBoneIdx = stream->ReadSwap16();
fLocalUVWChans = stream->ReadLE16();
fMaxBoneIdx = stream->ReadLE16();
fPenBoneIdx = stream->ReadLE16();
fMinDist = stream->ReadSwapScalar();
fMaxDist = stream->ReadSwapScalar();
fMinDist = stream->ReadLEScalar();
fMaxDist = stream->ReadLEScalar();
if( fProps & kWaterHeight )
fWaterHeight = stream->ReadSwapScalar();
fWaterHeight = stream->ReadLEScalar();
#ifdef HS_DEBUGGING
fOwnerKey = nil;
@ -100,28 +100,28 @@ void plSpan::Read( hsStream *stream )
void plSpan::Write( hsStream *stream )
{
stream->WriteSwap32(fSubType);
stream->WriteLE32(fSubType);
stream->WriteSwap32( fMaterialIdx );
stream->WriteLE32( fMaterialIdx );
fLocalToWorld.Write( stream );
fWorldToLocal.Write( stream );
stream->WriteSwap32( fProps );
stream->WriteLE32( fProps );
fLocalBounds.Write( stream );
fWorldBounds.Write( stream );
stream->WriteSwap32( fNumMatrices );
stream->WriteSwap32( fBaseMatrix );
stream->WriteLE32( fNumMatrices );
stream->WriteLE32( fBaseMatrix );
stream->WriteSwap16( fLocalUVWChans );
stream->WriteSwap16( fMaxBoneIdx );
stream->WriteSwap16( fPenBoneIdx );
stream->WriteLE16( fLocalUVWChans );
stream->WriteLE16( fMaxBoneIdx );
stream->WriteLE16( fPenBoneIdx );
stream->WriteSwapScalar( fMinDist );
stream->WriteSwapScalar( fMaxDist );
stream->WriteLEScalar( fMinDist );
stream->WriteLEScalar( fMaxDist );
if( fProps & kWaterHeight )
stream->WriteSwapScalar(fWaterHeight);
stream->WriteLEScalar(fWaterHeight);
}
void plSpan::RemoveAuxSpan(plAuxSpan* aux)
@ -355,24 +355,24 @@ void plVertexSpan::Read( hsStream* stream )
{
plSpan:: Read( stream );
fGroupIdx = stream->ReadSwap32();
fVBufferIdx = stream->ReadSwap32();
fCellIdx = stream->ReadSwap32();
fCellOffset = stream->ReadSwap32();
fVStartIdx = stream->ReadSwap32();
fVLength = stream->ReadSwap32();
fGroupIdx = stream->ReadLE32();
fVBufferIdx = stream->ReadLE32();
fCellIdx = stream->ReadLE32();
fCellOffset = stream->ReadLE32();
fVStartIdx = stream->ReadLE32();
fVLength = stream->ReadLE32();
}
void plVertexSpan::Write( hsStream* stream )
{
plSpan::Write( stream );
stream->WriteSwap32( fGroupIdx );
stream->WriteSwap32( fVBufferIdx );
stream->WriteSwap32( fCellIdx );
stream->WriteSwap32( fCellOffset );
stream->WriteSwap32( fVStartIdx );
stream->WriteSwap32( fVLength );
stream->WriteLE32( fGroupIdx );
stream->WriteLE32( fVBufferIdx );
stream->WriteLE32( fCellIdx );
stream->WriteLE32( fCellOffset );
stream->WriteLE32( fVStartIdx );
stream->WriteLE32( fVLength );
}
hsBool plVertexSpan::CanMergeInto( plSpan *other )
@ -422,9 +422,9 @@ void plIcicle::Read( hsStream *stream )
{
plVertexSpan::Read( stream );
fIBufferIdx = stream->ReadSwap32();
fIPackedIdx = fIStartIdx = stream->ReadSwap32();
fILength = stream->ReadSwap32();
fIBufferIdx = stream->ReadLE32();
fIPackedIdx = fIStartIdx = stream->ReadLE32();
fILength = stream->ReadLE32();
if( fProps & kPropFacesSortable )
{
@ -446,9 +446,9 @@ void plIcicle::Write( hsStream *stream )
{
plVertexSpan::Write( stream );
stream->WriteSwap32( fIBufferIdx );
stream->WriteSwap32( fIStartIdx );
stream->WriteSwap32( fILength );
stream->WriteLE32( fIBufferIdx );
stream->WriteLE32( fIStartIdx );
stream->WriteLE32( fILength );
if( fProps & kPropFacesSortable )
{

12
Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp
View File

@ -366,18 +366,18 @@ void plWaveSet7::Read(hsStream* stream, hsResMgr* mgr)
{
plMultiModifier::Read(stream, mgr);
fMaxLen = stream->ReadSwapScalar();
fMaxLen = stream->ReadLEScalar();
fState.Read(stream);
IUpdateWindDir(0);
int n = stream->ReadSwap32();
int n = stream->ReadLE32();
int i;
for( i = 0; i < n; i++ )
{
mgr->ReadKeyNotifyMe(stream, TRACKED_NEW plGenRefMsg(GetKey(), plRefMsg::kOnCreate, -1, kRefShore), plRefFlags::kPassiveRef);
}
n = stream->ReadSwap32();
n = stream->ReadLE32();
for( i = 0; i < n; i++ )
{
mgr->ReadKeyNotifyMe(stream, TRACKED_NEW plGenRefMsg(GetKey(), plRefMsg::kOnCreate, -1, kRefDecal), plRefFlags::kPassiveRef);
@ -407,17 +407,17 @@ void plWaveSet7::Write(hsStream* stream, hsResMgr* mgr)
{
plMultiModifier::Write(stream, mgr);
stream->WriteSwapScalar(fMaxLen);
stream->WriteLEScalar(fMaxLen);
fState.Write(stream);
stream->WriteSwap32(fShores.GetCount());
stream->WriteLE32(fShores.GetCount());
int i;
for( i = 0; i < fShores.GetCount(); i++ )
{
mgr->WriteKey(stream, fShores[i]);
}
stream->WriteSwap32(fDecals.GetCount());
stream->WriteLE32(fDecals.GetCount());
for( i = 0; i < fDecals.GetCount(); i++ )
{
mgr->WriteKey(stream, fDecals[i]);