From 5bc7bf611d4375eacf3229ae3d20a33df1cf4312 Mon Sep 17 00:00:00 2001 From: -=yb4f310 Date: Mon, 13 Nov 2017 17:54:58 +0100 Subject: [PATCH] scale linear --- src/game-lib-system-gui.js | 4 ++++ src/game-lib-system-particle.js | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/game-lib-system-gui.js b/src/game-lib-system-gui.js index f45807a..32fa79d 100644 --- a/src/game-lib-system-gui.js +++ b/src/game-lib-system-gui.js @@ -1225,6 +1225,10 @@ GameLib.System.GUI.prototype.buildControl = function(folder, componentTemplate, property === 'sensitivity' ) { controllers.push(folder.add(object, property, 1, 50, 1)); + } else if ( + property === 'density' + ) { + controllers.push(folder.add(object, property, 0, 1, 0.000001)); } else if ( property === 'thetaLength' || property === 'angle' diff --git a/src/game-lib-system-particle.js b/src/game-lib-system-particle.js index 0c99df2..8c2e0a1 100644 --- a/src/game-lib-system-particle.js +++ b/src/game-lib-system-particle.js @@ -125,10 +125,12 @@ GameLib.System.Particle.prototype.beforeRender = function(data) { particle.position.x += particle.userData.direction.x * data.delta * particle.userData.speed; particle.position.y += particle.userData.direction.y * data.delta * particle.userData.speed; particle.position.z += particle.userData.direction.z * data.delta * particle.userData.speed; - - particle.scale.x += particle.userData.scale.x * data.delta; - particle.scale.y += particle.userData.scale.x * data.delta; - particle.scale.z += particle.userData.scale.x * data.delta; + + if (particle.scaleType === GameLib.D3.Particle.SCALE_TYPE_LINEAR) { + particle.scale.x += particle.userData.scale.x * data.delta; + particle.scale.y += particle.userData.scale.x * data.delta; + particle.scale.z += particle.userData.scale.x * data.delta; + } particle.quaternion.copy(particleEngine.camera.instance.quaternion);