entityjs 0.4.0 → 0.4.1

data/entityjs.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "jasmine"
   
-  s.add_dependency "sinatra"
+  s.add_dependency "sinatra", ">= 1.3.0"
   s.add_dependency "coffee-script"
   s.add_dependency 'uglifier'
   s.add_dependency 'json'

data/lib/entityjs/version.rb

@@ -1,3 +1,3 @@
 module Entityjs
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/public/qunit/qunit.entity.js

@@ -101,22 +101,6 @@ function pixelEqual(x, y, r, g, b, a, message){
 	QUnit.push(QUnit.equiv(actual, expected), actual, expected, message);
 }
 
-/*
-Expects the given entity to have the given flicker present
-
-var e = re.e();
-
-expectFlicker(e, 'run'); //false
-
-e.comps('flicker').addFlicker('run', 123, 21, [2]);
-
-expectFlicker(e, 'run') //true
-
-*/
-function expectFlicker(ent, flick){
-  ok(ent.flicker_reels[flick] != null, "Expected entity to have flicker "+flick);
-}
-
 /*
 Expects an entity or component to have a current event attached.
 

data/spec/javascripts/src/core/entity_spec.js

@@ -20,6 +20,16 @@ describe('entity', function(){
     eq(re('dfggggg').length, 1)
   })
   
+  it('should get', function(){
+    e.blah = 10;
+    e.bla = function(){
+      return 10;
+    };
+
+    eq(e.get('blah'), 10);
+    eq(e.get('bla'), 10);
+  });
+
   it('comp', function(){
     e.comp('qwdqwd wer')
     
@@ -175,14 +185,14 @@ describe('entity', function(){
     is(re.e().clone())
   })
   
-  it('parent', function(){
+  it('super', function(){
       c.defines('d', function(v){return v; })
       .defaults('y', function(v){return v;})
       
-      eq(e.parent(c.name, 'd', 100), 100)
-      eq(e.parent(c.name, 'y', 'bob'), 'bob')
+      eq(e._super(c.name, 'd', 100), 100)
+      eq(e._super(c.name, 'y', 'bob'), 'bob')
       e.comp(c.name)
-      ok(e.parent('','has', c.name))
+      ok(e._super('','has', c.name))
   })
   
   it('attr overwrite method', function(){
@@ -226,7 +236,7 @@ describe('entity', function(){
   it('should throw error on undefined parent method', function(){
     var called = false;
     try {
-      e.parent('image', 'asdfsdf')
+      e._super('image', 'asdfsdf')
     } catch(e){
       called = true;
     }

data/spec/javascripts/src/display/animate_spec.js

@@ -0,0 +1,13 @@
+describe('display/animate', function(){
+
+	var e;
+
+	beforeEach(function(){
+		e = re.e('animate');
+	});
+
+	it('should animate', function(){
+		is(e.animate());
+	});
+
+});

data/spec/javascripts/src/pattern/flicker_spec.js

@@ -49,11 +49,6 @@ describe('flicker', function(){
     //manually call update
     
     for(var i=0; i<60 * time; i++){
-      if(i == 37){
-        eq(e.health, 5);
-      } else if(i==37+37){
-        eq(e.health, 10);
-      }
       e.flicker_update(re.sys.stepSize);
     }
     
@@ -67,13 +62,13 @@ describe('flicker', function(){
     
     e.flicker(1, [5]);
     
-    eq(e.health, 5)
-    
-    for(var i=60;i--;){
-      e.flicker_update(re.sys.stepSize);
-      eq(e.health, 5);
+
+    for(var i=0; i<3; i++){
+      e.flicker_update(e.stepSize * 0.5);
+
     }
-    
+      eq(e.health, 5);
+
   })
   
 });

data/spec/support/mygame.rb

@@ -1,6 +1,11 @@
 
 def setup_mygame
   root = File.dirname(__FILE__)+'/../..'
+  
+  if !File.directory? root+'/mygame'
+    Dir.mkdir(root+'/mygame')
+  end
+  
   Dir.chdir(root+'/mygame')
   
   Entityjs::Dirc.game?

data/src/core/entity.js

@@ -97,7 +97,7 @@
           com = pieces[0];
         }
         
-        if(this.has(com)){
+        if(com && this.has(com)){
           
           var c = re._c[com];
           //only remove if it exists
@@ -233,10 +233,10 @@
     Use '' to call super of entity
     
     re.e('draw')
-    .parent('draw', 'screenX')()
+    ._super('draw', 'screenX')()
     
     */
-    p.parent = function(comp, method){
+    p._super = function(comp, method){
         
         var a = Array.prototype.slice.call(arguments, 2);
         
@@ -437,7 +437,9 @@
         return this;
     };
     
-    p.attr = function(obj, value){
+    //setters / getters
+
+    p.attr = p.set = function(obj, value){
         
         if(re.is(obj,  'object')){
             
@@ -461,7 +463,12 @@
         
         return this;
     };
-    
+
+    p.get = function(v){
+        var l = this[v];
+        return (re.is(l,'function'))? l() : l;
+    };
+
     p.def = function(obj, value){
         
         if(re.is(obj , 'object')){

data/src/display/align.js

@@ -15,38 +15,40 @@ re.c('align')
   
     alignHor:function(o){
         o = o || 0;
-        this.posX = re.sys.sizeX * 0.5 - (this.sizeX - this.regX)*0.5 + o | 0;
+        this.set('posX', re.sys.sizeX * 0.5 - (this.get('sizeX') - this.get('regX'))*0.5 + o | 0);
         
         return this;
     },
     
     alignVer:function(o){
         o = o || 0;
-        this.posY = re.sys.sizeY * 0.5 - (this.sizeY - this.regY)*0.5 + o | 0;
+        this.set('posY', re.sys.sizeY * 0.5 - (this.get('sizeY') - this.get('regY'))*0.5 + o | 0);
         return this;
     },
     
     alignRight:function(x){
         x = x || 0;
-        this.posX = re.sys.sizeX - (this.sizeX - this.regX) + x | 0;
+        this.set('posX', re.sys.sizeX - (this.get('sizeX') - this.get('regX')) + x | 0);
         return this;
     },
     
     alignLeft:function(x){
         x = x || 0;
-        this.posX = x + this.sizeX - (this.sizeX - this.regX) | 0;
+        var s = this.get('sizeX');
+        this.set('posX', x + s - (s - this.get('regX')) | 0);
         return this;
     },
     
     alignTop:function(y){
         y = y || 0;
-        this.posY = y + this.sizeY - (this.sizeY - this.regY) | 0;
+        var s = this.get('sizeY');
+        this.set('posY', y + s - (s - this.get('regY')) | 0);
         return this;
     },
     
     alignBottom:function(y){
         y = y || 0;
-        this.posY = re.sys.sizeY - (this.sizeY - this.regY) + y | 0;
+        this.set('posY', re.sys.sizeY - (this.get('sizeY') - this.get('regY')) + y | 0);
         return this;
     }
     

data/src/display/animate.js

@@ -0,0 +1,50 @@
+/*
+The animate comp defines a simple interface for animating sprites.
+
+//create entity with sprite sheet and animate comp
+var apple = re.e('apple.png animate sprite');
+
+//setup animations to play
+apple.anis = {
+			//time, frames, loops
+	explode:[1000, [0, 1, 2], 1]
+		  //seconds, frames, loops defaults to once
+	trans:[0.5, [3, 4, 5]]	
+};
+
+//play animation
+apple.animate('explode');
+
+//stop animation
+apple.animate();
+
+//check animation playing
+apple.flickering(); //this comes from flicker comp
+
+*/
+re.c('animate')
+.requires('flicker')
+.defines({
+  	
+	animate:function(name){
+		//ignore if calling the same frame
+		if(this.flickering() != name){
+			
+			var a = this.anis[name] || [];
+			//flicker interface
+			//(duration:int, frames:array, loops:int, id:string)
+			this.flicker(a[0], a[1], a[2], name);
+
+			//only run if a is defined
+			if(a.length)
+			this.flicker_run(); //run first frame
+		}
+		return this;
+	},
+
+    //implement for flicker
+    flick:function(c){
+        this.frame(c);
+    }
+  
+});

data/src/display/draw.js

@@ -144,8 +144,8 @@ re.c('draw')
         
         c.save();
         
-        if(this.alpha != 1)
-            c.staticsAlpha = this.alpha;
+        if(this.alpha-1)
+            c.globalAlpha = this.alpha;
         
       if(this.screenable)
         c.translate(this.screenX(), this.screenY());

data/src/display/image.js

@@ -17,7 +17,7 @@ re.c('image')
 	},
 	
 	visible:function(){
-		return this._image && this.parent('draw', 'visible');
+		return this._image && this._super('draw', 'visible');
 	},
 	
 	draw:function(c){

data/src/display/imgtext.js

@@ -35,7 +35,7 @@ re.c('imgtext')
 .defines({
 	
 	visible:function(){
-		return this._text && this._image && this.parent('draw', 'visible');
+		return this._text && this._image && this._super('draw', 'visible');
 	},
 	
 	draw:function(c){

data/src/display/sprite.js

@@ -44,11 +44,6 @@ re.c('sprite')
         c.drawImage(this._image, this.frameX * this.sizeX, this.frameY * this.sizeY, this.sizeX, this.sizeY, -this.regX, -this.regY, this.sizeX, this.sizeY);
         
         return this;
-    },
-    
-    //implement for flicker
-    flick:function(c){
-        this.frame(c);
     }
     
 });

data/src/display/text.js

@@ -23,7 +23,7 @@ re.c('text')
 .defines({
 	
 	visible:function(){
-		return this._text && this.parent('draw', 'visible');
+		return this._text && this._super('draw', 'visible');
 	},
 	
 	text:function(t){

data/src/pattern/flicker.js

@@ -50,43 +50,43 @@ re.c('flicker')
 	
   change:function(){
     
-			//check if over
-			if(this.flicker_frame == this.flicker_frames.length){
-				
-				if(this.flicker_loops == -1 || --this.flicker_loops >= 1){
-					//loop again
-					
-					this.flicker_frame = 0;
-					
-				} else {
-					//done flickering
-					
-					this.flicker_stop();
-          return;
-				}
-			}
+	//check if over
+	if(this.flicker_frame == this.flicker_frames.length){
+		
+		if(this.flicker_loops == -1 || --this.flicker_loops >= 1){
+			//loop again
+			
+			this.flicker_frame = 0;
+			
+		} else {
+			//done flickering
 			
-      this.flicker_run();
+			this.flicker_stop();
+  			return;
+		}
+	}
+			
+     this.flicker_run();
   },
   
   run:function(){
     
-    var f = this.flicker_frame,
-    fs = this.flicker_frames,
-    l = this.flicker_loops,
-    val = fs[f];
+    var f = this.flicker_frame, //frame number
+    fs = this.flicker_frames, //array of frames
+    l = this.flicker_loops, //loops left
+    val = fs[f]; //flick value
     
     var quit = this.flick(val, f, fs, l);
     
     this.trigger('flicker:update', val, f, fs, l);
     
-			//flick
-			if(quit === false){
-        //stop
-        this.flicker();
-      }
+	//flick
+	if(quit === false){
+    	//stop
+    	this.flicker();
+     }
       
-			this.flicker_frame++;
+	this.flicker_frame++;
   },
   
 	update:function(t){
@@ -107,20 +107,20 @@ re.c('flicker')
 	*/
 	flicker:function(duration, frames, loops, id){
 		
-    //stop
-		if(!re.is(loops) && this.flickering()){
+	    //stop
+		if(!re.is(duration) && this.flickering()){
 			//stop flickering
 			return this.flicker_stop();
 		}
 		
-    //convert to seconds
-    if(duration >= 100){
-      duration /= 1000;
-    }
-    
+	    //convert to seconds
+	    if(duration >= 100){
+	    	duration /= 1000;
+	    }
+	    
 		this.flicker_duration = duration || 1;
     
-    frames = (re.is(frames,'array')) ? frames : [frames];
+	    frames = (re.is(frames,'array')) ? frames : [frames];
     
 		//setup counter for loops
 		this.flicker_loops = loops || 1;
@@ -128,20 +128,20 @@ re.c('flicker')
 		this.stepProgress = 0;
 		this.stepSize = (duration / frames.length) / re.sys.second;
     
-    this.flicker_frames = frames;
+	    this.flicker_frames = frames;
 		this.flicker_frame = 0;
 		
 		if(!this.flickering()){
 			this.on('update', this.flicker_update);
 		}
 		
-    //sets flicker status
+	    //sets flicker status
 		this.flicker_id = id || true;
     
 		this.trigger('flicker:start');
-    
+    	
 		//update frame then run
-		this.flicker_run();
+		//this.flicker_run();
 		
 		return this;
 	},

data/templates/animation/scripts/init.js

@@ -0,0 +1,7 @@
+re.ready(function(){
+  
+  re.sys.init(re.canvas).start();
+  
+  re.scene('load').enter();
+  
+});

data/templates/animation/scripts/scenes/home.js

@@ -0,0 +1,41 @@
+re.scene('home')
+.enter(function(){
+  
+  re.e('sprite animate hero.png align keyboard')
+  .attr({
+    
+    //sets frame size
+    sizeX:25,
+    sizeY:25,
+    
+    //animation object for animate comp
+    anis:{
+      //first arg is time in milliseconds, array contains the frame numbers to flick through.
+      //time per frame = time / frames.length
+      random:[300, [0,1,2,3,4,0]]
+    },
+
+    //centers image on screen
+    alignHor:0,
+    alignVer:0
+    
+  })
+  //listens for keyup event
+  .on('keyup:enter', function(){
+    //play random animation
+    this.animate('random');
+
+    console.log('Currently animating:',this.flickering());
+  })
+  .on('keyup:q', function(){
+    //ends animation
+    this.animate();
+  });
+  
+  //add help text
+  re.e('text align')
+  .text('Press enter to animate')
+  .alignTop(5)
+  .alignLeft(5);
+  
+});

data/templates/animation/scripts/scenes/load.js

@@ -0,0 +1,11 @@
+re.scene('load')
+.enter(function(){
+  
+  re.load(re.assets)
+  .complete(function(){
+    
+    re.scene('home').enter();
+    
+  });
+  
+});

data/templates/animation/tests/init_test.js

@@ -0,0 +1,4 @@
+module('init');
+
+//in tests re.ready is NOT called.
+//make sure re.sys.init() is called or else input will not function!

data/templates/animation/tests/scenes/home_test.js

@@ -0,0 +1,15 @@
+module('home');
+
+test('enter home', function(){
+
+	re.scene('home').enter();
+
+	var ref;
+
+	//check if entity exists
+	is(ref = re('animate').first());
+
+	//expects entity to have event listeners
+	expectEvent(ref, 'keyup:enter');
+	expectEvent(ref, 'keyup:q');
+});

data/templates/animation/tests/scenes/load_test.js

@@ -0,0 +1,18 @@
+module('load');
+
+test('load assets', function(){
+  
+  //replace re.scene('home').enter with start()
+  stub(re.scene('home'), 'enter', function(){  start(); });
+  
+  //go into the load scene
+  re.scene('load').enter();
+  
+  //it should be loading the assets
+  //stop until it finishes and enters the new home scene
+  //the home scene should then call start()
+  stop();
+  
+  expect(0);
+  
+});

data/templates/circle/scripts/scenes/home.js

@@ -31,32 +31,4 @@ re.scene('home')
   .alignTop(5)
   .alignLeft(5);
   
-  //stop the browser from moving around
-  re.preventDefault('left right up down');
-  
-  //create new circle on canvas
-  re.e('circle align update')
-  .attr({
-    radius:10,
-    speed:15,
-    color:'#ff0000'
-  })
-  //from align component
-  .align()
-  .on('update', function(){
-    
-    //move on keypressed
-    if(re.pressed('a', 'left')) this.posX -= this.speed;
-    if(re.pressed('d', 'right')) this.posX += this.speed;
-    
-    if(re.pressed('w', 'up')) this.posY -= this.speed;
-    if(re.pressed('s', 'down')) this.posY += this.speed;
-    
-  });
-  
-  //add help text
-  re.e('text align')
-  .text('Use WASD or arrow keys to move the circle')
-  .alignTop(5)
-  .alignLeft(5);
 });

data/templates/isometric/scripts/displays/cursor.js

@@ -14,7 +14,8 @@ re.c('cursor')
     
     box.place(iso.isoX, iso.isoY);
     
-    re.draw.sort();
+    //get default drawlist
+    re.drawlist().sort();
   },
   
   move:function(x, y){
@@ -22,7 +23,7 @@ re.c('cursor')
     
     this.place(iso.isoX, iso.isoY);
     
-    re.draw.sort();
+    re.drawlist().sort();
   }
   
 })

data/templates/isometric/scripts/levels/level.js

@@ -9,8 +9,10 @@ re.c('level')
     re.iso.sizeZ = 25;
     
     //setups layers for objects on the same tile
-    re.draw.cursor = 1;
-    re.draw.box = 2;
+    re.layer = {
+      cursor:1,
+      box:2
+    };
     
     for(var y=0; y<this.map.length; y++){
       for(var x=0; x<this.map[0].length; x++){
@@ -32,13 +34,13 @@ re.c('level')
     }
     
     this.cursor = re.e('cursor')
-    .attr('layer', re.draw.cursor);
+    .attr('layer', re.layer.cursor);
     
     this.box = re.e('isoimage')
     .attr({
       id:'box',
       frameX:3,
-      layer:re.draw.box,
+      layer:re.layer.box,
       place:[0,0]
     });
     

data/templates/platform/scripts/displays/hero.js

@@ -1,5 +1,5 @@
 re.c('hero')
-.requires('hero.png tsprite update force flicker body')
+.requires('hero.png tsprite update force animate body')
 .defines({
   
   speed:40 * re.sys.stepSize,
@@ -28,18 +28,18 @@ re.c('hero')
       this.velX -= this.speed;
       this.scaleX = -1;
       
-      if(!this.jump) this.flicker('run');
+      if(!this.jump) this.animate('run');
     }
     
     if(re.pressed('d')){
       this.velX += this.speed;
       this.scaleX = 1;
       
-      if(!this.jump) this.flicker('run');
+      if(!this.jump) this.animate('run');
     }
     
     //switch back to idle animation if stopped moving
-    if(this.isIdle(0.3)) this.flicker('idle');
+    if(this.isIdle(0.3)) this.animate('idle');
     
   },
   
@@ -47,7 +47,7 @@ re.c('hero')
     this.jump = true;
     this.velY -= this.jumpSpeed;
     
-    this.flicker('jump');
+    this.animate('jump');
   },
   
   jumpReset:function(x, y, tx, ty){
@@ -62,12 +62,12 @@ re.c('hero')
 .init(function(){
   
   //add animations
-  this.addFlicker({
-	  idle:[-1, 600, [0, 1]],
-	  run:[-1, 800, [2, 3]],
-	  jump:[1, 500, [4, 5, 4]],
-	  ladder:[-1, 500, [6, 7]]
-	});
+  this.anis = {
+	  idle:[800, [0, 1], -1],
+	  run:[800, [2, 3], 1],
+	  jump:[500, [4, 5, 4], 1],
+	  ladder:[500, [6, 7], -1]
+	};
   
   this.on({
     update:this.update,

data/templates/platform/scripts/items/coin.js

@@ -1,5 +1,5 @@
 re.c('coin')
-.requires('item flicker')
+.requires('item animate')
 .defines({
   
   touch:function(){
@@ -17,10 +17,15 @@ re.c('coin')
   //add comp for searchability
   this.comp('coin');
   
+  //create new sound effect
   this.sfx = re.e('sound coin.sfx');
   
-	this.addFlicker('glow', -1, 1800, '14 15 15');
-	this.flicker('glow');
+  //setup animations to play
+	this.anis = {
+    glow:[1800, [14, 15, 15], -1]
+  };
+  
+	this.animate('glow');
 })
 //accepted tile frames in items.png which will become coins
 .alias('t14')

data/templates/platform/scripts/items/item.js

@@ -1,11 +1,14 @@
 re.c('item')
-.requires('tsprite update hit items.png')
+//order matters!
+//items.png defines sizeX, sizeY
+//tsprite overwrites the sizes
+.requires('items.png tsprite update hit')
 .namespaces({
   
   update:function(t){
-		
-		if(this.hero.hitBody(this.posX, this.posY, this.sizeX, this.sizeY, 10, 0)){
-			this.touching = true;
+
+	  if(this.hero.hitBody(this.posX, this.posY, this.sizeX, this.sizeY, 10, 0)){
+	 		this.touching = true;
 			this.touch(t);
 			
 		} else if(this.touching){

data/templates/platform/scripts/items/spring.js

@@ -1,5 +1,5 @@
 re.c('spring')
-.requires('item flicker')
+.requires('item animate')
 .defines({
   
   touch:function(){
@@ -7,14 +7,16 @@ re.c('spring')
 		
 		if(re.pressed('w')){
 			this.hero.velY = -25;
-			this.flicker('bounce');
+			this.animate('bounce');
 		}
   }
   
 })
 .init(function(){
   //add animation, can also send a string instead of an array
-  this.addFlicker('bounce', 1, 300, '13 12');
+  this.anis = {
+    bounce:[300, [13, 12], 1]
+  };
 	
 	this.frame(12);
   

data/templates/platform/tests/displays/hero_test.js

@@ -1,11 +1,12 @@
 module('hero', lazy('hero'));
 
-test('has flicks', function(){
+test('has animations', function(){
   
-  expectFlicker(hero, 'idle');
-  expectFlicker(hero, 'run');
-  expectFlicker(hero, 'jump');
-  expectFlicker(hero, 'ladder');
+  //these where manually put in
+  is(hero.anis.idle);
+  is(hero.anis.run);
+  is(hero.anis.jump);
+  is(hero.anis.ladder);
   
 });
 
@@ -15,7 +16,7 @@ test('has components', function(){
 
 test('flickers idle when not moving', function(){
   
-  hero.flicker('run');
+  hero.animate('run');
   
   stub(hero, 'isIdle', true);
   

data/templates/platform/tests/factories.js

@@ -27,4 +27,9 @@ Create an entity from a factory..
 
 var hero = f('hero') //new entity
 hero.health = 100;
-*/
+*/
+
+//re.ready() is DISABLED during testing
+addEventListener('load', function(){
+	re.sys.init(re.canvas).start();
+});

data/templates/platform/tests/items/coin_test.js

@@ -4,7 +4,7 @@ test('valid', function(){
   
   expectEvent(coin, 'update');
   
-  expectFlicker(coin, 'glow');
+  is(coin.anis.glow);
   
 });
 

data/templates/platform/tests/items/spring_test.js

@@ -1,11 +1,5 @@
 module('spring', lazy('spring'));
 
-test('flicker animation', function(){
-  
-  expectFlicker(spring, 'bounce');
-  
-});
-
 test('bounce on touch and key press', function(){
   stub(re, 'pressed', function(key){
     //make sure w key is checked

data/templates/pong/scripts/controls/hitmap.js

@@ -28,17 +28,17 @@ re.c('hitmap')
     }
     
     //check hits on paddles
-    re('paddle').each(function(){
+    re('paddle').each(function(i){
       
-      if(this.hit(obj)){
+      if(i.hit(obj)){
         res.hitX = 1;
         
-        var push = obj.hsizeX + this.hsizeX + 1;
+        var push = obj.hsizeX + i.hsizeX + 1;
         
-        if(this.posX > obj.posX){
+        if(i.posX > obj.posX){
           push *= -1;
         }
-        res.posX = this.posX + push;
+        res.posX = i.posX + push;
         
       }
       

data/templates/pong/tests/controls/player_test.js

@@ -4,6 +4,8 @@ test('paddle moves down on w press', function(){
   
   player.posY = 30;
   
+  stub(player, 'checkBounds');
+  
   expectValueDown(player, 'posY');
   
   keypress('w', function(){
@@ -15,9 +17,12 @@ test('paddle moves down on w press', function(){
 test('paddle moves up on s press', function(){
   
   player.posY = 10;
-  
+  console.log(player.posY)
   expectValueUp(player, 'posY');
   
+  //remove this
+  stub(player, 'checkBounds');
+  
   keypress('s', function(){
     player.update();
   });

data/templates/tiltmaze/scripts/displays/ball.js

@@ -28,7 +28,7 @@ re.c('ball')
     var tileAfter = this.level.automap(tx+x, ty+y);
     
     if(tileAfter && !tile.checkWallInside(x, y) && !tileAfter.checkWall(x, y)){
-      
+
       if(y){
         this.posY += this.speed * y;
       }

data/templates/tiltmaze/scripts/structs/level.js

@@ -53,10 +53,10 @@ re.level = re.c('level')
     
     var ball = this;
     
-    re('target').each(function(){
+    re('target').each(function(i){
       
-      if(ball.tileX() == this.tileX() && this.tileY() == ball.tileY()){
-        this.dispose();
+      if(ball.tileX() == i.tileX() && i.tileY() == ball.tileY()){
+        i.dispose();
       }
       
     });

data/templates/tiltmaze/tests/displays/ball_test.js

@@ -10,7 +10,7 @@ test('move up correctly', function(){
     start();
   });
   
-  ball.tileY(2);
+  ball.tileY(1);
   
   keypress('w', function(){
     ball.update();

data/templates/tiltmaze/tests/factories.js

@@ -35,4 +35,10 @@ factory('ball', function(){
     }
   };
   
+});
+
+//starts system from running
+//re.ready is disabled in testing
+addEventListener('load', function(){
+  re.sys.init(re.canvas).start();
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: entityjs
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000 Z
+date: 2012-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17728680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17728680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &17727980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17727980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &17727440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *17727440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &17726720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17726720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &17725900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17725900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &17725400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17725400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cobravsmongoose
-  requirement: &17724880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +117,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17724880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: HTML5 Javascript game engine, quickly create robust, flexible and reusable
   games.
 email:
@@ -156,6 +191,7 @@ files:
 - spec/javascripts/src/cycle/update_spec.js
 - spec/javascripts/src/cycle/wait_spec.js
 - spec/javascripts/src/display/align_spec.js
+- spec/javascripts/src/display/animate_spec.js
 - spec/javascripts/src/display/circle_spec.js
 - spec/javascripts/src/display/draw_spec.js
 - spec/javascripts/src/display/group_spec.js
@@ -227,6 +263,7 @@ files:
 - src/cycle/wait.js
 - src/cycle/worker.js
 - src/display/align.js
+- src/display/animate.js
 - src/display/circle.js
 - src/display/draw.js
 - src/display/group.js
@@ -268,6 +305,13 @@ files:
 - src/util/scene.js
 - src/util/sheet.js
 - src/util/support.js
+- templates/animation/assets/images/hero.png
+- templates/animation/scripts/init.js
+- templates/animation/scripts/scenes/home.js
+- templates/animation/scripts/scenes/load.js
+- templates/animation/tests/init_test.js
+- templates/animation/tests/scenes/home_test.js
+- templates/animation/tests/scenes/load_test.js
 - templates/arrow_keys/assets/images/arrow.png
 - templates/arrow_keys/config.yml
 - templates/arrow_keys/readme.txt
@@ -402,7 +446,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: entityjs
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Create HTML5 javascript games in EntityJS.