From 208b5797aa56c4e6c590c6105f9f6a76f5ef9978 Mon Sep 17 00:00:00 2001 From: -=yb4f310 Date: Mon, 6 Nov 2017 14:48:00 +0100 Subject: [PATCH] don't store particles --- src/game-lib-d3-api-particle-engine.js | 21 --------------------- src/game-lib-d3-particle-engine.js | 20 ++------------------ 2 files changed, 2 insertions(+), 39 deletions(-) diff --git a/src/game-lib-d3-api-particle-engine.js b/src/game-lib-d3-api-particle-engine.js index 4e4df42..fe51539 100644 --- a/src/game-lib-d3-api-particle-engine.js +++ b/src/game-lib-d3-api-particle-engine.js @@ -7,7 +7,6 @@ * @param scale * @param enabled * @param templateParticle - * @param particles * @param particlesPerSecond * @param frequency * @param elapsed @@ -22,7 +21,6 @@ GameLib.D3.API.ParticleEngine = function( scale, enabled, templateParticle, - particles, particlesPerSecond, frequency, elapsed, @@ -64,11 +62,6 @@ GameLib.D3.API.ParticleEngine = function( } this.templateParticle = templateParticle; - if (GameLib.Utils.UndefinedOrNull(particles)) { - particles = []; - } - this.particles = particles; - if (GameLib.Utils.UndefinedOrNull(particlesPerSecond)) { particlesPerSecond = 1; } @@ -101,19 +94,6 @@ GameLib.D3.API.ParticleEngine.prototype.constructor = GameLib.D3.API.ParticleEng */ GameLib.D3.API.ParticleEngine.FromObject = function(objectParticleEngine) { - var apiParticles = []; - if (objectParticleEngine.particles) { - apiParticles = objectParticleEngine.particles.map( - function (objectParticle) { - if (objectParticle instanceof Object) { - return GameLib.D3.API.Particle.FromObject(objectParticle); - } else { - return objectParticle - } - } - ) - } - var apiTemplateParticle = null; if (objectParticleEngine.templateParticle) { if (objectParticleEngine.templateParticle instanceof Object) { @@ -132,7 +112,6 @@ GameLib.D3.API.ParticleEngine.FromObject = function(objectParticleEngine) { GameLib.API.Vector3.FromObject(objectParticleEngine.scale), objectParticleEngine.enabled, apiTemplateParticle, - apiParticles, objectParticleEngine.particlesPerSecond, objectParticleEngine.frequency, objectParticleEngine.elapsed, diff --git a/src/game-lib-d3-particle-engine.js b/src/game-lib-d3-particle-engine.js index 1f33e22..e56a8ea 100644 --- a/src/game-lib-d3-particle-engine.js +++ b/src/game-lib-d3-particle-engine.js @@ -29,7 +29,6 @@ GameLib.D3.ParticleEngine = function( apiParticleEngine.scale, apiParticleEngine.enabled, apiParticleEngine.templateParticle, - apiParticleEngine.particles, apiParticleEngine.particlesPerSecond, apiParticleEngine.frequency, apiParticleEngine.elapsed, @@ -76,23 +75,13 @@ GameLib.D3.ParticleEngine = function( ) } - this.particles = this.particles.map( - function(particle) { - if (particle instanceof GameLib.D3.API.Particle) { - return new GameLib.D3.Particle( - graphics, - particle - ) - } - } - ); + this.particles = []; GameLib.Component.call( this, GameLib.Component.COMPONENT_PARTICLE_ENGINE, { - templateParticle : GameLib.D3.Particle, - particles : [GameLib.D3.Particle] + templateParticle : GameLib.D3.Particle } ); @@ -170,11 +159,6 @@ GameLib.D3.ParticleEngine.prototype.toApiObject = function() { this.scale.toApiObject(), this.enabled, GameLib.Utils.IdOrNull(this.templateParticle), - this.particles.map( - function(particle) { - return GameLib.Utils.IdOrNull(particle); - } - ), this.particlesPerSecond, this.frequency, this.elapsed,