don't store particles
parent
60491aa240
commit
208b5797aa
|
@ -7,7 +7,6 @@
|
||||||
* @param scale
|
* @param scale
|
||||||
* @param enabled
|
* @param enabled
|
||||||
* @param templateParticle
|
* @param templateParticle
|
||||||
* @param particles
|
|
||||||
* @param particlesPerSecond
|
* @param particlesPerSecond
|
||||||
* @param frequency
|
* @param frequency
|
||||||
* @param elapsed
|
* @param elapsed
|
||||||
|
@ -22,7 +21,6 @@ GameLib.D3.API.ParticleEngine = function(
|
||||||
scale,
|
scale,
|
||||||
enabled,
|
enabled,
|
||||||
templateParticle,
|
templateParticle,
|
||||||
particles,
|
|
||||||
particlesPerSecond,
|
particlesPerSecond,
|
||||||
frequency,
|
frequency,
|
||||||
elapsed,
|
elapsed,
|
||||||
|
@ -64,11 +62,6 @@ GameLib.D3.API.ParticleEngine = function(
|
||||||
}
|
}
|
||||||
this.templateParticle = templateParticle;
|
this.templateParticle = templateParticle;
|
||||||
|
|
||||||
if (GameLib.Utils.UndefinedOrNull(particles)) {
|
|
||||||
particles = [];
|
|
||||||
}
|
|
||||||
this.particles = particles;
|
|
||||||
|
|
||||||
if (GameLib.Utils.UndefinedOrNull(particlesPerSecond)) {
|
if (GameLib.Utils.UndefinedOrNull(particlesPerSecond)) {
|
||||||
particlesPerSecond = 1;
|
particlesPerSecond = 1;
|
||||||
}
|
}
|
||||||
|
@ -101,19 +94,6 @@ GameLib.D3.API.ParticleEngine.prototype.constructor = GameLib.D3.API.ParticleEng
|
||||||
*/
|
*/
|
||||||
GameLib.D3.API.ParticleEngine.FromObject = function(objectParticleEngine) {
|
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;
|
var apiTemplateParticle = null;
|
||||||
if (objectParticleEngine.templateParticle) {
|
if (objectParticleEngine.templateParticle) {
|
||||||
if (objectParticleEngine.templateParticle instanceof Object) {
|
if (objectParticleEngine.templateParticle instanceof Object) {
|
||||||
|
@ -132,7 +112,6 @@ GameLib.D3.API.ParticleEngine.FromObject = function(objectParticleEngine) {
|
||||||
GameLib.API.Vector3.FromObject(objectParticleEngine.scale),
|
GameLib.API.Vector3.FromObject(objectParticleEngine.scale),
|
||||||
objectParticleEngine.enabled,
|
objectParticleEngine.enabled,
|
||||||
apiTemplateParticle,
|
apiTemplateParticle,
|
||||||
apiParticles,
|
|
||||||
objectParticleEngine.particlesPerSecond,
|
objectParticleEngine.particlesPerSecond,
|
||||||
objectParticleEngine.frequency,
|
objectParticleEngine.frequency,
|
||||||
objectParticleEngine.elapsed,
|
objectParticleEngine.elapsed,
|
||||||
|
|
|
@ -29,7 +29,6 @@ GameLib.D3.ParticleEngine = function(
|
||||||
apiParticleEngine.scale,
|
apiParticleEngine.scale,
|
||||||
apiParticleEngine.enabled,
|
apiParticleEngine.enabled,
|
||||||
apiParticleEngine.templateParticle,
|
apiParticleEngine.templateParticle,
|
||||||
apiParticleEngine.particles,
|
|
||||||
apiParticleEngine.particlesPerSecond,
|
apiParticleEngine.particlesPerSecond,
|
||||||
apiParticleEngine.frequency,
|
apiParticleEngine.frequency,
|
||||||
apiParticleEngine.elapsed,
|
apiParticleEngine.elapsed,
|
||||||
|
@ -76,23 +75,13 @@ GameLib.D3.ParticleEngine = function(
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
this.particles = this.particles.map(
|
this.particles = [];
|
||||||
function(particle) {
|
|
||||||
if (particle instanceof GameLib.D3.API.Particle) {
|
|
||||||
return new GameLib.D3.Particle(
|
|
||||||
graphics,
|
|
||||||
particle
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
GameLib.Component.call(
|
GameLib.Component.call(
|
||||||
this,
|
this,
|
||||||
GameLib.Component.COMPONENT_PARTICLE_ENGINE,
|
GameLib.Component.COMPONENT_PARTICLE_ENGINE,
|
||||||
{
|
{
|
||||||
templateParticle : GameLib.D3.Particle,
|
templateParticle : GameLib.D3.Particle
|
||||||
particles : [GameLib.D3.Particle]
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -170,11 +159,6 @@ GameLib.D3.ParticleEngine.prototype.toApiObject = function() {
|
||||||
this.scale.toApiObject(),
|
this.scale.toApiObject(),
|
||||||
this.enabled,
|
this.enabled,
|
||||||
GameLib.Utils.IdOrNull(this.templateParticle),
|
GameLib.Utils.IdOrNull(this.templateParticle),
|
||||||
this.particles.map(
|
|
||||||
function(particle) {
|
|
||||||
return GameLib.Utils.IdOrNull(particle);
|
|
||||||
}
|
|
||||||
),
|
|
||||||
this.particlesPerSecond,
|
this.particlesPerSecond,
|
||||||
this.frequency,
|
this.frequency,
|
||||||
this.elapsed,
|
this.elapsed,
|
||||||
|
|
Loading…
Reference in New Issue