entityjs 0.4.1 → 0.4.2

data/src/display/el.js

@@ -0,0 +1,99 @@
+/*
+The element comp creates and displays DOM elements. This can be used to display buttons, 
+images, icons etc. on top of the canvas element.
+
+re.e('el:a').$el //jquery element refence
+
+Jquery must be available to work!
+
+*/
+re.c('el')
+.requires('align')
+.defines({
+
+  posX:function(x){
+    if(re.is(x)){
+      return this.$el.css('left', x);
+    }
+
+    return this.$el.position().left;
+  },
+  
+  posY:function(y){
+    if(re.is(y)){
+      return this.$el.css('top', y);
+    }
+    return this.$el.position().top;
+  },
+  
+  sizeX:function(){
+    return this.$el.outerWidth();
+  },
+
+  sizeY:function(){
+    return this.$el.outerHeight();
+  },
+  
+  click:function(f){
+    var that = this;
+    this.$el.click(function(e){
+      f.call(that,e);
+      return false;
+    });
+    return this;
+  },
+
+  $:function(a,b){
+    return this.$el.find(a,b);
+  },
+
+  setEl:function(el){
+    this.remove();
+
+    this.el = el;
+    this.$el = $(el).addClass('el');
+
+    this.posX(0);
+    this.posY(0);
+    return this;
+  },
+
+  text:function(t){
+    if(re.is(t)){
+      this.$el.text(t);
+      return this;
+    }
+    return this.$el.text();
+  },
+
+  //places element to parent of canvas
+  place:function(){
+    $(re.sys.canvas).parent().append(this.el);
+    return this;
+  },
+
+  remove:function(){
+    if(this.$el){
+    	this.$el.remove();
+      this.$el = this.el = null;
+    }
+    return this;
+  },
+
+  hide:function(){
+    this.$el.hide();
+    return this;
+  },
+
+  show:function(){
+    this.$el.show();
+    return this;
+  }
+  
+})
+.init(function(e){
+  if(e) this.setEl(re.$new(e));
+})
+.dispose(function(){
+  this.remove();
+});

data/src/input/keyboard.js

@@ -111,7 +111,7 @@ re.c('keyboard')
 	.trigger('ctrl+k')
 	*/
 	event: function(e){
-		var that = re._c.keyboard;
+		var that = re.keyboard;
 		
     var tagName = (e.target || e.srcElement || {}).tagName;
     
@@ -151,11 +151,11 @@ re.c('keyboard')
 	}
 
 })
-.init(function(c){
+.init(function(){
 	//add to statics key array
-	c.l.push(this);
+	re.keyboard.l.push(this);
 })
-.dispose(function(c){
+.dispose(function(){
 	//remove from statics key array
-	c.l.splice(c.l.indexOf(this), 1);
+	re.keyboard.l.splice(re.keyboard.l.indexOf(this), 1);
 });

data/src/input/mouse.js

@@ -47,7 +47,7 @@ re.c('mouse')
             re.pressed.d[c] = (e.type == 'mousedown');
         }
     
-        re.c('mouse').event(e, c);
+        re.mouse.event(e, c);
         
     },
     
@@ -68,7 +68,7 @@ re.c('mouse')
         }
         
         
-        var listeners = re.c('mouse').l;
+        var listeners = re.mouse.l;
         
         /*
         if(re.preventDefault && re.preventDefault.d[key]){
@@ -76,17 +76,20 @@ re.c('mouse')
         }
         */
         
-        var c, t, obj;
+        var c, t, obj, tx, ty;
         for(var i=0; i<listeners.length; i++){
           t = listeners[i];
           if(t.screenable){
-            x = re.screen.toScreenX(x);
-            y = re.screen.toScreenY(y);
+            tx = re.screen.toScreenX(x);
+            ty = re.screen.toScreenY(y);
+          } else {
+            tx = x;
+            ty = y;
           }
           
           //offset mouse coordinates
-          var tx = x + t.offX;
-          var ty = y + t.offY;
+          tx += t.offX;
+          ty += t.offY;
           
           t.trigger(e.type, tx, ty, e);
           
@@ -102,6 +105,8 @@ re.c('mouse')
       re.listener('mousedown', this.press, c);
       re.listener('mouseup', this.press, c);
       re.listener('mousemove', this.event, c);
+      re.listener('mouseover', this.event, c);
+      re.listener('mouseout', this.event, c);
       re.listener('click', this.event, c);
       re.listener('dblclick', this.event, c);
       re.listener('contextmenu', this.event, c);
@@ -112,12 +117,12 @@ re.c('mouse')
   offX:0,
   offY:0
 })
-.init(function(c){
+.init(function(){
     //add to listener array
-    c.l.push(this);
+    re.mouse.l.push(this);
 })
-.dispose(function(c){
+.dispose(function(){
     //remove from listener array
     
-    c.l.splice(c.l.indexOf(this), 1);
+    re.mouse.l.splice(re.mouse.l.indexOf(this), 1);
 });

data/src/math/bisect.js

@@ -15,7 +15,7 @@ Note: width is called the bisect and the bi is the transformed x,y positions.
 
 
 */
-re.bisect = re.c('bisect')
+re.c('bisect')
 .statics({
 	
 	toX:function(bi, width, size){

data/src/math/force.js

@@ -20,7 +20,7 @@ e.hitmap == re.hitmap //true
 
 Warning - this component is not delta time safe. It assumes a fixed timestep.
 */
-re.force = re.c('force')
+re.c('force')
 .requires('update')
 .statics({
     graX:0,
@@ -125,13 +125,13 @@ re.force = re.c('force')
     }
     
 })
-.init(function(c){
+.init(function(){
     
     //setup defaults
     this.def({
       hitmap:re.hitmap,
-      graX:c.graX,
-      graY:c.graY
+      graX:re.force.graX,
+      graY:re.force.graY
     });
     
     this.on('update', this.force_update);

data/src/math/hitmap.js

@@ -164,4 +164,5 @@ re.c('hitmap')
         
     }
     
-});
+});
+re.hitmap = null; //remove default hitmap so force defaults to none

data/src/math/iso.js

@@ -1,4 +1,4 @@
-re.iso = re.c('iso')
+re.c('iso')
 .statics({
   sizeX:30,
   sizeY:30,

data/src/math/random.js

@@ -3,19 +3,34 @@ re.random() // 0 - 1 floats
 re.random(10) // 0 - 9 integer
 re.random(10, 30) // 10 - 30 integer
 re.random([1, 10, 40]) // 1 or 10 or 40
+re.random({ok:10, b:10, c:1}) //ok or b or c
 
 */
 re.random = function(max, min){
   var r = Math.random();
   if(re.is(max, 'array')){
     return max[r * max.length | 0];
+  } else if(re.is(max, 'object')){
+
+		var result;
+		for (var prop in max){
+			if (Math.random() < 1/++r || !re.is(result)){
+				result = prop;
+			}
+		}
+
+    return result;
   }
 		switch(arguments.length){
 			case 0:
 			return r;
 			case 1:
-			return r * max | 0;
+			return r * max;
 			case 2:
-			return r * (max - min + 1) + min | 0;
+			return r * (max - min + 1) + min;
   }
+};
+
+re.randomInt = function(){
+	return re.random.apply(this, arguments)|0;
 };

data/src/math/tile.js

@@ -41,7 +41,7 @@ Its recommended you avoid negative tile values
 
 TODO: remove size vars from entity. Use global size instead
 */
-re.tile = re.c('tile')
+re.c('tile')
 .statics({
     sizeX:40,
     sizeY:40,

data/src/media/sound.js

@@ -42,7 +42,7 @@ re('sound').method('play');
 This will be fixed with the channel component.
 
 */
-re.sound = re.c('sound')
+re.c('sound')
 .statics({
     
     enabled:true

data/src/pattern/pathfind.js

@@ -53,14 +53,12 @@ while(ints.length){
 }
 
 */
-re.pathfind = re.c('pathfind')
-.statics({
-  search:function(){
+re.c('pathfind')
+.method(function(){
     var p = re.e('pathfind');
     var path = p.pathfind.apply(p, arguments);
     p.dispose();
     return path;
-  }
 })
 .defines({
   

data/src/save/storage.js

@@ -10,7 +10,7 @@ re.e('storage:session');
 
 */
 re.c('storage')
-.init(function(c, type){
+.init(function(type){
 	this.storage = window[type+'Storage'];
 })
 .defines({

data/src/util/clone.js

@@ -0,0 +1,12 @@
+/*
+Clones the given object. This returns a shallow copy.
+*/
+re.clone = function(b){
+	if(!re.is('object')) return b;
+	if(re.is(b,'array')) return b.slice();
+	var o = {};
+	for(var i in b){
+		o[i] = b[i];
+	}
+	return o;
+};

data/src/util/scene.js

@@ -27,40 +27,45 @@ re.e('scene:game')
 })
 
 */
-re.scene = function(title){
-	var s = re.c('scene');
+
+re.c('scene')
+.statics({
+	
+	_scenes:{}
+	
+})
+.method(function(title){
+	var d = re.scene;
 	
   if(!re.is(title)){
-    return s._scenes[re.scene.current];
+    return d._scenes[re.scene.current];
   }
   
-	if(!s._scenes[title]){
+	if(!d._scenes[title]){
 		//add scene
 		re.e('scene:'+title);
 	}
 	
-	return s._scenes[title];
-};
-
-re.c('scene')
-.statics({
-	
-	_scenes:{}
-	
+	return d._scenes[title];
 })
-.init(function(c, title){
+.init(function(title){
 	
-	c._scenes[title] = this;
+	re.scene._scenes[title] = this;
 	this.sceneName = title;
 	
 })
-.dispose(function(c){
+.dispose(function(){
 	
-	delete c._scenes[this.sceneName];
+	delete re.scene._scenes[this.sceneName];
 	
 })
 .defines({
 	
+	clear:function(){
+		re('el').query('draw').dispose();
+		return this;
+	},
+
 	enter:function(title){
     if(!re.is(title, 'function')){
       

data/templates/circle/game.json

@@ -0,0 +1,16 @@
+{
+	//configure game settings
+  "width": 500,
+  "height": 400,
+  "canvas-id": "game-canvas",
+
+  //ignore entity scripts
+  "entity-ignore": "wait",
+  
+  "tests-ignore": null,
+  "scripts-ignore": null,
+  "tests-scripts-ignore":"init.js",
+
+  //order scripts
+  "order": null
+}

data/templates/circle/scripts/displays/circle.js

@@ -0,0 +1,40 @@
+/*
+A simple circle component. Keep in mind this is extending the default circle in the
+game engine.
+
+A circle can be created on of two ways:
+
+re.e('circle');
+
+or through a factory:
+
+re.circle(10, "#00CCFF");
+
+*/
+re.c('circle')
+.factory(function(radius, color){
+	//this is called when using re.circle()
+	this.radius = radius;
+	this.color = color;
+})
+.requires('align update')
+.defines({
+	//define properties
+  speed:15,
+  color:'#ff0000'
+})
+.events({
+
+	//adds a listener for updates
+	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;
+    
+	}
+
+});