Changed the shape of Player to classic triangle

caolan · Dec 23, 2011 · eb4ca89 · eb4ca89
1 parent 153bf00
commit eb4ca89
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 18 deletions.
diff --git a/lib/Body.js b/lib/Body.js
@@ -36,19 +36,6 @@ condor.Body = Container.extend({
         this.oldx -= (x || 0);
         this.oldy -= (y || 0);
     },
-
-    initialize: function () {
-        Container.prototype.initialize.call(this);
-
-        // temporary graphic to show particles
-        this.body = new Shape();
-        var g = this.body.graphics;
-        g.clear();
-        g.beginStroke("#333333");
-        g.beginFill("#999999");
-        g.drawCircle(0,0,this.WIDTH);
-        this.addChild(this.body);
-    },
 
     checkBounds: function () {
 

diff --git a/lib/Enemy.js b/lib/Enemy.js
@@ -9,6 +9,24 @@ condor.Enemy = condor.Body.extend({
 	nextx: 0,
 	nexty: 0,
 
+	initialize: function () {
+		Container.prototype.initialize.call(this);
+
+        this.display();
+	},
+
+	display: function () {
+
+        // temporary graphic
+        this.body = new Shape();
+        var g = this.body.graphics;
+        g.clear();
+        g.beginStroke("#333333");
+        g.beginFill("#999999");
+        g.drawCircle(0,0,this.WIDTH);
+        this.addChild(this.body);
+	},
+
 	tick: function () {
 
 		this.checkWaypoint();

diff --git a/lib/ParticleManager.js b/lib/ParticleManager.js
@@ -19,15 +19,16 @@ condor.ParticleManager = {
 		return n;
 	},
 
-	spark: function (x, y, size) {
-
+	spark: function (object, size) {
+		console.log('spark!');
+
 		var size = size || 10;
 
 		for (var i=0; i< size; i++) {
 			var p = new condor.Particle();
 			var angle = Math.random()*57.2957795;
 			var speed = 5+Math.random()*20; 
-			p.position(x,y);
+			p.position(object.x,object.y);
 			p.accelerate(speed*Math.sin(angle),speed*Math.cos(angle));
 			this.add(p);
 			condor.interface.stage.addChild(p);

diff --git a/lib/Player.js b/lib/Player.js
@@ -2,13 +2,32 @@ condor.Player = condor.Body.extend({
 
     ACCELERATION: 15,
     FRICTION: 0.5,
+	WIDTH: 12,
+	HEIGHT: 16,
 
     initialize: function () {
         condor.Body.prototype.initialize.call(this);
 
         this.bindEvents();
+		this.display();
     },
 
+	display: function () {
+
+        // temporary graphic
+        this.body = new Shape();
+        var g = this.body.graphics;
+        g.clear();
+        g.beginStroke("#333333");
+        g.beginFill("#aaaaaa");
+        g.moveTo(0,-this.HEIGHT);
+		g.lineTo(this.WIDTH,this.HEIGHT);
+		g.lineTo(-this.WIDTH,this.HEIGHT);
+		g.closePath();
+        this.addChild(this.body);
+	},
+
+
     bindEvents: function () {
         _.bindAll(this, 'moveLeft', 'moveRight', 'moveUp', 'moveDown', 'fire');
 

diff --git a/lib/Projectile.js b/lib/Projectile.js
@@ -10,6 +10,11 @@ condor.Projectile = condor.Body.extend({
     initialize: function () {
         Container.prototype.initialize.call(this);
 
+		this.display();
+    },
+
+	display: function () { 
+
         this.body = new Shape();
         var g = this.body.graphics;
         g.clear();
@@ -19,7 +24,7 @@ condor.Projectile = condor.Body.extend({
 		g.lineTo(this.WIDTH, -this.HEIGHT);
 		g.lineTo(0, this.HEIGHT);
         this.addChild(this.body);
-    },
+	},
 
     fire: function () {
         this.accelerate(0, -this.SPEED);
@@ -28,7 +33,7 @@ condor.Projectile = condor.Body.extend({
 	tick: function () {
 
 		if (!this.checkBounds()) {
-			condor.ParticleManager.spark(this.x, this.y);
+			condor.ParticleManager.spark(this);
 		}
 
 		this.update();