FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Go back to a function that actually does check wheter endian swapping needs to be done

Browse Source
This commit is contained in:
ehofman
2003-08-07 14:11:35 +00:00
parent 0dd50cf3d8
commit 1fe26901af
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
simgear/scene/sky/clouds3d/SkyArchive.cpp
View File

@@ -1165,7 +1165,7 @@ SKYRESULT SkyArchive::_Load( FILE* pSrcFile)
if (!iNumItemsRead)
FAIL_RETURN_MSG(SKYRESULT_FAIL, "Error: SkyArchive::_Load(): failed to read Archive header.");
_ulEndianSwap(&thisItem.iDataSize);
thisItem.iDataSize = ulEndianLittle32(thisItem.iDataSize);
_pName = new char[::strlen(thisItem.pName)+1];
::strcpy( _pName, thisItem.pName);
@@ -1178,7 +1178,7 @@ SKYRESULT SkyArchive::_Load( FILE* pSrcFile)
if (1 > iNumItemsRead)
FAIL_RETURN_MSG(SKYRESULT_FAIL, "Error: SkyArchive::_Load(): failed to read embedded archive item.");
_ulEndianSwap(&embeddedItem.iDataSize);
embeddedItem.iDataSize = ulEndianLittle32(embeddedItem.iDataSize);
switch( embeddedItem.type)

25
simgear/scene/sky/clouds3d/SkyCloud.cpp
View File

@@ -735,13 +735,13 @@ SKYRESULT SkyCloud::Load(const SkyArchive &archive,
//_boundingBox.SetMax(vecCenter + Vec3f(rRadius, rRadius, rRadius));
archive.FindUInt32("CldNumParticles", &iNumParticles);
_ulEndianSwap(&iNumParticles);
iNumParticles = ulEndianLittle32(iNumParticles);
//if (!bLocal)
archive.FindVec3f("CldCenter", &vecCenter);
_ulEndianSwap((unsigned int*)&vecCenter.x);
_ulEndianSwap((unsigned int*)&vecCenter.y);
_ulEndianSwap((unsigned int*)&vecCenter.z);
vecCenter.x = ulEndianLittleFloat(vecCenter.x);
vecCenter.y = ulEndianLittleFloat(vecCenter.y);
vecCenter.z = ulEndianLittleFloat(vecCenter.z);
Vec3f *pParticlePositions = new Vec3f[iNumParticles];
float *pParticleRadii = new float[iNumParticles];
@@ -755,17 +755,16 @@ SKYRESULT SkyCloud::Load(const SkyArchive &archive,
for (unsigned int i = 0; i < iNumParticles; ++i)
{
_ulEndianSwap((unsigned int*)&pParticlePositions[i].x);
_ulEndianSwap((unsigned int*)&pParticlePositions[i].y);
_ulEndianSwap((unsigned int*)&pParticlePositions[i].z);
pParticlePositions[i].x = ulEndianLittleFloat(pParticlePositions[i].x);
pParticlePositions[i].y = ulEndianLittleFloat(pParticlePositions[i].y);
pParticlePositions[i].z = ulEndianLittleFloat(pParticlePositions[i].z);
_ulEndianSwap((unsigned int*)&pParticleRadii[i]);
_ulEndianSwap((unsigned int*)&pParticleColors[i].x);
_ulEndianSwap((unsigned int*)&pParticleColors[i].y);
_ulEndianSwap((unsigned int*)&pParticleColors[i].z);
_ulEndianSwap((unsigned int*)&pParticleColors[i].w);
pParticleRadii[i] = ulEndianLittleFloat(pParticleRadii[i]);
pParticleColors[i].x = ulEndianLittleFloat(pParticleColors[i].x);
pParticleColors[i].y = ulEndianLittleFloat(pParticleColors[i].y);
pParticleColors[i].z = ulEndianLittleFloat(pParticleColors[i].z);
pParticleColors[i].w = ulEndianLittleFloat(pParticleColors[i].w);
SkyCloudParticle *pParticle = new SkyCloudParticle((pParticlePositions[i] + vecCenter) * rScale,
pParticleRadii[i] * rScale,

2
simgear/scene/sky/clouds3d/SkySceneLoader.cpp
View File

@@ -174,7 +174,7 @@ bool SkySceneLoader::Load( SGPath filename, double latitude, double longitude )
unsigned int iNumFiles;
if (!SKYFAILED(archive.GetInfo("CloudFile", STRING_TYPE, &iNumFiles)))
{
_ulEndianSwap(&iNumFiles);
iNumFiles = ulEndianLittle32(iNumFiles);
for (unsigned int i = 0; i < iNumFiles; ++i)
{
FAIL_RETURN(archive.FindString("CloudFile", &pFilename, i));

2
simgear/scene/sky/clouds3d/SkySceneManager.cpp
View File

@@ -536,7 +536,7 @@ SKYRESULT SkySceneManager::LoadClouds(SkyArchive& cloudArchive, float rScale, do
{
unsigned int iNumClouds = 0;
cloudArchive.FindUInt32("CldNumClouds", &iNumClouds);
_ulEndianSwap(&iNumClouds);
iNumClouds = ulEndianLittle32(iNumClouds);
SkyArchive subArchive;
//iNumClouds = 5; //set this value to reduce cloud field for debugging