Skip to content

Commit

Permalink
Cleanup drawing code yet again.
Browse files Browse the repository at this point in the history
  • Loading branch information
@BonsaiDen
BonsaiDen committed Oct 23, 2010
1 parent e77c000 commit 9169d91
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 99 deletions.
129 changes: 55 additions & 74 deletions client/actors.js
View file
Expand Up @@ -77,13 +77,13 @@ ActorPlayer.onUpdate = function(data) {

if (this.shield && !data[5]) {
this.$.playSound('powerOff');
this.$.fxRing(this.x, this.y, 20, {'n': 30, 'd': 0.5, 's': 2.75,
'c': this.col, 'a': this.alpha});
this.$.fxRing({o: this, r: 20, n: 30, d: 0.5, s: 2.75,
c: this.col, a: this.alpha});

} else if (!this.shield && data[5]) {
this.$.playSound('powerOn');
this.$.fxRing(this.x, this.y, 35, {'n': 30, 'd': 0.2, 's': -2.75,
'c': this.col, 'a': this.alpha});
this.$.fxRing({o: this, r: 35, n: 30, d: 0.2, s: -2.75,
c: this.col, a: this.alpha});
}
this.shield = data[5];

Expand All @@ -101,8 +101,9 @@ ActorPlayer.onUpdate = function(data) {
var size = 26 + Math.cos(this.mmr * 2);
var ox = this.x + Math.sin(r) * size;
var oy = this.y + Math.cos(r) * size;
this.$.fxExplosion(ox, oy, 6, {'d': 0.25, 's': 1, 'c': this.col});
this.$.fxArea(ox, oy, {'s': 3.5, 'd': 0.25, 'c': this.col});
this.$.fxArea({x: ox, y: oy, s: 3.5, d: 0.25, c: this.col});
this.$.fxExp({x: ox, y: oy, n: 6, d: 0.25,
s: 1, c: this.col});
}
}
this.missiles = data[7];
Expand All @@ -128,12 +129,12 @@ ActorPlayer.onInterleave = function(delta) {

ActorPlayer.onDestroy = function(complete) {
if (complete) {
this.$.fxExplosion(this.x, this.y, 20, {'d': 0.9, 's': 1.4, 'c': this.col});
this.$.fxArea(this.x, this.y, {'s': 20, 'd': 0.5, 'c': this.col});
this.$.fxExp({o: this, n: 20, d: 0.9, s: 1.4, c: this.col});
this.$.fxArea({o: this, s: 20, d: 0.5, c: this.col});

if (this.shield) {
this.$.fxRing(this.x, this.y, 20, {'n': 42, 'd': 0.6, 's': 3.25,
'c': this.col, 'a': this.alpha});
this.$.fxRing({o: this, r: 20, n: 42, d: 0.6, s: 3.25,
c: this.col, a: this.alpha});
}

if (this.armor) {
Expand All @@ -147,8 +148,8 @@ ActorPlayer.onDestroy = function(complete) {
var ox = this.x + Math.sin(r) * size;
var oy = this.y + Math.cos(r) * size;

this.$.fxExplosion(ox, oy, 6, {'d': 0.45, 's': 1, 'c': this.col});
this.$.fxArea(ox, oy, {'s': 8.5, 'd': 0.45, 'c': this.col});
this.$.fxExp({x: ox, y: oy, n: 6, d: 0.45, s: 1, c: this.col});
this.$.fxArea({x: ox, y: oy, s: 8.5, d: 0.45, c: this.col});
}
this.$.playSound('explosionShip');
}
Expand All @@ -174,28 +175,24 @@ ActorPlayer.onDraw = function() {
var oy = this.y + Math.cos(r) * 12;
var rr = [-0.9, -0.5, -0.25, 0.25, 0.5, 0.9];
for(var i = 0; i < (this.boost ? 2 : 1); i++) {
this.$.fxParticle(ox, oy,
this.$.wrapAngle(r - rr[Math.floor(Math.random() * 6)]),
{'s': 1.6, 'd': 0.2 + (this.boost ? 0.1 : 0),
'c': this.col, 'a': this.alpha});
var ir = this.$.wrapAngle(r - rr[Math.floor(Math.random() * 6)]);
this.$.fxPar({x: ox, y: oy, r: ir, s: 1.6,
d: 0.2 + (this.boost ? 0.1 : 0),
c: this.col, a: this.alpha});
}
}

// Rotate
if (this.mr !== 0) {
var d = this.mr > 0 ? 1 : -1;
var r = this.$.wrapAngle(this.r - Math.PI);
var ox = this.x + Math.sin(this.$.wrapAngle(r - Math.PI * 2.22 * d))
* 14;

var oy = this.y + Math.cos(this.$.wrapAngle(r - Math.PI * 2.22 * d))
* 14;

var or = this.$.wrapAngle(r - Math.PI * 2.22 * d);
var ox = this.x + Math.sin(or) * 14;
var oy = this.y + Math.cos(or) * 14;
r = r - Math.PI * 2.47 * d - 0.4 + Math.random() * 0.80;
r = this.$.wrapAngle(r);

this.$.fxParticle(ox, oy, r, {'s': 2, 'd': 0.10,
'c': this.col, 'a': this.alpha});
this.$.fxPar({x: ox, y: oy, r: r, s: 2, d: 0.10,
c: this.col, a: this.alpha});
}

// Shield ring
Expand Down Expand Up @@ -296,9 +293,8 @@ ActorPlayer.emitParticles = function(speed, dur, step) {
var y = this.y + Math.cos(Math.PI + this.r - rr) * dd;
x += Math.sin(Math.PI + this.r -r) * (e * step);
y += Math.cos(Math.PI + this.r -r) * (e * step);
this.$.fxParticle(x, y, Math.atan2(x - this.x, y - this.y),
{'s': speed, 'd': dur, 'c': this.col,
'a': this.alpha});
this.$.fxPar({x: x, y: y, r: Math.atan2(x - this.x, y - this.y),
s: speed, d: dur, c: this.col, a: this.alpha});
}
}
};
Expand All @@ -316,8 +312,8 @@ ActorBullet.onCreate = function(data, complete) {

ActorBullet.onDestroy = function(complete) {
if (complete) {
this.$.fxExplosion(this.x, this.y, 4, {'d': 0.35, 's': 1, 'c': this.col});
this.$.fxArea(this.x, this.y, {'s': 3.5, 'd': 0.35, 'c': this.col});
this.$.fxExp({o: this, n: 4, d: 0.35, s: 1, c: this.col});
this.$.fxArea({o: this, s: 3.5, d: 0.35, c: this.col});
this.$.playSound('explosionSmall');
}
};
Expand All @@ -341,8 +337,8 @@ ActorMissile.onCreate = function(data, complete) {
this.col = this.$.playerColor(this.id);;

if (complete) {
this.$.fxExplosion(this.x, this.y, 4, {'d': 0.35, 's': 1, 'c': this.col});
this.$.fxArea(this.x, this.y, {'s': 3.5, 'd': 0.35, 'c': this.col});
this.$.fxExp({o: this, n: 4, d: 0.35, s: 1, c: this.col});
this.$.fxArea({o: this, s: 3.5, d: 0.35, c: this.col});
this.$.playSound('launchMedium');
}
};
Expand All @@ -353,8 +349,8 @@ ActorMissile.onUpdate = function(data) {

ActorMissile.onDestroy = function(complete) {
if (complete) {
this.$.fxExplosion(this.x, this.y, 6,{'d': 0.45, 's': 1, 'c': this.col});
this.$.fxArea(this.x, this.y, {'s': 8.5, 'd': 0.45, 'c': this.col});
this.$.fxExp({o: this, n: 6, d: 0.45, s: 1, c: this.col});
this.$.fxArea({o: this, s: 8.5, d: 0.45, c: this.col});
this.$.playSound('explosionMedium');
}
};
Expand All @@ -372,10 +368,9 @@ ActorMissile.onDraw = function() {
this.$.unlocal();

var r = this.$.wrapAngle(this.r - Math.PI);
var rr = [-0.75, -0.0, 0.75];
this.$.fxParticle(this.x + Math.sin(r) * 4, this.y + Math.cos(r) * 4,
this.$.wrapAngle(r - rr[Math.floor(Math.random() * 3)]),
{'s': 0.15, 'd': 0.25, 'c': this.col, 'a': 0.5});
var rr = this.$.wrapAngle(r - [-0.75, -0.0, 0.75][Math.floor(Math.random() * 3)])
this.$.fxPar({x: this.x + Math.sin(r) * 4, y: this.y + Math.cos(r) * 4,
r: rr, s: 0.15, d: 0.25, c: this.col, a: 0.5});
};


Expand All @@ -398,17 +393,13 @@ ActorBomb.onCreate = function(data, complete) {
ActorBomb.onDestroy = function(complete) {
if (complete) {
this.$.playSound('explosionBig');
this.$.fxArea(this.x, this.y,
{'s': this.radius, 'd': 1, 'c': this.col});

this.$.fxRing(this.x, this.y, this.radius / 2 * 0.975,
{'n': 75, 'd': 1, 's': 1.25, 'c': this.col, 'a': 1});

this.$.fxArea(this.x, this.y,
{'s': this.radius / 2, 'd': 1.5, 'c': this.col});
this.$.fxArea({o: this, s: this.radius, d: 1, c: this.col});
this.$.fxArea({o: this, s: this.radius / 2, d: 1.5, c: this.col});
this.$.fxRing({o: this, r: this.radius / 2 * 0.975, n: 75, d: 1,
s: 1.25, c: this.col, a: 1});

this.$.fxRing(this.x, this.y, this.radius * 0.975,
{'n': 125, 'd': 1, 's': 1.25, 'c': this.col, 'a': 1});
this.$.fxRing({o: this, r: this.radius * 0.975, n: 125, d: 1,
s: 1.25, c: this.col, a: 1});
}
};

Expand All @@ -425,13 +416,11 @@ ActorBomb.onDraw = function() {
var oy = this.y - Math.cos(r) * 2;

var rr = [-0.7, -0.35, -0.15, 0.15, 0.35, 0.7];
this.$.fxParticle(ox, oy,
this.$.wrapAngle(r - rr[Math.floor(Math.random() * 6)] * 1.15),
{'s': 1.25, 'd': 0.3, 'c': this.col, 'a': 1});

this.$.fxParticle(ox, oy,
this.$.wrapAngle(r - rr[Math.floor(Math.random() * 6)] * 1.5),
{'s': 1.125, 'd': 0.4, 'c': this.col, 'a': 1});

var ir = this.$.wrapAngle(r - rr[Math.floor(Math.random() * 6)] * 1.15);
this.$.fxPar({x: ox, y: oy, r: ir, s: 1.25, d: 0.3, c: this.col, a: 1});
ir = this.$.wrapAngle(r - rr[Math.floor(Math.random() * 6)] * 1.5);
this.$.fxPar({x: ox, y: oy, r: ir, s: 1.125, d: 0.4, c: this.col, a: 1});
};

// PowerUP ---------------------------------------------------------------------
Expand All @@ -442,7 +431,7 @@ ActorPowerUp.onCreate = function(data, complete) {

if (complete) {
this.createTime = this.$.getTime();
this.$.fxExplosion(this.x, this.y, 8, {'d': 1, 's': 0.5, 'c': this.col});
this.$.fxExp({o: this, n: 8, d: 1, s: 0.5, c: this.col});
this.$.playSound('powerSound');

} else {
Expand All @@ -452,8 +441,8 @@ ActorPowerUp.onCreate = function(data, complete) {

ActorPowerUp.onDestroy = function(complete) {
if (complete) {
this.$.fxExplosion(this.x, this.y, 8, {'d': 1, 's': 0.5, 'c': this.col});
this.$.fxArea(this.x, this.y, {'s': 8, 'd': 0.3, 'c': this.col});
this.$.fxExp({o: this, n: 8, d: 1, s: 0.5, c: this.col});
this.$.fxArea({o: this, s: 8, d: 0.3, c: this.col});
this.$.playSound('powerSound');
}
};
Expand Down Expand Up @@ -484,14 +473,14 @@ ActorPlayerDef.onCreate = function(data, complete) {

this.col = this.$.playerColor(this.id);
if (complete) {
this.$.fxExplosion(this.dx, this.dy, 4, {'d': 0.25, 's': 1, 'c': this.col});
this.$.fxExp({x: this.dx, y: this.dy, n: 4, d: 0.25, s: 1, c: this.col});
}
};

ActorPlayerDef.onDestroy = function(complete) {
if (complete) {
this.$.playSound('explosionMedium');
this.$.fxExplosion(this.dx, this.dy, 6, {'d': 0.5, 's': 1, 'c': this.col});
this.$.fxExp({x: this.dx, y: this.dy, n: 6, d: 0.5, s: 1, c: this.col});
}
};

Expand Down Expand Up @@ -575,25 +564,17 @@ ActorAsteroid.onInterleave = function(delta) {
ActorAsteroid.onDestroy = function(complete) {
if (complete) {
if (this.type >= 4) {
this.$.fxExplosion(this.x, this.y, 60,
{'d': 2.15, 's': 2.50, 'c': this.col, 'n': true});

this.$.fxArea(this.x, this.y, {'s': 70, 'd': 1.75,
'c': this.col, 'n': true});

this.$.fxArea(this.x, this.y, {'s': 150, 'd': 1.2,
'c': this.col, 'n': true});

this.$.fxExp({o: this, n: 60, d: 2.15, s: 2.50, c: this.col, w: true});
this.$.fxArea({o: this, s: 70, d: 1.75, c: this.col, w: true});
this.$.fxArea({o: this, s: 150, d: 1.2, c: this.col, w: true});
this.$.playSound('explosionMedium');

} else {
var add = this.type === 2 ? 5.5 : (this.type === 3 ? 10 : 0);
this.$.fxExplosion(this.x, this.y, [0, 6, 10, 14][this.type],
{'d': 0.85 + add / 7, 's': 0.50, 'c': this.col});

this.$.fxArea(this.x, this.y, {'s': 13 + add * 1.75,
'd': 0.5 + add / 27, 'c': this.col});
this.$.fxExp({o: this, n: [0, 6, 10, 14][this.type],
d: 0.85 + add / 7, s: 0.50, c: this.col});

this.$.fxArea({o: this, s: 13 + add * 1.75, d: 0.5 + add / 27, c: this.col});
this.$.playSound(this.type === 1 ? 'explosionSmall' : 'explosionMedium');
}
}
Expand Down
54 changes: 29 additions & 25 deletions client/game.draw.js
View file
Expand Up @@ -160,56 +160,60 @@ Shooter.renderParticles = function() {


// Effects ---------------------------------------------------------------------
Shooter.fxArea = function(x, y, obj) {
Shooter.fxArea = function(obj) {
this.particles.push({
'x': x, 'y': y,
'x': obj.o ? obj.o.x : obj.x,
'y': obj.o ? obj.o.y : obj.y,
'size': obj.s,
'time': this.getTime() + obj.d * 1500,
'd': obj.d * 1500,
'col': obj.c,
'nowrap': obj.n || false
'nowrap': obj.w || false
});
};

Shooter.fxParticle = function(x, y, r, obj) {
Shooter.fxPar = function(obj) {
this.particles.push({
'x': x , 'y': y,
'r': this.wrapAngle(r),
'x': obj.o ? obj.o.x : obj.x,
'y': obj.o ? obj.o.y : obj.y,
'r': this.wrapAngle(obj.r),
'speed': obj.s,
'time': this.getTime() + obj.d * 1500,
'd': obj.d * 1500,
'col': obj.c,
'a': obj.a,
'nowrap': obj.n || false
'nowrap': obj.w || false
});
};

Shooter.fxExplosion = function(x, y, count, obj) {
Shooter.fxExp = function(obj) {
var x = obj.o ? obj.o.x : obj.x;
var y = obj.o ? obj.o.y : obj.y;
var r = (Math.PI * 2 * Math.random());
var rs = Math.PI * 2 / (count * 2);
for(var i = 0; i < count * 2; i++) {
this.fxParticle(x, y, (r + rs * i) - Math.PI,
{'s': 0.35 + Math.random() * obj.s,
'd': (1 * obj.d) + Math.random() * (0.5 * obj.d),
'c': obj.c,
'a': 1,
'n': obj.n});
var rs = Math.PI * 2 / (obj.n * 2);
for(var i = 0; i < obj.n * 2; i++) {
this.fxPar({'x': x, 'y': y, 'r': (r + rs * i) - Math.PI,
's': 0.35 + Math.random() * obj.s,
'd': (1 * obj.d) + Math.random() * (0.5 * obj.d),
'c': obj.c,
'a': 1,
'w': obj.w});
}
};

Shooter.fxRing = function(x, y, size, obj) {
Shooter.fxRing = function(obj) {
var x = obj.o ? obj.o.x : obj.x;
var y = obj.o ? obj.o.y : obj.y;
for(var i = 0; i < obj.n; i++) {
var r = (Math.PI * 2 / obj.n * i) - Math.PI;
var e = Math.random() / 2 + 0.5;
var ox = x + Math.sin(r) * size;
var oy = y + Math.cos(r) * size;
this.fxParticle(ox, oy, r + e / 2,
{'s': obj.s * 0.5 * e, 'd': obj.d,
'c': obj.c, 'a': obj.a});
var ox = x + Math.sin(r) * obj.r;
var oy = y + Math.cos(r) * obj.r;
this.fxPar({'x': ox, 'y': oy, 'r': r + e / 2, 's': obj.s * 0.5 * e,
'd': obj.d, 'c': obj.c, 'a': obj.a});

this.fxParticle(ox, oy, r - e,
{'s': obj.s * e, 'd': obj.d * 2,
'c': obj.c, 'a': obj.a});
this.fxPar({'x': ox, 'y': oy, 'r': r - e, 's': obj.s * e,
'd': obj.d * 2, 'c': obj.c, 'a': obj.a});
}
};

Expand Down

0 comments on commit 9169d91

Please sign in to comment.