Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-24 01:23:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14560 from zfox23/MS4382_handshakeSparkles

Browse source 
Fix MS4382: Add a lifetime to handshake particle effects to prevent persistence
This commit is contained in:
Jeff Clinton 2018-12-11 11:51:54 -08:00 committed by GitHub
commit e88e15fd94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/system/makeUserConnection.js
View file

@ -51,6 +51,7 @@
"emitterShouldTrail": 1, "emitterShouldTrail": 1,
"isEmitting": 1, "isEmitting": 1,
"lifespan": 3, "lifespan": 3,
"lifetime": 5,
"maxParticles": 1000, "maxParticles": 1000,
"particleRadius": 0.003, "particleRadius": 0.003,
"polarStart": Math.PI / 2, "polarStart": Math.PI / 2,
@ -82,6 +83,7 @@
"emitterShouldTrail": 1, "emitterShouldTrail": 1,
"isEmitting": 1, "isEmitting": 1,
"lifespan": 3.6, "lifespan": 3.6,
"lifetime": 5,
"maxParticles": 4000, "maxParticles": 4000,
"particleRadius": 0.048, "particleRadius": 0.048,
"polarStart": 0, "polarStart": 0,
@ -287,6 +289,11 @@
} }
function updateMakingConnection() { function updateMakingConnection() {
if (!makingConnectionParticleEffect) {
particleEffectUpdateTimer = null;
return;
}
makingConnectionEmitRate = Math.max(makingConnectionEmitRate * MAKING_CONNECTION_DECAY_RATE, makingConnectionEmitRate = Math.max(makingConnectionEmitRate * MAKING_CONNECTION_DECAY_RATE,
MAKING_CONNECTION_MINIMUM_EMIT_RATE); MAKING_CONNECTION_MINIMUM_EMIT_RATE);
isMakingConnectionEmitting = true; isMakingConnectionEmitting = true;
@ -302,6 +309,11 @@
} }
function updateParticleEffect() { function updateParticleEffect() {
if (!particleEffect) {
particleEffectUpdateTimer = null;
return;
}
particleEmitRate = Math.max(PARTICLE_MINIMUM_EMIT_RATE, particleEmitRate * PARTICLE_DECAY_RATE); particleEmitRate = Math.max(PARTICLE_MINIMUM_EMIT_RATE, particleEmitRate * PARTICLE_DECAY_RATE);
Entities.editEntity(particleEffect, { Entities.editEntity(particleEffect, {
emitRate: particleEmitRate emitRate: particleEmitRate