entityjs 0.3.1 → 0.3.2

data/src/math/drag.js

@@ -24,9 +24,9 @@ re.c('drag')
     return this;
 	},
 	
-	dragEnd:function(){
+	dragFinish:function(){
 		this.dragging = false;
-    return this.trigger('drag:end');
+    return this.trigger('drag:finish');
 	},
 	
 	dragUpdate:function(x, y){

data/src/math/force.js

@@ -85,11 +85,11 @@ re.force = re.c('force')
         this.posY = posy;
         
         if(hitx){
-            this.velX = this.forceRes(this.velX, this.resX);
+          this.velX = this.forceRes(this.velX, this.resX);
         }
         
         if(hity){
-            this.velY = this.forceRes(this.velY, this.resY);
+          this.velY = this.forceRes(this.velY, this.resY);
         }
         
         return this.trigger('aftermath', hitx, hity, tarx, tary);

data/src/math/hit.js

@@ -11,21 +11,30 @@ re.c('hit')
 	checks if the two targets intersect with each other.
 	
 	k.hit(x, y, width, height);
-	
+	k.hit(entity);
+  
 	*/
-	hit:function(x, y, w, h){
+	hit:function(x, y, w, h, rx, ry){
     if(re.is(x, 'object')){
       y = x.posY || x.y;
       w = x.sizeX || x.w;
       h = x.sizeY || x.h;
+      rx = x.regX || 0;
+      ry = x.regY || 0;
       x = x.posX || x.x;
     }
+    
+    rx = rx || 0;
+    ry = ry || 0;
+    var regX = this.regX || 0;
+    var regY = this.regY || 0;
+    
 		return !
 		(
-		x > this.posX + this.sizeX ||
-		x + w < this.posX ||
-		y > this.posY + this.sizeY ||
-		y + h < this.posY
+		x - rx > this.posX + this.sizeX - regX ||
+		x + w - rx < this.posX - regX ||
+		y - ry > this.posY + this.sizeY - regY ||
+		y + h - ry < this.posY - regY
 		);
 	}
 	

data/src/math/hitmap.js

@@ -108,11 +108,11 @@ re.c('hitmap')
                 
                 for(ty = firsty; ty<lasty; ty++){
                     
-                    if(this.map[ty]){
+                    if(this._automap[ty]){
                         
-                        this.trigger('hit', this.map[ty][tx], tx, ty);
+                        this.trigger('hit', this._automap[ty][tx], tx, ty);
                         
-                        if(this.checkAxisX(this.map[ty][tx], x, y, vx, vy)) {
+                        if(this.checkAxisX(this._automap[ty][tx], x, y, vx, vy)) {
                             res.hitX = true;
                             res.posX = tx * t + offx  - offsetx;
                             res.tarX = tx * t;
@@ -142,11 +142,11 @@ re.c('hitmap')
                     
                 for(tx = firstx; tx<lastx; tx++) {
                     
-                    if(this.map[ty]){
+                    if(this._automap[ty]){
                         
-                        this.trigger('hit', this.map[ty][tx], tx, ty);
+                        this.trigger('hit', this._automap[ty][tx], tx, ty);
                         
-                        if(this.checkAxisY(this.map[ty][tx], x, y, vx, vy)) {
+                        if(this.checkAxisY(this._automap[ty][tx], x, y, vx, vy)) {
                             res.hitY = true;
                             res.posY = ty * t + offy - offsety;
                             res.tarX = tx * t;

data/src/math/point.js

@@ -25,7 +25,7 @@ re.c('point')
         return this;
     },
     
-    distanceTo:function(x, y){
+    distance:function(x, y){
         if(re.is(x,'object')){
             y = x.posY || x.y;
             x = x.posX || x.x;

data/src/math/tile.js

@@ -37,7 +37,7 @@ re.e('tile sprite tiles.png', map.length * map[0].length)
 });
 
 @warning moving to negative tiles will cause rounding issues.
-Its recommended you avoid negative maps
+Its recommended you avoid negative tile values
 
 */
 re.tile = re.c('tile')
@@ -74,18 +74,17 @@ re.tile = re.c('tile')
     
 })
 .init(function(){
-  this.def({
-    sizeX:re.tile.sizeX,
-    sizeY:re.tile.sizeY
-  });
+  this.sizeX = re.tile.sizeX;
+  this.sizeY = re.tile.sizeY;
   
 })
 .defines({
 
     tile:function(x, y){
       if(re.is(x,'object')){
-        y = x.posY || x.y;
-        x = x.posX || x.x;
+        //will mess up if regX is not top right corner
+        y = x.y || re.tile.toTileY(x.posY);
+        x = x.x || re.tile.toTileX(x.posX);
       }
       this.tileX(x);
       this.tileY(y);
@@ -93,19 +92,25 @@ re.tile = re.c('tile')
     },
     
     tileX:function(v){
-        if(re.is(v)){
-          this.posX = v * this.sizeX;
-            return this;
-        }
-        return re.tile.toTileX(this.posX, this.sizeX);
+      var s = this.sizeX || re.tile.sizeX;
+      var r = this.regX || 0;
+      if(re.is(v)){
+        this.posX = (v - r) * s;
+        return this;
+      }
+      
+      return (this.posX - r) / s + 0.5 | 0;
     },
     
     tileY:function(v){
-        if(re.is(v)){
-            this.posY = v * this.sizeY; 
-            return this;
-        }
-        return re.tile.toTileY(this.posY, this.sizeY);
+      var s = this.sizeX || re.tile.sizeY;
+      var r = this.regY || 0;
+      if(re.is(v)){
+        this.posY = (v - r)* s;
+        return this;
+      }
+      
+      return (this.posY - r) / s + 0.5 | 0;
     }
     
 });

data/src/media/sound.js

@@ -56,7 +56,7 @@ re.sound = re.c('sound')
   
   ended:function(){
     
-    this.trigger('sound:end');
+    this.trigger('sound:finish');
     
   }
   

data/src/pattern/automap.js

@@ -36,10 +36,10 @@ map.lenY
 re.c('automap')
 .defaults({
 	lenX:0,
-	lenY:0
+	lenY:0,
+	automapDefault:0
 })
 .defines({
-	value:0,
 	
 	automap:function(x, y, value){
     if(re.is(x, 'array')){
@@ -47,7 +47,7 @@ re.c('automap')
       if(y){
         //non-deep copy
 		  
-		    this.map = x;
+		    this._automap = x;
 		
     		if(x.length > 0){
     			this.lenX = x[0].length;
@@ -72,38 +72,38 @@ re.c('automap')
     
     if(!re.is(value)){
         if(this.within(x,y)){
-            return this.map[y][x];
+            return this._automap[y][x];
         }
         return null;
     }
     
 			//increate y length
-			while(y >= this.map.length){
-				var m = new Array(this.map[0]);
+			while(y >= this._automap.length){
+				var m = new Array(this._automap[0]);
 				
 				for(var l in m){
-					m[l] = this.value;
+					m[l] = this.automapDefault;
 				}
 				
-				this.map.push(m);
+				this._automap.push(m);
 				
 			}
 			
 			//increase x length
-			while(x >= this.map[this.map.length-1].length){
+			while(x >= this._automap[this._automap.length-1].length){
 				
-				for(var k=0; k<this.map.length; k++){
-          if(this.map[k].length <= x){
-  					this.map[k].push(this.value);
+				for(var k=0; k<this._automap.length; k++){
+          if(this._automap[k].length <= x){
+  					this._automap[k].push(this.automapDefault);
           }
 				}
 				
 			}
 			
-			this.lenX = this.map[y].length;
-			this.lenY = this.map.length;
+			this.lenX = this._automap[y].length;
+			this.lenY = this._automap.length;
 			
-			this.map[y][x] = value;
+			this._automap[y][x] = value;
 			
 			return this;
 	},
@@ -114,20 +114,9 @@ re.c('automap')
 			return false;
 		}
 		return true;
-	},
-	
-	copy:function(a){
-		
-		return this;
-	},
-	
-	copyByRef:function(m){
-		
-		
-		return this;
 	}
 	
 })
 .init(function(){
-	this.map = [];
+	this._automap = [];
 });

data/src/pattern/flicker.js

@@ -27,7 +27,7 @@ re.c('flicker')
 			
 		this.off('update', this.flicker_update);
     
-		return this.trigger('flicker:end', o);
+		return this.trigger('flicker:finish', o);
 	},
 	
 	flicker_update:function(t){
@@ -69,7 +69,6 @@ re.c('flicker')
 		if(re.is(id, 'object')){
 			
 			for(var i in id){
-				if(!id.hasOwnProperty(i)) continue;
 					
 					//copy formed array and insert
 					var c = id[i].slice();
@@ -101,7 +100,6 @@ re.c('flicker')
 		if(re.is(id,'object')){
 			
 			for(var i in id){
-				if(!id.hasOwnProperty(i)) continue;
 				
 				this.removeFlicker.call(this, id[i]);
 			}
@@ -166,14 +164,20 @@ re.c('flicker')
 		//copy from saved animation or newly given
 		c.loops = (isNaN(loops))? r.loops : loops;
 		c.duration = (isNaN(duration))? r.duration : duration;
+    
+    //convert to seconds
+    if(c.duration >= 30){
+      c.duration /= 1000;
+    }
+    
 		c.frames = (re.is(frames,'object'))? frames : r.frames;
 		
 		//setup counter for loops
 		this.flicker_loops = c.loops;
 		
 		this.stepProgress = 0;
-		this.stepSize = c.duration / c.frames.length / 1000;
-		
+		this.stepSize = c.duration / c.frames.length;
+    
 		//save old frames for upon completion
 		
 		this.flicker_frame = 0;

data/src/util/random.js

@@ -5,9 +5,13 @@ The random component implements two helper methods for calculating random number
 re.random() // 0 - 1
 re.random(10) // 0 - 9
 re.random(10, 30) // 10 - 30
+re.random([1, 10, 40]) // 1 or 10 or 40
 
 */
 re.random = function(max, min){
+  if(re.is(max, 'array')){
+    return max[Math.random() * max.length | 0];
+  }
     var r = Math.random();
 		switch(arguments.length){
 			case 0:

data/src/util/scene.js

@@ -65,14 +65,14 @@ re.c('scene')
     if(!re.is(title, 'function')){
       
       if(re.scene.current)
-      re.scene().exit(title);
+      re.scene().exit();
       
       //set current scene
   		re.scene.current = this.sceneName
   		
       if(this.scene_enter)
     		this.scene_enter.apply(this, arguments);
-      return this;
+        
     } else {
       //set new enter method
   		this.scene_enter = title;
@@ -86,10 +86,6 @@ re.c('scene')
       
       re.scene.current = '';
       
-  		if(re.is(this.scene_exit, 'function')){
-  			this.scene_exit.apply(this, arguments);
-  		}
-      
       if(this.scene_exit)
       this.scene_exit.apply(this, arguments);
     } else {

data/templates/arrow_keys/tests/{display → displays}/arrow_test.js

@@ -14,7 +14,7 @@ test('keys move arrow', function(){
   
   //mock/stub methods in qunit/qunit.mock.js
   //expects 4 calls to frame
-  expectCall(arrow, 'frame', 4);
+  expectCall(arrow, 'frame', null, 4);
   
   //simulate keypress / mouse clicks with qunit/qunit.input.js
   //dispatches a keydown on each key, calls the given method

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

@@ -13,4 +13,6 @@ test('load assets', function(){
   //the home scene should then call start()
   stop();
   
+  expect(0);
+  
 });

data/templates/circle/scripts/init.js

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

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

@@ -0,0 +1,62 @@
+re.scene('home')
+.enter(function(){
+  
+  //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
+  .alignHor()
+  .alignVer()
+  .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);
+  
+  //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/circle/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/circle/tests/scenes/home_test.js

@@ -0,0 +1,29 @@
+module('scenes/home', {
+  setup:function(){
+    re.scene('home').enter();
+  }
+});
+
+test('entities should exist', function(){
+  
+  var circle = re('circle')[0];
+  
+  is(circle);
+  
+  //has update listener
+  expectEvent(circle, 'update');
+  
+  var xBefore = circle.posX;
+  
+  //moves upon keypress
+  keypress('a', function(){
+    //key is currently down, so call update method
+    circle.trigger('update');
+  });
+  
+  //check if the circle moved
+  ok(xBefore != circle.posX);
+  
+  //text exists
+  is(re('text')[0]);
+});

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

@@ -0,0 +1,15 @@
+module('scenes/load');
+
+test('load stuff', function(){
+  
+  stop();
+  
+  stub(re.scene('home'), 'enter', function(){
+    start();
+  });
+  
+  re.scene('load').enter();
+  
+  
+  expect(0);
+});

data/templates/platform/config.yml

@@ -9,6 +9,7 @@ scripts-ignore:
   
 #specify files to be loaded first in /scripts
 order:
+  .*\.js
   
 #components to ignore in the entityjs source
 #reduce file size by ignoring unused components
@@ -19,4 +20,4 @@ entity-ignore:
 
 #ignore tests in /tests
 tests-ignore:
-  
+  

data/templates/platform/readme.txt

@@ -9,34 +9,33 @@ Contains all sounds, images and data files. Place all sounds in the sounds direc
 and all the images in the images directory. These directories will be looked at
 and an asset array will be created for easy asset loading (see scripts/scenes/load.js)
 
-Creating any other directory or placing files in the levels directory will be seen
-as data files and will be read and automatically put in js files.
+## /builds
 
-For example, if I have a directory like /assets/animations/monster.json.
+Contains assets and minified code for the game.
 
-The file will automatically be read upon calling 'entityjs refresh' and will be turned into this:
+## /scripts
 
-re.e('monster.json animation')
-.attr(**Animation JSON here**);
+Contains javascripts and coffeescripts for the game.
 
-Which means you can edit files in different programs and not worry about copying and pasting
-the contents. Just run entityjs refresh.
 
-At the moment only JSON is supported but in the future, XML, YAML, CSV and TMX will be supported.
-TMX is a special XML format for a tile map editor.
+Data files such as xml, json or tmx will be read and automatically compiled into js files.
 
-## /builds
+For example, if I have a directory like /scripts/animations/monster.json.
 
-Contains assets and minified code for the game.
+The file will be turned into this:
 
-## /scripts
+re.e('monster.json animation')
+.attr(**Animation JSON here**);
 
-Contains javascripts for the game.
+Which means you can edit files in different programs and not worry about copying and pasting
+the contents.
+
+TMX is a special XML format for a tile map editor.
 
 ## /tests
 
 Contains tests for the game. It is good practice to keep this structured exactly the same as the scripts
-directory.
+directory. Tests can also be in coffeescript.
 
 ## /tmp
 
@@ -84,4 +83,4 @@ entityjs refresh
 or
 entityjs r
 
-Creates a file called game.debug.js inside /tmp
+Creates a file called game.debug.js inside /tmp

data/templates/platform/tests/{display → displays}/bit_test.js

@@ -2,6 +2,6 @@ module('bit', lazy('bit'));
 
 test('valid', function(){
   
-  ok(e.has('bit.png align'));
+  ok(bit.has('bit.png align'));
   
 });