entityjs 0.4.2 → 0.4.3

data/README.md

@@ -3,11 +3,15 @@ An HTML5 javascript game engine utlizing the entity-component design. Write high
 
 [EntityJS Website](http://entityjs.com) | [Demos](http://entityjs.com/demos) | [Tutorials](http://entityjs.com/tutorials) | [API](http://entityjs.com/api)
 
-## Version 0.3.2
+## Version 0.4.2
 
-* Coffeescript is now supported.
-* Assets directory is now used for external loading only.
-* Scripts directory now accepts, tmx, xml, json and coffee files.
+* Stylesheets are now automatically included. Place css in the styles folder.
+* Factory method added to comp.
+* El comp can place elements on top of canvas.
+* Converted config.yml to game.json.
+* Attributes inside game.json are available in js.
+* Use `entityjs html` make changes to the html.
+* Builds folder removed and replaced with a single build.
 
 ## API
 Currently the [API](http://entityjs.com/api) is out of date. It will slowly be updated everyday.
@@ -83,7 +87,7 @@ To play visit:
 `localhost:2345`
 
 To run tests visit:
-`localhost:2345/tests`
+`localhost:2345/test`
 
 Assets are located here:
 `localhost:2345/assets/*name`
@@ -96,24 +100,16 @@ View [all commands](/bendangelo/EntityJS/wiki/commands)
   * Images - Add any images here and retrieve them with `re.assets.images`
   * Sounds - Add any sounds and retrieve them with `re.assets.sounds`
 
-* Builds - Contains all finished builds
+* Build - Contains built game
 
 * Scripts - Contains all js, coffee sources. Xml, tmx and json files will be converted into js.
   * Plugins - Contains minified scripts for plugin play.
 
 * Tests - Contains test files to run in [QUnit](http://docs.jquery.com/QUnit)
 
-* config.yml - Optional, simple configuration.
-* readme.txt - Optional, simple description of the game.
-  
-## Changes In V0.3
-
-* `Inherit()` is now `defaults()`
-* `Extend()` is now `defines()`
-* `Inherit()` on entities is now `def()`
-* `Extend()` on entities is now `attr()`
+* Styles - Contains all css to be included. Will support sass and others later on.
 
-There are many more name changes, make sure to read the component source code for help. Most components have a usage example to help you along while the API / tutorials get up to date.
+* game.json - Optional, configurate scripts order, ignore certain files, etc
 
 ### Short getters and setters
 
@@ -131,11 +127,35 @@ There are many more name changes, make sure to read the component source code fo
     //or
     tile.attr('tile', [1,2]); //samething
   
-### Signals Changed to on/off
+### Factories in 0.4.2
+
+All components now have a factory method which can be used to create complex entities.
+
+    re.c("button")
+    .factory(function(label, click){
+      this.label = label;
+
+      if(click){
+        this.on('click', click);
+      }
+    });
+
+    re.button("Hello", function(){
+      alert(this.label+" clicked!");
+    });
+
+    //Can be overwritten using the `method` function. A singleton is created below.
+    
+    re.c("player")
+    .method(function(){
+      if(!this.instance){
+        this.instance = re.e('player');
+      }
+      return this.instance;
+    });
 
-* `addSignal()` is now `on()`
-* `removeSignal()` is now `off()`
-* `signal()` is now `trigger()`
+    //get player
+    re.player();
 
 ## QUnit Testing
 

data/entityjs.gemspec

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

data/lib/entityjs/commands/build.rb

@@ -19,6 +19,7 @@ module Entityjs
       images_folder = Config.images_folder
       sounds_folder = Config.sounds_folder
       scripts_folder = Config.scripts_folder
+      styles_folder = Config.instance.build_styles_path
       
       final_name = Config.instance.build_name+'.js'
       html_name = 'play.html'
@@ -60,7 +61,9 @@ module Entityjs
       end
       
       #save css
-      File.open(Config.instance.build_styles_path+"/"+Config.instance.build_styles_name+'.css', 'w') do |f|
+      Dirc.create_dir(styles_folder)
+
+      File.open(styles_folder+"/"+Config.instance.build_styles_name+'.css', 'w') do |f|
         f.write(css)
       end
       
@@ -98,7 +101,7 @@ module Entityjs
       
       puts "Build Complete!"
       puts "Build is at"
-      puts "  #{File.expand_path(build_folder)}"
+      puts "  #{build_folder}"
       
       Dirc.to_game_root
       

data/lib/entityjs/commands/server.rb

@@ -14,7 +14,7 @@ module Entityjs
       puts "  http://localhost:2345/"
       puts ""
       puts "Your tests are here:"
-      puts "  http://localhost:2345/tests"
+      puts "  http://localhost:2345/test"
       puts ""
       
       Entityjs::Server.run! :port=>2345
@@ -72,4 +72,4 @@ module Entityjs
     
   end
   
-end
+end

data/lib/entityjs/config.rb

@@ -94,7 +94,7 @@ module Entityjs
     end
 
     def scripts_order
-      return split_attr('order')
+      return split_attr('scripts-order')
     end
     
     def tests_ignore

data/lib/entityjs/version.rb

@@ -1,3 +1,3 @@
 module Entityjs
-  VERSION = "0.4.2"
+  VERSION = "0.4.3" unless const_defined? :VERSION
 end

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

@@ -30,6 +30,16 @@ describe('comp', function(){
     eq(re[k.name](val).ref, val);
 
   });
+
+  it('should overwrite method', function(){
+
+
+    k.method(function(){
+      eq(this, re[k.name]);
+    });
+
+    re[k.name]();
+  });
   
   it('should add events', function(){
     k.events('mouseup', function(){})

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

@@ -3,7 +3,7 @@ describe('load', function(){
     it('load', function(){
         //add images
         re.load.path = '__spec__/'
-        var img = 'helpers/accept.png'
+        var img = '/__spec__/helpers/accept.png'
         var sfx = 'helpers/alligator.mp3'
         var sfx2 = 'helpers/alligator.ogg'
         

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

@@ -325,6 +325,7 @@ describe('query', function(){
         eq(e, this)
         return t == 10;
         }), 10);
+      
     })
     
     it('isEmpty', function(){

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

@@ -14,7 +14,7 @@ describe('bisect', function(){
 	});
   
   it('static biToY', function(){
-		eq(re.bisect.toY(1, 160, 60), 0)
+		eq(re.bisect.toY(1, 160, 60, 60), 0)
 		
 	});
   

data/spec/lib/entityjs/commands/new_spec.rb

@@ -13,7 +13,7 @@ describe 'new' do
     Entityjs::New.generate(['mygame', 'blank']).should == 0
     Dir.pwd.should match /\/EntityJS$/i
     
-    File.exists?('mygame/config.yml').should == true
+    File.exists?('mygame/game.json').should == true
     File.exists?('mygame/readme.txt').should == true
   end
   

data/spec/support/mygame.rb

@@ -12,5 +12,5 @@ def setup_mygame
 end
 
 def teardown_mygame
-  Dir.chdir('..')
+  Dir.chdir('..') if Entityjs::Dirc.game?
 end

data/src/core/comp.js

@@ -71,6 +71,14 @@ re.c.init.prototype = {
         }
     },
     
+    //turns global method into a singleton
+    singleton:function(){
+        this._re_method = function(){
+            return this._ || (this._ = re.e(this.name));
+        }
+        return this;
+    },
+
     statics:function(obj, value){
         this._checkFinal();
         
@@ -126,10 +134,10 @@ re.c.init.prototype = {
     },
 
     _re_method:function(){
-        var e = re.e(this.name);
+        var e = re.e(this.name), f = this._re_factory;
 
-        if(this._re_factory)
-            this._re_factory.apply(e, arguments);
+        if(f)
+            f.apply(e, arguments);
 
         return e;
     },
@@ -146,7 +154,7 @@ re.c.init.prototype = {
     
     */
     method:function(f){
-        this._re_method = f;
+        this._re_method = f.bind(re[this.name]);
         return this;
     },
 

data/src/core/load.js

@@ -5,6 +5,10 @@
     }
     
     b.path = "";
+    //returns file name of path
+    b.file = function(name){
+      return name.split('/').pop().split('?').shift();
+    };
     
     b.imageExt = 'img';
     b.soundExt = 'sfx';
@@ -74,13 +78,10 @@
             a = this.assets[i];
             
             //copy full source path
-            var s = a;
-            
+            var s = (a.charAt(0)=='/')?a:re.load.path+a;
+
             //remove directories
-            var d = a.lastIndexOf('/');
-            if(d != -1){
-                a = a.substr(d+1, a.length);
-            }
+            a = re.load.file(a);
             
             //find file extension
             var j = a.lastIndexOf('.')+1;
@@ -154,7 +155,7 @@
             
         };
         
-        img.src = re.load.path+src;
+        img.src = src;
         
         return this;
     };
@@ -189,7 +190,7 @@
           
             s = soundManager.createSound({
               id:a,
-              url:re.load.path+src,
+              url:src,
               autoLoad:true,
               onload:function(){
                 that._loaded();
@@ -201,8 +202,8 @@
           });
         
         } else {
-          s = new Audio(re.load.path+src);
-          s.src = re.load.path+src;
+          s = new Audio(src);
+          s.src = src;
           s.preload = "auto";
           s.load();
           

data/src/core/query.js

@@ -367,6 +367,15 @@
       
       return val;
     }
+
+    p.sum = function(method, context){
+        var val = 0;
+
+        this.each(function(e, i, l){
+            val += method.call(context || this, e, i, l);
+        });
+        return val;
+    }
     
     //without this filter would return a normal array.
     p.filter = function(){

data/src/display/circle.js

@@ -13,7 +13,7 @@ re.c('circle')
         c.fillStyle = this.color;
         
         c.beginPath();
-            var r = this.radius();
+            var r = this.radius;
             
             c.arc(-this.regX + r , -this.regY + r , r, 0, Math.PI*2, true);
         
@@ -31,4 +31,4 @@ re.c('circle')
         return this.sizeX * 0.5;
     }
     
-});
+});

data/src/display/el.js

@@ -2,7 +2,7 @@
 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
+re.e('el:a').$el //jquery element reference
 
 Jquery must be available to work!
 
@@ -13,7 +13,8 @@ re.c('el')
 
   posX:function(x){
     if(re.is(x)){
-      return this.$el.css('left', x);
+      this.$el.css('left', x);
+      return this;
     }
 
     return this.$el.position().left;
@@ -21,7 +22,8 @@ re.c('el')
   
   posY:function(y){
     if(re.is(y)){
-      return this.$el.css('top', y);
+      this.$el.css('top', y);
+      return this;
     }
     return this.$el.position().top;
   },
@@ -38,7 +40,6 @@ re.c('el')
     var that = this;
     this.$el.click(function(e){
       f.call(that,e);
-      return false;
     });
     return this;
   },
@@ -48,7 +49,7 @@ re.c('el')
   },
 
   setEl:function(el){
-    this.remove();
+    this.removeEl();
 
     this.el = el;
     this.$el = $(el).addClass('el');
@@ -67,15 +68,16 @@ re.c('el')
   },
 
   //places element to parent of canvas
-  place:function(){
-    $(re.sys.canvas).parent().append(this.el);
+  addEl:function(targ){
+    targ = targ || $(re.sys.canvas).parent();
+
+    targ.append(this.el);
     return this;
   },
 
-  remove:function(){
+  removeEl:function(){
     if(this.$el){
     	this.$el.remove();
-      this.$el = this.el = null;
     }
     return this;
   },
@@ -95,5 +97,5 @@ re.c('el')
   if(e) this.setEl(re.$new(e));
 })
 .dispose(function(){
-  this.remove();
+  this.removeEl();
 });

data/src/display/image.js

@@ -10,7 +10,7 @@ re.c('image')
 	
 	image:function(b){
     if(re.is(b)){
-      this.attr({_image:b, sizeX:b.width, sizeY:b.height});
+      this.attr({_image:b, sizeX:b.width, sizeY:b.height, bisect:b.width});
   		return this;
     }
     return this._image;

data/src/math/bisect.js

@@ -23,9 +23,9 @@ re.c('bisect')
 		return this.toTileX(bi, width, size) * size;
 	},
 	
-	toY:function(bi, width, size){
+	toY:function(bi, width, sizeX, sizeY){
 		
-		return this.toTileY(bi, width, size) * size;
+		return this.toTileY(bi, width, sizeX) * sizeY;
 	},
 	
 	toTileX:function(bi, width, size){
@@ -56,7 +56,7 @@ re.c('bisect')
 	
 	biToY:function(bi){
 		
-		return re.bisect.toY(bi, this.bisect, this.sizeX);
+		return re.bisect.toY(bi, this.bisect, this.sizeX, this.sizeY);
 	},
 	
 	biToTileX:function(bi){

data/src/pattern/flicker.js

@@ -50,21 +50,21 @@ 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;
+		//check if over
+		if(this.flicker_frame == this.flicker_frames.length){
 			
-		} else {
-			//done flickering
-			
-			this.flicker_stop();
-  			return;
+			if(this.flicker_loops == -1 || --this.flicker_loops >= 1){
+				//loop again
+				
+				this.flicker_frame = 0;
+				
+			} else {
+				//done flickering
+				
+				this.flicker_stop();
+	  			return;
+			}
 		}
-	}
 			
      this.flicker_run();
   },

data/src/pattern/pathfind.js

@@ -62,7 +62,7 @@ re.c('pathfind')
 })
 .defines({
   
-  pathfind_max:100,
+  pathfind_max:50,
   
   pathfind:function(x, y, targetX, targetY, onCheck, onTile){
     this.targetX = targetX;

data/templates/circle/game.json

@@ -12,5 +12,5 @@
   "tests-scripts-ignore":"init.js",
 
   //order scripts
-  "order": null
+  "scripts-order": null
 }

data/templates/dom/game.json

@@ -2,5 +2,5 @@
 	"build-scripts-ignore":"plugins/*",
 	"title":"DOM Elements",
 	"ver":"1.0",
-	"order":"plugins/*"
+	"scripts-order":"plugins/*"
 }

data/templates/dom/scripts/els/btn.js

@@ -1,5 +1,5 @@
 re.c('btn')
-.requires('el:button')
 .factory(function(text, click){
+ 	this.comp('el:button contain');
 	this.click(click).text(text);
-})
+})

data/templates/isometric/game.json

@@ -12,5 +12,5 @@
   "tests-scripts-ignore":"init.js",
 
   //order scripts
-  "order": null
+  "scripts-order": null
 }

data/templates/platform/game.json

@@ -14,5 +14,5 @@
   "tests-scripts-ignore":"init.js",
 
   //this makes all .tmx files last
-  "order":".*/.js"
+  "scripts-order":".*/.js"
 }

data/templates/pong/game.json

@@ -12,5 +12,5 @@
   "tests-scripts-ignore":"init.js",
 
   //order scripts
-  "order": null
+  "scripts-order": null
 }

data/templates/tiltmaze/game.json

@@ -12,5 +12,5 @@
   "tests-scripts-ignore":"init.js",
 
   //order scripts
-  "order": "/tile.js$"
+  "scripts-order": "/tile.js$"
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: entityjs
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23146660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *23146660
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23146240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,31 +32,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *23146240
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23145740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  version_requirements: *23145740
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23145320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *23145320
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23144860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *23144860
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23144440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,15 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *23144440
 - !ruby/object:Gem::Dependency
   name: cobravsmongoose
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23144020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,15 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *23144020
 - !ruby/object:Gem::Dependency
   name: cssmin
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23143600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,12 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *23143600
 description: HTML5 Javascript game engine, quickly create robust, flexible and reusable
   games.
 email:
@@ -459,7 +419,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: entityjs
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Create HTML5 javascript games in EntityJS.