entityjs 0.3.2 → 0.4.0

data/spec/javascripts/src/cycle/drawlist_spec.js

@@ -0,0 +1,36 @@
+describe('cycle/drawlist', function(){
+  
+  var drawlist;
+  
+  beforeEach(function(){
+    
+    drawlist = re.drawlist('test');
+    
+  });
+  
+  it('add', function(){
+    var blah = re.e('circle');
+    drawlist.add(blah);
+    
+    ok(drawlist.list.include(blah))
+  })
+  
+  it('remove', function(){
+    
+    var blah = re.e('circle');
+    drawlist.add(blah);
+    drawlist.remove(blah);
+    not(drawlist.list.include(blah))
+  })
+  
+  it('drawlist', function(){
+    //drawlist.drawlist();
+    //smoke test
+  })
+  
+  it('sort', function(){
+    drawlist.sort();
+    //an other smoke test
+  })
+  
+});

data/spec/javascripts/src/cycle/tween_spec.js

@@ -47,7 +47,7 @@ describe('cycle/tween', function(){
     
     tween.tween_update(step)
     
-    eq(tween.x, 23.240000000000002);
+    eq(tween.x, 21.62);
     
     for(var i=60; i--;)
     tween.tween_update(step);

data/spec/javascripts/src/cycle/wait_spec.js

@@ -0,0 +1,31 @@
+describe('cycle/wait', function(){
+  
+  var wait;
+  
+  beforeEach(function(){
+    wait = re.e('wait');
+  });
+  
+  it('should wait', function(){
+    
+    var called= false;
+    
+    runs(function(){
+      
+      is(wait.wait(function(){
+        called = true;
+        console.log('ran')
+      }, 100));
+      console.log('hey')
+    });
+    
+    waits(101);
+    
+    runs(function(){
+      ok(called)
+      console.log('last')
+    });
+    
+  });
+  
+});

data/spec/javascripts/src/{cycle → display}/draw_spec.js

@@ -1,16 +1,32 @@
 describe('draw', function(){
   
-  var d;
+  var d, list;
   
   beforeEach(function(){
+    list = re.drawlist().list;
+    
     re.c('shape')
-    .requires('draw').defines('draw', function(){
+    .requires('draw')
+    .defines('draw', function(){
     })
     
     d = re.e('shape')
   })
   
   
+  it('should sort rect first', function(){
+    
+    var rect = re.e('shape');
+    rect.depth = function(){
+      return -1000;
+    };
+    
+    re.drawlist().sort();
+    
+    eq(list[0], rect);
+    
+  })
+  
   it('create', function(){
     var called = false
     re.sys.start();
@@ -34,7 +50,7 @@ describe('draw', function(){
     is(re.e('shape ddd').drawFirst())
     
     var l = 0
-    ok(re._c.draw.l[l].has('ddd'))
+    ok(list[l].has('ddd'))
   })
   
   it('drawLast', function(){
@@ -44,8 +60,8 @@ describe('draw', function(){
     
     is(k.drawLast())
     
-    var l = re._c.draw.l.length-1
-    ok(re._c.draw.l[l].has('db77'))
+    var l = list.length-1
+    ok(list[l].has('db77'))
     
   })
   
@@ -57,8 +73,8 @@ describe('draw', function(){
     is(k.drawBefore(b))
     
     
-    var l = re._c.draw.l.indexOf(b)-1
-    ok(re._c.draw.l[l].has('db777'))
+    var l = list.indexOf(b)-1
+    ok(list[l].has('db777'))
     
   })
   
@@ -68,8 +84,8 @@ describe('draw', function(){
     var b = re.e('shape b')
     
     is(k.drawAfter(b))
-    var l = re._c.draw.l.indexOf(b)+1
-    ok(re._c.draw.l[l].has('db777y'))
+    var l = list.indexOf(b)+1
+    ok(list[l].has('db777y'))
     
   })
   

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

@@ -20,6 +20,24 @@ describe('sprite', function(){
     eq(e.frame(), 1)
 	});
   
+  it('should display second row', function(){
+    
+    e.bisect = 2001;
+    e.sizeY = 80;
+    e.sizeX = 87;
+    
+    e.frame(22);
+    
+    eq(e.frameX, 22)
+    eq(e.frameY, 0)
+    
+    //tricky part
+    e.frame(23);
+    eq(e.frameX, 0);
+    eq(e.frameY, 1);
+    
+  })
+  
   it('draw', function(){
     is(e.draw(re.sys.context))
     

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

@@ -23,6 +23,14 @@ describe('text', function(){
     not(f.visible())
   })
   
+  it('should join strings', function(){
+    
+    f.text('blah',10,"nice");
+    
+    eq(f.text(), 'blah 10 nice');
+    
+  });
+  
   it('should draw', function(){
     f.text('m\nlinesdfsdfsdfsdsdfsdfsdfsdfsdfsfsf')
     is(f.draw(re.sys.context))

data/spec/javascripts/src/input/mouse_spec.js

@@ -10,13 +10,11 @@ describe('mouse', function(){
       var type = 'mousedown'
       var called, called2;
       
-      e.on(type, function(m, e){
+      e.on(type, function(x,y, e){
         called = true
-        is(m)
-        is(m.screenX)
-        is(m.screenY)
-        is(m.posX)
-        is(m.posY)
+        is(x)
+        is(y)
+        is(e)
       });
       
       e.on(type+':middle', function(m, e){
@@ -34,13 +32,11 @@ describe('mouse', function(){
       var type = 'mouseup'
       var called, called2;
       
-      e.on(type, function(m, e){
+      e.on(type, function(x,y, e){
         called = true
-        is(m)
-        is(m.screenX)
-        is(m.screenY)
-        is(m.posX)
-        is(m.posY)
+        is(x)
+        is(y)
+        is(e)
       });
       
       e.on(type+':middle', function(m, e){
@@ -60,13 +56,11 @@ describe('mouse', function(){
       var type = 'mousemove'
       var called;
       
-      e.on(type, function(m, e){
+      e.on(type, function(x,y, e){
         called = true
-        is(m)
-        is(m.screenX)
-        is(m.screenY)
-        is(m.posX)
-        is(m.posY)
+        is(x)
+        is(y)
+        is(e)
       });
       
       re.c('mouse').event({type:type, offsetX:0, offsetY:0})
@@ -79,13 +73,11 @@ describe('mouse', function(){
       var type = 'click'
       var called;
       
-      e.on(type, function(m, e){
+      e.on(type, function(x,y, e){
         called = true
-        is(m)
-        is(m.screenX)
-        is(m.screenY)
-        is(m.posX)
-        is(m.posY)
+        is(x)
+        is(y)
+        is(e)
       });
       
       re.c('mouse').event({type:type, offsetX:0, offsetY:0})
@@ -98,13 +90,11 @@ describe('mouse', function(){
       var type = 'dblclick'
       var called;
       
-      e.on(type, function(m, e){
+      e.on(type, function(x,y, e){
         called = true
-        is(m)
-        is(m.screenX)
-        is(m.screenY)
-        is(m.posX)
-        is(m.posY)
+        is(x)
+        is(y)
+        is(e)
       });
       
       re.c('mouse').event({type:type, offsetX:0, offsetY:0})
@@ -117,13 +107,11 @@ describe('mouse', function(){
       var type = 'contextmenu'
       var called;
       
-      e.on(type, function(m, e){
+      e.on(type, function(x,y, e){
         called = true
-        is(m)
-        is(m.screenX)
-        is(m.screenY)
-        is(m.posX)
-        is(m.posY)
+        is(x)
+        is(y)
+        is(e)
       });
       
       re.c('mouse').event({type:type, offsetX:0, offsetY:0})

data/spec/javascripts/src/math/bisect_spec.js

@@ -10,21 +10,21 @@ describe('bisect', function(){
 	});
   
   it('static biToX', function(){
-		eq(re.bisect.biToX(1, 160, 60), 60)
+		eq(re.bisect.toX(1, 160, 60), 60)
 	});
   
   it('static biToY', function(){
-		eq(re.bisect.biToY(1, 160, 60), 0)
+		eq(re.bisect.toY(1, 160, 60), 0)
 		
 	});
   
   it('static biToTileX', function(){
-		eq(re.bisect.biToTileX(1, 160, 60), 1)
+		eq(re.bisect.toTileX(1, 160, 60), 1)
 		
 	});
   
   it('static biToTileY', function(){
-		eq(re.bisect.biToTileY(1, 160, 60), 0)
+		eq(re.bisect.toTileY(1, 160, 60), 0)
 		
 	});
   

data/spec/javascripts/src/math/distance_spec.js

@@ -0,0 +1,11 @@
+describe('distance', function(){
+  
+  
+  it('distance', function(){
+    
+    eq(re.distance(10, 10, 20, 40) | 0, 31)
+    
+  });
+  
+  
+})

data/spec/javascripts/src/math/iso_spec.js

@@ -0,0 +1,131 @@
+describe('math/iso', function(){
+  
+  var e;
+  
+  beforeEach(function(){
+    re.iso.sizeX = 30;
+    re.iso.sizeY = 30;
+    re.iso.sizeZ = 30;
+    
+    e = re.e('iso');
+    
+  });
+  
+  it('toPos', function(){
+    var e = re.iso.toPos(125, 82)
+    
+    eq(e.posX, 90)
+    e = re.iso.toPos(125, 82)
+    eq(e.posY, 75)
+  })
+  
+  it('toPosX', function(){
+    
+    eq(re.iso.toIsoX(125, 82), 4)
+    eq(re.iso.toIsoY(125, 82), 1)
+    eq(re.iso.toPosX(125, 82), 90);
+    
+  })
+  
+  it('toPosY', function(){
+    eq(re.iso.toIsoX(65, 96), 3)
+    eq(re.iso.toIsoY(65, 96), 2)
+    
+    eq(re.iso.toPosY(65, 96), 75);
+    
+  })
+  
+  it('toIso', function(){
+    var e = re.iso.toIso(-9, 90)
+    
+    eq(e.isoX, 2)
+    
+    e = re.iso.toIso(-5, 30)
+    
+    eq(e.isoY, 1)
+  })
+  
+  it('toIsoX', function(){
+    
+    eq(re.iso.toIsoX(-9, 90), 2);
+  })
+  
+  it('toIsoY', function(){
+    
+    eq(re.iso.toIsoY(-5, 30), 1);
+  })
+  
+  it('should add correctly', function(){
+    
+    var oldX = e.isoX();
+    e.isoY(4);
+    
+    for(var i=0; i<8; i++){
+      e.isoY(e.isoY() + 0.25)
+    }
+    
+    eq(e.isoY(), 6);
+    eq(e.isoX(), oldX);
+    
+  });
+  
+  it('iso normal args', function(){
+    
+    eq(e.iso(2, 2, 2), e);
+    
+    eq(e.isoX(), 2)
+    eq(e.isoY(), 2)
+    eq(e.isoZ(), 2)
+    
+  })
+  
+  it('iso obj args', function(){
+    
+    eq(e.iso({x:2, y:2, z:2}), e);
+    
+    eq(e.isoX(), 2)
+    eq(e.isoY(), 2)
+    eq(e.isoZ(), 2)
+    
+  })
+  
+  it('iso copy other iso position', function(){
+    
+    var iso = re.e('iso');
+    iso.iso(2, 2, 2);
+    
+    eq(e.iso(iso), e);
+    
+    eq(e.isoX(), 2)
+    eq(e.isoY(), 2)
+    eq(e.isoZ(), 2)
+    
+  })
+  
+  it('isoX', function(){
+    eq(e.isoX(4), e);
+    
+    eq(e.isoX(), 4);
+    
+    eq(e.posX, 120)
+    eq(e.posY, 60)
+    
+  })
+  
+  it('isoY', function(){
+    eq(e.isoY(1), e);
+    
+    eq(e.isoY(), 1);
+    
+    eq(e.posX, -30)
+    eq(e.posY, 15)
+  })
+  
+  it('isoZ', function(){
+    
+    eq(e.isoZ(1), e);
+    
+    eq(e.isoZ(), 1);
+  })
+  
+});