TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #833 from Azaezel/alpha40/particlePainPunt

Browse source 
particle emission safeties
This commit is contained in:
Brian Roberts 2022-07-29 17:22:35 -05:00 • committed by GitHub
commit 14d1b16892
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Engine/source/T3D/fx/particleEmitter.cpp
View file

@ -787,6 +787,7 @@ void ParticleEmitterData::allocPrimBuffer( S32 overrideSize )
{ {
// calculate particle list size // calculate particle list size
AssertFatal(particleDataBlocks.size() > 0, "Error, no particles found." ); AssertFatal(particleDataBlocks.size() > 0, "Error, no particles found." );
if (particleDataBlocks.empty()) return;
U32 maxPartLife = particleDataBlocks[0]->lifetimeMS + particleDataBlocks[0]->lifetimeVarianceMS; U32 maxPartLife = particleDataBlocks[0]->lifetimeMS + particleDataBlocks[0]->lifetimeVarianceMS;
for (S32 i = 1; i < particleDataBlocks.size(); i++) for (S32 i = 1; i < particleDataBlocks.size(); i++)
{ {

3
Engine/source/T3D/player.cpp
View file

@ -3954,7 +3954,8 @@ void Player::updateActionThread()
// Emit footpuffs. // Emit footpuffs.
if (!footfallDustOverride && rInfo.t <= 0.5f && mWaterCoverage == 0.0f if (!footfallDustOverride && rInfo.t <= 0.5f && mWaterCoverage == 0.0f
&& material && material->mShowDust ) && material && material->mShowDust
&& mDataBlock->footPuffEmitter != nullptr)
{ {
// New emitter every time for visibility reasons // New emitter every time for visibility reasons
ParticleEmitter * emitter = new ParticleEmitter; ParticleEmitter * emitter = new ParticleEmitter;