entityjs 0.3.2 → 0.4.0

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

@@ -36,7 +36,7 @@ describe('point', function(){
   it('should be correct distance', function(){
     e.posX = 12;
     e.posY = 54;
-    eq(e.distance(23,74), 23)
+    eq(e.distance(23,74)+0.5|0, 23)
   })
   
   it('should be correct distance with from', function(){
@@ -46,12 +46,12 @@ describe('point', function(){
     
     var o = {x:23, y:74}
     
-    eq(e.distance(o), 23)
+    eq(e.distance(o) +0.5 | 0, 23)
     
     
     o = {posX:23, posY:74}
     
-    eq(e.distance(o), 23)
+    eq(e.distance(o)+0.5|0, 23)
   })
   
 });

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

@@ -0,0 +1,9 @@
+describe('math/range', function(){
+  
+  it('should return range',function(){
+    var i = re.range(0, 2, 1);
+    
+    eq(i, [0, 1])
+  })
+
+})

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

@@ -9,27 +9,42 @@ describe('tile', function(){
 		e = re.e('tile');
 	});
 
-	it('toX', function(){
+  
+  it('toPos', function(){
+    var e = re.tile.toPos(88, 40);
+    
+    eq(e.posX, 80);
+    eq(e.posY, 40);
+  })
+  
+	it('toPosX', function(){
 		
-    eq(re.tile.toX(88, 40), 80);
+    eq(re.tile.toPosX(88, 40), 80);
     
     re.tile.sizeX = 40;
-    eq(re.tile.toX(88), 80);
+    eq(re.tile.toPosX(88), 80);
     
 	});
 
-  it('toY', function(){
+  it('toPosY', function(){
     
-    eq(re.tile.toY(88, 40), 80);
+    eq(re.tile.toPosY(88, 40), 80);
     
     re.tile.sizeY = 40;
-    eq(re.tile.toY(88), 80);
+    eq(re.tile.toPosY(88), 80);
     
   });
   
+  it('toTile', function(){
+    var e = re.tile.toTile(88, 40);
+    
+    eq(e.tileX, 2);
+    eq(e.tileY, 1);
+  })
+  
   it('toTileX', function(){
     
-    eq(re.tile.toTileX(88, 40), 2);
+    eq(re.tile.toTileX(88), 2);
     
     re.tile.sizeX = 40;
     eq(re.tile.toTileX(88), 2);

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

@@ -37,7 +37,7 @@ describe('automap', function(){
     [6,5,4,3,2,1]
     ];
     
-    is(e.automap(level))
+    is(e.automap(level, true))
     eq(e.lenX, level[0].length)
     eq(e.lenY, level.length)
     
@@ -54,7 +54,7 @@ describe('automap', function(){
     [6,5,4,3,2,1]
     ];
     
-    is(e.automap(level, true))
+    is(e.automap(level))
     eq(e.lenX, level[0].length)
     eq(e.lenY, level.length)
     

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

@@ -13,32 +13,15 @@ describe('flicker', function(){
     .comp('flicker');
     
 	});
-
-	it('addFlicker', function(){
-		
-    e.addFlicker('heal', 5, 200, [10])
-    
-    is(e.flicker_reels['heal'])
-    
-	});
-  
-  it('removeFlicker', function(){
-    
-    is(e.addFlicker('heal', 5, 200, [10]))
-    
-    is(e.flicker_reels['heal'])
-    
-    is(e.removeFlicker('heal'))
-    
-    eq(e.flicker_reels['heal'], null)
-  })
   
   it('flicker', function(){
     
-    e.addFlicker('heal', 2, 100, [5, 5])
+    //should take 4 seconds to finis
+    var time = 4;
     
     var called = false;
     var called2 = false;
+    var called3 = false;
     
     e.on('flicker:start', function(){
       called = true;
@@ -47,8 +30,15 @@ describe('flicker', function(){
       called2 = true;
       is(v, 'string')
     })
+    .on('flicker:update', function(f, i, array, loop){
+      is(f)
+      is(i)
+      is(array)
+      is(loop)
+      called3 = true;
+    })
     
-    e.flicker('heal')
+    e.flicker(time, [5, 5, 5, 5], 1, 'heal')
     
     ok(e.flickering('heal'))
     
@@ -57,11 +47,33 @@ describe('flicker', function(){
     ok(called)
     
     //manually call update
-    e.flicker_update(0.9)
+    
+    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);
+    }
     
     eq(e.health, 20)
       
     ok(called2)
+    ok(called3)
+  })
+  
+  it('should flicker correctly', function(){
+    
+    e.flicker(1, [5]);
+    
+    eq(e.health, 5)
+    
+    for(var i=60;i--;){
+      e.flicker_update(re.sys.stepSize);
+      eq(e.health, 5);
+    }
+    
   })
   
 });

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

@@ -0,0 +1,55 @@
+describe('pattern/pathfind', function(){
+  
+  var map, pathfind, automap;
+  
+  beforeEach(function(){
+    //zero is walkable
+    map = 
+    [
+    [0,0,0,0,0],
+    [0,1,0,0,0],
+    [0,0,0,1,0]
+    ];
+    
+    //supplies within method
+    automap = re.e('automap').automap(map);
+    
+    pathfind = re.e('pathfind');
+    
+    //implement custom check method
+    pathfind.checkNode = function(x, y){
+      return automap.within(x, y) && automap.automap(x, y) == 0;
+    };
+    
+  });
+  
+  it('should move on self', function(){
+    
+    var path = pathfind.pathfind(0, 0, 0, 0);
+    
+    eq(path.length, 2)
+    
+  })
+  
+  it('should move up one tile', function(){
+    
+    var path = pathfind.pathfind(0, 0, 0, 1);
+    
+    eq(path.length, 2);
+    
+    eq(path.pop(), 1);
+    
+  });
+  
+  it('should navigate around 1s', function(){
+    
+    var path = pathfind.pathfind(0, 1, 2, 1);
+    
+    //first int is Y
+    path.pop();
+    //second is X
+    not(path.pop(), 1);
+    
+  });
+  
+});

data/src/core/comp.js

@@ -37,6 +37,7 @@
         this._re_signals = {};
         this._re_inherits = {};
         this._re_defines = {};
+        this._re_events = {};
         this._re_final = false;
     };
     
@@ -61,14 +62,10 @@ re.c.init.prototype = {
         }
     },
     
-    global:function(){
-        throw 'Deprecated use statics'
-    },
-    
     statics:function(obj, value){
         this._checkFinal();
         
-        if(arguments.length == 1){
+        if(!re.is(value)){
             
             for(var type in obj){
                 this[type] = obj[type];    
@@ -81,8 +78,20 @@ re.c.init.prototype = {
         return this;
     },
     
-    require:function(){
-        throw 'Deprecated use requires'
+    events:function(obj, value){
+      this._checkFinal();
+      
+      if(!re.is(value)){
+          
+          for(var type in obj){
+              this._re_events[type] = obj[type];    
+          }
+          
+      } else {
+          this._re_events[obj] = value;    
+      }
+      
+      return this;
     },
     
     requires:function(r){
@@ -184,10 +193,6 @@ re.c.init.prototype = {
       return re.e.init.prototype.trigger.apply(this, arguments);
     },
     
-  inherit:function(){
-    throw 'Deprecated use defaults'
-  },
-  
     /*
     Default adds onto but doesn't overwrite values.
     */
@@ -246,11 +251,6 @@ re.c.init.prototype = {
         return this;
     },
     
-    extend:function(){
-        this.defines.apply(this, arguments);
-        re.log('warning extend is deprecated, use defines');
-    },
-    
     /*
     defines overrides everything.
     */

data/src/core/entity.js

@@ -81,37 +81,38 @@
         //handle string or array?
         if(re.is(com,'array')){
             pieces = com;
-            
-            com = com[0];
         } else {
             pieces = com.split(' ');
         }
         
         if(pieces.length > 1){
             
-            for(var k in pieces){
-                this._re_comp(pieces[k]);    
-            }
+          var k;
+          while(k = pieces.shift()){
+            this.removeComp(k);
+          }
             
             return this;
+        } else {
+          com = pieces[0];
         }
         
-        var c = re._c[com];
-        
-        if(!this.has(com)) return this;
-        
-        //remove from array
-        this._re_comps.splice(this._re_comps.indexOf(com), 1);
-        
-        //only remove if it exists
-        if(c){
-            
-            if(c._re_dispose){
-                c._re_dispose.call(this, c);
-            }
-            
-            c.trigger('dispose', this);
-            
+        if(this.has(com)){
+          
+          var c = re._c[com];
+          //only remove if it exists
+          if(c){
+              
+              if(c._re_dispose){
+                  c._re_dispose.call(this, c);
+              }
+              
+              c.trigger('dispose', this);
+              
+          }
+  
+          //remove from array
+          this._re_comps.splice(this._re_comps.indexOf(com), 1);
         }
         return this;
     };
@@ -136,8 +137,6 @@
         //handle array or string?
         if(re.is(com, 'array')){
             pieces = com;
-            //set in case length is 1
-            com = com[0];
         } else {
             pieces = com.split(' ');
         }
@@ -147,8 +146,12 @@
                 this._re_comp(pieces[i]);
             }
             return this;
+        } else {
+          com = pieces[0];
         }
         
+        if(!com) return this;
+        
         //component reference
         var c;
         
@@ -163,7 +166,7 @@
         vals[0] = c;
         
         //if already has component
-        if(this.has(com)) return this;
+        if(!this.has(com)){
         
         //add comp first thing, to avoid dupe requirement calls
         //and this lets the init remove the comp too.
@@ -195,6 +198,10 @@
             if(c._re_defines){
                 this.attr(c._re_defines);
             }
+            if(c._re_events){
+              this.attr(c._re_events)
+              .on(c._re_events);
+            }
             
             if(c._re_init){
                 c._re_init.apply(this, vals);
@@ -203,7 +210,7 @@
             c.trigger('init', this);
         }
         
-        
+      }
         
     
         return this;
@@ -313,7 +320,6 @@
     };
     
     /*
-    New way to add signals version 0.2.1.
     
     //single
     bind('draw', function(){});
@@ -327,14 +333,13 @@
         
     });
     */
-    p.on = function(type, method){
+    p.on = function(type, method, context){
         
         if(re.is(type, 'object')){
             
-            for(var k in type){
-              if(type.hasOwnProperty(k))
-                this.on(k, type[k]);
-            }
+          for(var k in type){
+            this.on(k, type[k], method);
+          }
             
         } else {
             
@@ -342,7 +347,8 @@
                 this._re_signals[type] = [];
             }
             if(!re.is(method)) throw 'Method is null'
-            this._re_signals[type].push(method);
+            //save context
+            this._re_signals[type].push({c:context || this, f:method});
             
         }
         
@@ -382,7 +388,7 @@
                var i = this._re_signals[type];
                 for(var k in i){
                 
-                    if(i.hasOwnProperty(k) && i[k] == method){
+                    if(i[k].f == method){
                         i.splice(k, 1);
                     }
                     
@@ -403,13 +409,10 @@
     
     /*
     Signal dispatches events to entities. 
-    Modified V0.3
-    
     
     -dispatch signals
     this.trigger('click');
-    this.trigger('click draw');
-    this.trigger('click', {data:0});
+    this.trigger('click', 0);
     
     */
     p.trigger = function(type){
@@ -424,8 +427,8 @@
             if(!b) break;
             if(!b[i]) continue;
             
-            //return false remove?
-            if(b[i].apply( (b[i].c)?b[i].c : this , Array.prototype.slice.call(arguments, 1)) === false){
+            //return false remove
+            if(b[i].f.apply(b[i].c, Array.prototype.slice.call(arguments, 1)) === false){
                 b.splice(i, 1);
             }
             
@@ -443,8 +446,9 @@
             }
             
         }else {
+          var k = 'function';
             //defines property
-            if(re.is(this[obj], 'function') && !re.is(value, 'function')){
+            if(re.is(this[obj], k) && !re.is(value, k)){
                 if(re.is(value, 'array')){
                     this[obj].apply(this, value);
                 } else {
@@ -469,7 +473,7 @@
         } else {
             //defines property
             
-            if(!this.hasOwnProperty(obj) || !re.is(this[obj])){
+            if(!re.is(this[obj])){
                 
                 this[obj] = value;    
                 
@@ -480,22 +484,19 @@
     }
     
     p.dispose = function(){
-        //delete from statics array
-        re._e.splice(re._e.indexOf(this), 1);
+      var dis = 'dispose';
         
-        for(var i in this._re_comps){
-          var k = re.c(this._re_comps[i]);
-          if(k._re_dispose){
-              k._re_dispose.call(this, k);
-          }
-          k.trigger('dispose', this);
-        }
+        //trigger dispose on all components
+        this.removeComp(this.comps());
         
-        this.trigger('dispose');
+        this.trigger(dis);
         
         //remove all events
         this.off();
         
+        //delete from statics array
+        re._e.splice(re._e.indexOf(this), 1);
+        
         return this;
     }