TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-14 04:03:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

code duplication prune. should aid in stability

Browse source
This commit is contained in:
AzaezelX 2021-10-03 02:56:26 -05:00
parent 10f2453cee
commit 98a079a797
123 changed files with 632 additions and 966 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Engine/source/T3D/rigidShape.cpp
View file

@ -238,7 +238,7 @@ RigidShapeData::RigidShapeData()
density = 4;
for (S32 i = 0; i < Body::MaxSounds; i++)
INIT_SOUNDASSET_ARRAY(BodySounds, i);
INIT_ASSET_ARRAY(BodySounds, i);
dustEmitter = NULL;
dustID = 0;
@ -257,7 +257,7 @@ RigidShapeData::RigidShapeData()
enablePhysicsRep = true;
for (S32 i = 0; i < Sounds::MaxSounds; i++)
INIT_SOUNDASSET_ARRAY(WaterSounds, i);
INIT_ASSET_ARRAY(WaterSounds, i);
dragForce = 0;
vertFactor = 0.25;
@ -371,7 +371,7 @@ void RigidShapeData::packData(BitStream* stream)
stream->write(body.friction);
for (U32 i = 0; i < Body::MaxSounds; ++i)
{
PACKDATA_SOUNDASSET_ARRAY(BodySounds, i);
PACKDATA_ASSET_ARRAY(BodySounds, i);
}
stream->write(minImpactSpeed);
@ -403,7 +403,7 @@ void RigidShapeData::packData(BitStream* stream)
// write the water sound profiles
for (U32 i = 0; i < Sounds::MaxSounds; ++i)
{
PACKDATA_SOUNDASSET_ARRAY(WaterSounds, i);
PACKDATA_ASSET_ARRAY(WaterSounds, i);
}
if (stream->writeFlag( dustEmitter ))
@ -434,7 +434,7 @@ void RigidShapeData::unpackData(BitStream* stream)
for (U32 i = 0; i < Body::Sounds::MaxSounds; i++)
{
UNPACKDATA_SOUNDASSET_ARRAY(BodySounds, i);
UNPACKDATA_ASSET_ARRAY(BodySounds, i);
}
stream->read(&minImpactSpeed);
@ -466,7 +466,7 @@ void RigidShapeData::unpackData(BitStream* stream)
// write the water sound profiles
for (U32 i = 0; i < Sounds::MaxSounds; ++i)
{
UNPACKDATA_SOUNDASSET_ARRAY(WaterSounds, i);
UNPACKDATA_ASSET_ARRAY(WaterSounds, i);
}
if( stream->readFlag() )