Merge pull request #165 from obiot/ticket-15

Ticket #15 - inheritance / composition
melonjs · Mar 3, 2013 · a8bbea8 · a8bbea8
2 parents 485b17b + 76715a9
commit a8bbea8
Show file tree

Hide file tree

Showing 8 changed files with 835 additions and 817 deletions.
diff --git a/examples/dirtyRect/gameObj.js → examples/dirtyRect/entities.js b/examples/dirtyRect/gameObj.js → examples/dirtyRect/entities.js
diff --git a/examples/dirtyRect/index.html b/examples/dirtyRect/index.html
@@ -6,8 +6,8 @@
    <body bgcolor="white">
       <div id="jsapp">
          <script type="text/javascript" src="../../build/melonJS-0.9.7.js"></script>
-         <script type="text/javascript" src="screenObj.js"></script>
-         <script type="text/javascript" src="gameObj.js"></script>
+         <script type="text/javascript" src="screens.js"></script>
+         <script type="text/javascript" src="entities.js"></script>
          <script type="text/javascript" src="main.js"></script>
       </div>
    </body>

diff --git a/examples/dirtyRect/main.js b/examples/dirtyRect/main.js
@@ -47,7 +47,7 @@ var jsApp	=
 
 
       // init the video
-      if (!me.video.init('jsapp', 1024, 768, true, 'auto', false))
+      if (!me.video.init('jsapp', 1024, 768, true, 'auto'))
       {
          alert("Sorry but your browser does not support html 5 canvas.");
          return;

diff --git a/examples/dirtyRect/screenObj.js → examples/dirtyRect/screens.js b/examples/dirtyRect/screenObj.js → examples/dirtyRect/screens.js
diff --git a/examples/platformer/entities.js b/examples/platformer/entities.js
@@ -37,10 +37,10 @@ var PlayerEntity = me.ObjectEntity.extend({
 		me.input.bindKey(me.input.KEY.DOWN,	"down");
 
 		// walking animatin
-		this.addAnimation ("walk",  [0,2,1]);
+		this.renderable.addAnimation ("walk",  [0,2,1]);
 
 		// set default one
-		this.setCurrentAnimation("walk");
+		this.renderable.setCurrentAnimation("walk");
 	},
 
 	/* -----
@@ -112,7 +112,7 @@ var PlayerEntity = me.ObjectEntity.extend({
 		}
 
 		// check if we moved
-		if (this.vel.x!=0 || this.vel.y!=0 || this.isFlickering()) {
+		if (this.vel.x!=0 || this.vel.y!=0 || this.renderable.isFlickering()) {
 			this.parent();
 			return true;
 		}
@@ -125,9 +125,9 @@ var PlayerEntity = me.ObjectEntity.extend({
 	 * ouch
 	 */
 	hurt : function () {
-		if (!this.flickering)
+		if (!this.renderable.flickering)
 		{
-			this.flicker(45);
+			this.renderable.flicker(45);
 			// flash the screen
 			me.game.viewport.fadeIn("#FFFFFF", 75);
 			me.audio.play("die", false);
@@ -151,15 +151,15 @@ var CoinEntity = me.CollectableEntity.extend({
 		this.parent(x, y , settings);
 
 		// animation speed		
-		this.animationspeed = 8;
+		this.renderable.animationspeed = 8;
 
 		// bounding box
 		//this.updateColRect(8,16,16,16);
 
 		// walking animatin
-		this.addAnimation("spin", [0,1,2,3]);
+		this.renderable.addAnimation("spin", [0,1,2,3]);
 
-		this.setCurrentAnimation("spin");
+		this.renderable.setCurrentAnimation("spin");
 
 	},		
 
@@ -210,16 +210,16 @@ var PathEnemyEntity = me.ObjectEntity.extend({
 
 		// custom animation speed ?
 		if (settings.animationspeed) {
-			this,animationspeed = settings.animationspeed; 
+			this.renderable.animationspeed = settings.animationspeed; 
 		}
 
 		// walking animatin
-		this.addAnimation ("walk", [0,1]);
+		this.renderable.addAnimation ("walk", [0,1]);
 		// dead animatin
-		this.addAnimation ("dead", [2]);
+		this.renderable.addAnimation ("dead", [2]);
 
 		// set default one
-		this.setCurrentAnimation("walk");
+		this.renderable.setCurrentAnimation("walk");
 	},
 
 
@@ -252,7 +252,7 @@ var PathEnemyEntity = me.ObjectEntity.extend({
 		// call the parent function
 		this.parent();
 		// return true if we moved of if flickering
-		return (this.vel.x != 0 || this.vel.y != 0 || this.isFlickering());
+		return (this.vel.x != 0 || this.vel.y != 0 || this.renderable.isFlickering());
 	},
 
 	/**
@@ -267,9 +267,10 @@ var PathEnemyEntity = me.ObjectEntity.extend({
 			// and not collidable anymore
 			this.collidable = false;
 			// set dead animation
-			this.setCurrentAnimation("dead");
+			this.renderable.setCurrentAnimation("dead");
 			// make it flicker and call destroy once timer finished
-			this.flicker(45, function(){me.game.remove(this)});
+			var self = this;
+			this.renderable.flicker(45, function(){me.game.remove(self)});
 			// dead sfx
 			me.audio.play("enemykill", false);
 			// give some score

diff --git a/examples/whack-a-mole/main.js b/examples/whack-a-mole/main.js
@@ -258,7 +258,7 @@ var MoleEntity = me.AnimationSheet.extend(
 /**
  * a mole manager (to manage movement, etc..)
  */
-var MoleManager = me.InvisibleEntity.extend(
+var MoleManager = me.ObjectEntity.extend(
 {	
 	moles : [],