TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-24 22:05:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "sound asset refactor init"

Browse source 
This reverts commit 2bf2da74a0.
This commit is contained in:
marauder2k7 2025-03-24 19:58:52 +00:00
parent 2bf2da74a0
commit e16a66f363
4 changed files with 11 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Engine/source/afx/afxMagicMissile.cpp
View file

@ -142,6 +142,7 @@ U32 Projectile::smProjectileWarpTicks = 5;
afxMagicMissileData::afxMagicMissileData()
{
INIT_ASSET(ProjectileShape);
INIT_ASSET(ProjectileSound);
/* From stock Projectile code...
explosion = NULL;
@ -246,7 +247,7 @@ afxMagicMissileData::afxMagicMissileData(const afxMagicMissileData& other, bool
{
CLONE_ASSET(ProjectileShape);
projectileShape = other.projectileShape; // -- TSShape loads using projectileShapeName
CLONE_ASSET_REFACTOR(ProjectileSound);
CLONE_ASSET(ProjectileSound);
splash = other.splash;
splashId = other.splashId; // -- for pack/unpack of splash ptr
lightDesc = other.lightDesc;
@ -344,7 +345,7 @@ void afxMagicMissileData::initPersistFields()
endGroup("Particle Effects");
addGroup("Sounds");
INITPERSISTFIELD_SSOUNDASSET_REFACTOR(ProjectileSound, afxMagicMissileData, "sound for the projectile")
INITPERSISTFIELD_SOUNDASSET(ProjectileSound, afxMagicMissileData, "sound for the projectile");
endGroup("Sounds");
addGroup("Light Emitter");
@ -516,7 +517,7 @@ bool afxMagicMissileData::preload(bool server, String &errorStr)
Con::errorf(ConsoleLogEntry::General, "ProjectileData::preload: Invalid packet, bad datablockId(decal): %d", decalId);
*/
if (mProjectileShapeAsset.isNull())
if (!isProjectileSoundValid())
{
//return false; -TODO: trigger asset download
}
@ -626,7 +627,7 @@ void afxMagicMissileData::packData(BitStream* stream)
DataBlockObjectIdLast);
*/
PACKDATA_ASSET_REFACTOR(ProjectileSound)
PACKDATA_ASSET(ProjectileSound);
if ( stream->writeFlag(lightDesc != NULL))
stream->writeRangedU32(lightDesc->getId(), DataBlockObjectIdFirst,
@ -732,7 +733,7 @@ void afxMagicMissileData::unpackData(BitStream* stream)
decalId = stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast);
*/
UNPACKDATA_ASSET_REFACTOR(ProjectileSound)
UNPACKDATA_ASSET(ProjectileSound);
if (stream->readFlag())
lightDescId = stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast);
@ -1156,8 +1157,8 @@ bool afxMagicMissile::onNewDataBlock(GameBaseData* dptr, bool reload)
SFX_DELETE( mSound );
if (mDataBlock->getProjectileSoundAsset().notNull())
mSound = SFX->createSource(mDataBlock->getProjectileSoundAsset()->getSFXTrack());
if (mDataBlock->getProjectileSound())
mSound = SFX->createSource(mDataBlock->getProjectileSoundProfile());
}
return true;
@ -1992,7 +1993,7 @@ void afxMagicMissile::get_launch_data(Point3F& pos, Point3F& vel)
void afxMagicMissile::updateSound()
{
if (mDataBlock->getProjectileSoundAsset().isNull())
if (!mDataBlock->isProjectileSoundValid())
return;
if ( mSound )