TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 23:24:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

hybridize suggested approaches with older code style, passing along either a matrix or a null.

Browse source 
for network transmission purposes, send which along as a bool
This commit is contained in:
AzaezelX 2024-02-03 22:35:41 -06:00
parent b12cd00b74
commit 846cec8dff
3 changed files with 52 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/T3D/gameBase/gameConnection.cpp
View file

@ -1566,11 +1566,7 @@ void GameConnection::play2D(StringTableEntry assetId)
{ {
if (AssetDatabase.isDeclaredAsset(assetId)) if (AssetDatabase.isDeclaredAsset(assetId))
{ {
AssetPtr<SoundAsset> tempSoundAsset = assetId; postNetEvent(new SimSoundAssetEvent(assetId));
if (tempSoundAsset && tempSoundAsset->is3D())
{
postNetEvent(new SimSoundAssetEvent(assetId, SFX->getListener(0).getTransform()));
}
} }
} }
@ -1586,7 +1582,7 @@ void GameConnection::play3D(StringTableEntry assetId, const MatrixF *transform)
tempSoundAsset = assetId; tempSoundAsset = assetId;
if (!mControlObject) if (!mControlObject)
postNetEvent(new SimSoundAssetEvent(assetId, *transform)); postNetEvent(new SimSoundAssetEvent(assetId, transform));
else else
{ {
// TODO: Maybe improve this to account for the duration // TODO: Maybe improve this to account for the duration
@ -1600,7 +1596,7 @@ void GameConnection::play3D(StringTableEntry assetId, const MatrixF *transform)
transform->getColumn(3, &pos); transform->getColumn(3, &pos);
mControlObject->getTransform().getColumn(3, &ear); mControlObject->getTransform().getColumn(3, &ear);
if ((ear - pos).len() < tempSoundAsset->getSfxDescription()->mMaxDistance) if ((ear - pos).len() < tempSoundAsset->getSfxDescription()->mMaxDistance)
postNetEvent(new SimSoundAssetEvent(assetId, *transform)); postNetEvent(new SimSoundAssetEvent(assetId, transform));
} }
} }

108
Engine/source/T3D/gameBase/gameConnectionEvents.cpp
View file

@ -297,15 +297,15 @@ void SimDataBlockEvent::process(NetConnection *cptr)
static F32 SoundPosAccuracy = 0.5; static F32 SoundPosAccuracy = 0.5;
static S32 SoundRotBits = 8; static S32 SoundRotBits = 8;
SimSoundAssetEvent::SimSoundAssetEvent(StringTableEntry assetId, const MatrixF& mat) SimSoundAssetEvent::SimSoundAssetEvent(StringTableEntry assetId, const MatrixF* mat)
{ {
// cant get here unless the asset is declared. // cant get here unless the asset is declared.
mAsset = assetId; mAsset = assetId;
mIs3D = false; sentTransform = false;
if (mat) if (mat)
{ {
mTransform = mat; mTransform = *mat;
mIs3D = true; sentTransform = true;
} }
} }
@ -314,35 +314,29 @@ void SimSoundAssetEvent::pack(NetConnection* con, BitStream* stream)
NetStringHandle assetIdStr = mAsset->getAssetId(); NetStringHandle assetIdStr = mAsset->getAssetId();
con->packNetStringHandleU(stream, assetIdStr); con->packNetStringHandleU(stream, assetIdStr);
// only stream if this is a 3d sound asset. SFXDescription* ad = mAsset->getSfxDescription();
stream->writeFlag(mIs3D); if (stream->writeFlag(sentTransform))
if (mIs3D)
{ {
if (mAsset->is3D()) if (stream->writeFlag(ad->mConeInsideAngle || ad->mConeOutsideAngle))
{ {
SFXDescription* ad = mAsset->getSfxDescription(); QuatF q(mTransform);
if (stream->writeFlag(ad->mConeInsideAngle || ad->mConeOutsideAngle)) q.normalize();
{
QuatF q(mTransform);
q.normalize();
// LH - we can get a valid quat that's very slightly over 1 in and so // LH - we can get a valid quat that's very slightly over 1 in and so
// this fails (barely) check against zero. So use some error- // this fails (barely) check against zero. So use some error-
AssertFatal((1.0 - ((q.x * q.x) + (q.y * q.y) + (q.z * q.z))) >= (0.0 - 0.001), AssertFatal((1.0 - ((q.x * q.x) + (q.y * q.y) + (q.z * q.z))) >= (0.0 - 0.001),
"QuatF::normalize() is broken in Sim3DAudioEvent"); "QuatF::normalize() is broken in Sim3DAudioEvent");
stream->writeSignedFloat(q.x, SoundRotBits); stream->writeSignedFloat(q.x, SoundRotBits);
stream->writeSignedFloat(q.y, SoundRotBits); stream->writeSignedFloat(q.y, SoundRotBits);
stream->writeSignedFloat(q.z, SoundRotBits); stream->writeSignedFloat(q.z, SoundRotBits);
stream->writeFlag(q.w < 0.0); stream->writeFlag(q.w < 0.0);
}
Point3F pos;
mTransform.getColumn(3, &pos);
stream->writeCompressedPoint(pos, SoundPosAccuracy);
} }
}
Point3F pos;
mTransform.getColumn(3, &pos);
stream->writeCompressedPoint(pos, SoundPosAccuracy);
}
} }
void SimSoundAssetEvent::write(NetConnection* con, BitStream* stream) void SimSoundAssetEvent::write(NetConnection* con, BitStream* stream)
@ -363,48 +357,40 @@ void SimSoundAssetEvent::unpack(NetConnection* con, BitStream* stream)
mAsset = temp; mAsset = temp;
} }
if (stream->readFlag()) sentTransform = stream->readFlag();
{ if (sentTransform) {
mIs3D = true; if (stream->readFlag()) {
if (mAsset->is3D()) QuatF q;
{ q.x = stream->readSignedFloat(SoundRotBits);
if (stream->readFlag()) { q.y = stream->readSignedFloat(SoundRotBits);
QuatF q; q.z = stream->readSignedFloat(SoundRotBits);
q.x = stream->readSignedFloat(SoundRotBits); F32 value = ((q.x * q.x) + (q.y * q.y) + (q.z * q.z));
q.y = stream->readSignedFloat(SoundRotBits); // #ifdef __linux
q.z = stream->readSignedFloat(SoundRotBits); // Hmm, this should never happen, but it does...
F32 value = ((q.x * q.x) + (q.y * q.y) + (q.z * q.z)); if (value > 1.f)
// #ifdef __linux value = 1.f;
// Hmm, this should never happen, but it does... // #endif
if (value > 1.f) q.w = mSqrt(1.f - value);
value = 1.f; if (stream->readFlag())
// #endif q.w = -q.w;
q.w = mSqrt(1.f - value); q.setMatrix(&mTransform);
if (stream->readFlag())
q.w = -q.w;
q.setMatrix(&mTransform);
}
else
mTransform.identity();
Point3F pos;
stream->readCompressedPoint(&pos, SoundPosAccuracy);
mTransform.setColumn(3, pos);
} }
else
mTransform.identity();
Point3F pos;
stream->readCompressedPoint(&pos, SoundPosAccuracy);
mTransform.setColumn(3, pos);
}
else
{
mTransform = SFX->getListener(0).getTransform();
} }
} }
void SimSoundAssetEvent::process(NetConnection* con) void SimSoundAssetEvent::process(NetConnection* con)
{ {
SFX->playOnce(mAsset->getSFXTrack(), &mTransform);
if (mIs3D)
{
if (mAsset->is3D())
SFX->playOnce(mAsset->getSFXTrack(), &mTransform);
}
else
SFX->playOnce(mAsset->getSFXTrack());
} }
Sim2DAudioEvent::Sim2DAudioEvent(SFXProfile *profile) Sim2DAudioEvent::Sim2DAudioEvent(SFXProfile *profile)

4
Engine/source/T3D/gameBase/gameConnectionEvents.h
View file

@ -110,11 +110,11 @@ class SimSoundAssetEvent : public NetEvent
private: private:
AssetPtr<SoundAsset> mAsset; AssetPtr<SoundAsset> mAsset;
MatrixF mTransform; MatrixF mTransform;
bool mIs3D; bool sentTransform;
public: public:
typedef NetEvent Parent; typedef NetEvent Parent;
SimSoundAssetEvent(StringTableEntry assetId = StringTable->EmptyString(), const MatrixF& mat = MatrixF::Identity); SimSoundAssetEvent(StringTableEntry assetId = StringTable->EmptyString(), const MatrixF* mat = NULL);
void pack(NetConnection*, BitStream* bstream); void pack(NetConnection*, BitStream* bstream);
void write(NetConnection*, BitStream* bstream); void write(NetConnection*, BitStream* bstream);
void unpack(NetConnection*, BitStream* bstream); void unpack(NetConnection*, BitStream* bstream);