RubyGems - entityjs - Versions diffs - 0.4.1 → 0.4.2 - Mend

entityjs 0.4.1 → 0.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (111) hide show

data/.gitignore +1 -0
data/bin/entityjs +1 -1
data/entityjs.gemspec +3 -2
data/lib/entityjs.rb +13 -1
data/lib/entityjs/command.rb +22 -16
data/lib/entityjs/commands/build.rb +96 -48
data/lib/entityjs/commands/eunit.rb +1 -1
data/lib/entityjs/commands/html.rb +31 -0
data/lib/entityjs/commands/min.rb +37 -0
data/lib/entityjs/commands/new.rb +3 -0
data/lib/entityjs/commands/server.rb +9 -3
data/lib/entityjs/config.rb +163 -59
data/lib/entityjs/dirc.rb +28 -0
data/lib/entityjs/page.rb +73 -34
data/lib/entityjs/version.rb +1 -1
data/public/favicon.ico +0 -0
data/public/play.html +33 -28
data/public/qunit/qunit.entity.js +56 -6
data/public/qunit/qunit.input.js +5 -5
data/public/test.html +49 -0
data/spec/javascripts/src/core/comp_spec.js +17 -6
data/spec/javascripts/src/core/entity_spec.js +4 -5
data/spec/javascripts/src/core/query_spec.js +25 -0
data/spec/javascripts/src/core/re_spec.js +3 -3
data/spec/javascripts/src/cycle/update_spec.js +8 -8
data/spec/javascripts/src/display/align_spec.js +2 -2
data/spec/javascripts/src/display/el_spec.js +17 -0
data/spec/javascripts/src/input/keyboard_spec.js +4 -4
data/spec/javascripts/src/input/mouse_spec.js +8 -7
data/spec/javascripts/src/math/random_spec.js +8 -0
data/spec/javascripts/src/util/clone_spec.js +20 -0
data/spec/lib/entityjs/commands/build_spec.rb +3 -8
data/spec/lib/entityjs/commands/html_spec.rb +27 -0
data/spec/lib/entityjs/commands/min_spec.rb +30 -0
data/spec/lib/entityjs/config_spec.rb +6 -0
data/spec/lib/entityjs/page_spec.rb +4 -4
data/src/core/comp.js +87 -31
data/src/core/entity.js +38 -43
data/src/core/load.js +2 -8
data/src/core/query.js +17 -5
data/src/core/re.js +1 -1
data/src/core/system.js +8 -11
data/src/cycle/drawlist.js +11 -11
data/src/cycle/update.js +5 -5
data/src/display/align.js +10 -3
data/src/display/animate.js +26 -12
data/src/display/el.js +99 -0
data/src/input/keyboard.js +5 -5
data/src/input/mouse.js +16 -11
data/src/math/bisect.js +1 -1
data/src/math/force.js +4 -4
data/src/math/hitmap.js +2 -1
data/src/math/iso.js +1 -1
data/src/math/random.js +17 -2
data/src/math/tile.js +1 -1
data/src/media/sound.js +1 -1
data/src/pattern/pathfind.js +2 -4
data/src/save/storage.js +1 -1
data/src/util/clone.js +12 -0
data/src/util/scene.js +21 -16
data/templates/circle/game.json +16 -0
data/templates/circle/scripts/displays/circle.js +40 -0
data/templates/circle/scripts/scenes/home.js +8 -17
data/templates/circle/tests/scenes/home_test.js +3 -11
data/templates/dom/game.json +6 -0
data/templates/dom/scripts/els/btn.js +5 -0
data/templates/dom/scripts/els/contain.js +5 -0
data/templates/dom/scripts/els/header.js +5 -0
data/templates/{animation → dom}/scripts/init.js +0 -0
data/templates/dom/scripts/scenes/home.js +22 -0
data/templates/{animation → dom}/scripts/scenes/load.js +0 -0
data/templates/dom/tests/scenes/home_test.js +9 -0
data/templates/{animation → dom}/tests/scenes/load_test.js +0 -0
data/templates/isometric/game.json +16 -0
data/templates/platform/game.json +18 -0
data/templates/platform/scripts/displays/hero.js +1 -1
data/templates/platform/scripts/items/coin.js +1 -1
data/templates/platform/scripts/items/spring.js +1 -1
data/templates/platform/tests/displays/hero_test.js +4 -4
data/templates/platform/tests/factories.js +1 -1
data/templates/platform/tests/items/coin_test.js +1 -1
data/templates/pong/game.json +16 -0
data/templates/tiltmaze/game.json +16 -0
data/templates/tiltmaze/scripts/structs/level.js +1 -1
data/templates/tiltmaze/scripts/tiles/walltile.js +1 -1
metadata +45 -32
data/.rspec +0 -2
data/public/tests.html +0 -31
data/src/cycle/worker.js +0 -9
data/templates/animation/assets/images/hero.png +0 -0
data/templates/animation/scripts/scenes/home.js +0 -41
data/templates/animation/tests/init_test.js +0 -4
data/templates/animation/tests/scenes/home_test.js +0 -15
data/templates/arrow_keys/assets/images/arrow.png +0 -0
data/templates/arrow_keys/config.yml +0 -22
data/templates/arrow_keys/readme.txt +0 -9
data/templates/arrow_keys/scripts/displays/arrow.js +0 -69
data/templates/arrow_keys/scripts/init.js +0 -10
data/templates/arrow_keys/scripts/inputs/controls.js +0 -35
data/templates/arrow_keys/scripts/scenes/home.js +0 -20
data/templates/arrow_keys/scripts/scenes/load.js +0 -57
data/templates/arrow_keys/tests/displays/arrow_test.js +0 -29
data/templates/arrow_keys/tests/init_test.js +0 -4
data/templates/arrow_keys/tests/inputs/controls_test.js +0 -32
data/templates/arrow_keys/tests/scenes/home_test.js +0 -0
data/templates/arrow_keys/tests/scenes/load_test.js +0 -18
data/templates/circle/config.yml +0 -22
data/templates/isometric/config.yml +0 -22
data/templates/platform/config.yml +0 -23
data/templates/pong/config.yml +0 -22
data/templates/tiltmaze/config.yml +0 -25

data/.rspec DELETED

	@@ -1,2 +0,0 @@
1	- --colour
2	- --debug

data/public/tests.html DELETED

@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>EntityJS Test Suite</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-    <link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen">
-    <style type="text/css">
-    canvas {
-      margin-left: auto;
-      margin-right: auto;
-      display: block;
-      border:1px #333 solid;
-    }
-    </style>
-    $JS
-</head>
-<body>
-    <h1 id="qunit-header">Game Test Suite</h1>
-    <h2 id="qunit-banner"></h2>
-    <div id="qunit-testrunner-toolbar"></div>
-    <h2 id="qunit-userAgent"></h2>
-    <ol id="qunit-tests"></ol>
-    <canvas width="$WIDTH" height="$HEIGHT" id="$CANVAS_ID">Browser does not support canvas element</canvas>
-    <a href="/">Play Game</a>
-</body>
-</html>

data/src/cycle/worker.js DELETED

@@ -1,9 +0,0 @@
-/*
-The worker component will contain an interface for the new HTML5 webworker.
-TODO
-*//*
-re.c('worker')
-.init(function(){
-	throw 'Not implemented';
-});*/

data/templates/animation/assets/images/hero.png DELETED

Binary file

data/templates/animation/scripts/scenes/home.js DELETED

@@ -1,41 +0,0 @@
-re.scene('home')
-.enter(function(){
-  re.e('sprite animate hero.png align keyboard')
-  .attr({
-    //sets frame size
-    sizeX:25,
-    sizeY:25,
-    //animation object for animate comp
-    anis:{
-      //first arg is time in milliseconds, array contains the frame numbers to flick through.
-      //time per frame = time / frames.length
-      random:[300, [0,1,2,3,4,0]]
-    },
-    //centers image on screen
-    alignHor:0,
-    alignVer:0
-  })
-  //listens for keyup event
-  .on('keyup:enter', function(){
-    //play random animation
-    this.animate('random');
-    console.log('Currently animating:',this.flickering());
-  })
-  .on('keyup:q', function(){
-    //ends animation
-    this.animate();
-  });
-  //add help text
-  re.e('text align')
-  .text('Press enter to animate')
-  .alignTop(5)
-  .alignLeft(5);
-});

data/templates/animation/tests/init_test.js DELETED

@@ -1,4 +0,0 @@
-module('init');
-//in tests re.ready is NOT called.
-//make sure re.sys.init() is called or else input will not function!

data/templates/animation/tests/scenes/home_test.js DELETED

@@ -1,15 +0,0 @@
-module('home');
-test('enter home', function(){
-	re.scene('home').enter();
-	var ref;
-	//check if entity exists
-	is(ref = re('animate').first());
-	//expects entity to have event listeners
-	expectEvent(ref, 'keyup:enter');
-	expectEvent(ref, 'keyup:q');
-});

data/templates/arrow_keys/assets/images/arrow.png DELETED

Binary file

data/templates/arrow_keys/config.yml DELETED

@@ -1,22 +0,0 @@
-# Configure your game settings
-width: 500
-height: 400
-canvas-id: game-canvas
-#files to ignore in /scripts
-scripts-ignore:
-#specify files to be loaded first in /scripts
-order:
-#components to ignore in the entityjs source
-#reduce file size by ignoring unused components
-entity-ignore:
-  socket
-  wait
-  group
-#ignore tests in /tests
-tests-ignore:

data/templates/arrow_keys/readme.txt DELETED

@@ -1,9 +0,0 @@
---------------- Arrow Keys ------------
-# About
-This is a simple example demostrating the usefulness of EntityJS.
-It shows how to use sprites and keyboard controls to move around arrows
-and remove them from screen.
-For more information on the engine visit www.entityjs.com

data/templates/arrow_keys/scripts/displays/arrow.js DELETED

@@ -1,69 +0,0 @@
-/*
-The arrow component is a simple sprite with key controls.
-It listens to system updates and will move around based on WASD keys.
-The image comes from arrow.png, you can view the element here, re.c('arrow.png').image.
-The sprite component automatically finds the ._image on the entity and draws it to screen.
-It will chop the image into frames based on the sizeX and sizeY values.
-The original image is 80x80 and has 4 frames. So its frame sizes will be 40x40.
-Switch between frames by using .frame(id), and get the current frame with .frame()
-The posX and posY come from the sprite component and defines the position of the image on screen.
-*/
-re.c('arrow')
-.requires('update sprite keyboard arrow.png')
-.defines({
-  //speed of the arrow
-  speed:10,
-  //defines the sprite frame size
-  sizeX:40,
-  sizeY:40,
-  update:function(){
-    var s = this.speed;
-    //if w or up key is currently pressed..
-    if(re.pressed('w', 'up')){
-      //moves position y
-			this.posY -= s;
-      //change sprite frame
-			this.frame(0);
-		} else if(re.pressed('s', 'down')){
-			this.posY += s;
-			this.frame(2);
-		}
-		if(re.pressed('a', 'left')){
-			this.posX -= s;
-			this.frame(3);
-		} else if(re.pressed('d', 'right')){
-			this.posX += s;
-			this.frame(1);
-		}
-  }
-})
-.init(function(){
-  //move to the center of the screen
-	this.posX = re.sys.sizeX * 0.5;
-	this.posY = re.sys.sizeY * 0.5;
-  //add event listener
-  this.on('update', this.update);
-});

data/templates/arrow_keys/scripts/init.js DELETED

@@ -1,10 +0,0 @@
-//runs when the window is finished loading
-re.ready(function(){
-  //Starts the system and listens for inputs
-  //re.canvas in automatically defined and can be changed in config.yml
-  re.sys.init(re.canvas).start();
-  //enter the next scene
-  re.scene('load').enter();
-});

data/templates/arrow_keys/scripts/inputs/controls.js DELETED

@@ -1,35 +0,0 @@
-/*
-The controls component listens for keyevents and creates new arrows
-based on keys pressed.
-*/
-re.c('controls')
-.requires('keyboard')
-.defines({
-  addArrow:function(count){
-    count = count || 1;
-    //creates a new arrow
-    re.e('arrow', count);
-  },
-  removeArrow:function(){
-    //finds an entity with the arrow component and removes it.
-    re('arrow').random().dispose();
-  }
-})
-.init(function(){
-  //called on instantiation
-  //listen for key events
-  //these come from the keyboard component
-  this.on({
-    'keydown:space': function(){
-      this.addArrow();
-    },
-    'keyup:r': function(){
-      this.removeArrow();
-    }
-  });
-});

data/templates/arrow_keys/scripts/scenes/home.js DELETED

@@ -1,20 +0,0 @@
-/*
-The home scene is the entry point of the game.
-It creates a new controls entity and a starting arrow to play with.
-*/
-re.scene('home')
-.enter(function(){
-  console.log('entering home scene. . .');
-  //add controls
-  re.controls = re.e('controls');
-  //add first arrow
-  re.controls.addArrow();
-})
-.exit(function(){
-  console.log('exiting home scene. . .');
-})

data/templates/arrow_keys/scripts/scenes/load.js DELETED

@@ -1,57 +0,0 @@
-/*
-The load scene loads all images and sounds in the game.
-The re.assets object contains two arrays:
-re.assets.images
-re.assets.sounds
-re.assets is automatically created for you and will contains whatever images
-you place in the /assets/images or /assets/sounds directory.
-You can even create new directories and place json or xml inside.
-/assets/levels/level1.json
-The file contents will be turned into a component and can be used on entities.
-If /assets/levels/level1.json contains this:
-{"something":100}
-It will do this in the background for you:
-re.c('level1.json level')
-.defines({
-  something:100
-});
-You can even look in the source code and see for yourself.
-Of course this will all be included when you run 'entityjs build'
-Currently only, json, xml and tmx are supported. Tmx is a special file type used by
-the map maker tiled and it can be used to create levels. More info: http://www.mapeditor.org/
-*/
-re.scene('load')
-.enter(function(){
-  re.load(re.assets)
-  .complete(function(){
-    console.log('finished loading...');
-    //move to home
-    re.scene('home').enter();
-  })
-  .error(function(e){
-    console.log('Error loading asset: '+e);
-  })
-  .progress(function(i){
-    console.log('Finished loading: '+i);
-  });
-})
-.exit(function(){
-  //exit load scene
-})

data/templates/arrow_keys/tests/displays/arrow_test.js DELETED

@@ -1,29 +0,0 @@
-module('arrow');
-var arrow = re.e('arrow');
-//verify the arrow has the correct sizes
-test('size', function(){
-  equal(arrow.sizeX, 40);
-  equal(arrow.sizeY, 40);
-});
-test('keys move arrow', function(){
-  //mock/stub methods in qunit/qunit.mock.js
-  //expects 4 calls to frame
-  expectCall(arrow, 'frame', null, 4);
-  //simulate keypress / mouse clicks with qunit/qunit.input.js
-  //dispatches a keydown on each key, calls the given method
-  //then dispatches keyup.
-  keypress(['w', 's', 'd', 'a'], function(){
-    arrow.update();
-  });
-  //by the end of the method e.frame() should have been called 4 times
-  //take a look at scripts/display/arrow.js @ update()
-});

data/templates/arrow_keys/tests/init_test.js DELETED

@@ -1,4 +0,0 @@
-module('init');
-//in tests re.ready is NOT called.
-//make sure re.sys.init() is called or else input will not function!

data/templates/arrow_keys/tests/inputs/controls_test.js DELETED

@@ -1,32 +0,0 @@
-module('controls');
-var controls = re.e('controls');
-test('addArrow', function(){
-  var old = re('arrow').length;
-  //should call addarrow
-  expectCall(controls, 'addArrow');
-  //press space
-  keypress('space');
-  //check that a new arrow was created
-  equal(re('arrow').length, old+1);
-});
-test('removeArrow', function(){
-  var old = re('arrow').length;
-  expectCall(controls, 'removeArrow');
-  //press r
-  keypress('r');
-  //check that a new arrow was removed
-  equal(re('arrow').length, old-1);
-});

data/templates/arrow_keys/tests/scenes/home_test.js DELETED

File without changes

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

@@ -1,18 +0,0 @@
-module('load');
-test('load assets', function(){
-  //replace re.scene('home').enter with start()
-  stub(re.scene('home'), 'enter', function(){  start(); });
-  //go into the load scene
-  re.scene('load').enter();
-  //it should be loading the assets
-  //stop until it finishes and enters the new home scene
-  //the home scene should then call start()
-  stop();
-  expect(0);
-});

data/templates/circle/config.yml DELETED

@@ -1,22 +0,0 @@
-# Configure your game settings
-width: 500
-height: 400
-canvas-id: game-canvas
-#files to ignore in /scripts
-scripts-ignore:
-#specify files to be loaded first in /scripts
-order:
-#components to ignore in the entityjs source
-#reduce file size by ignoring unused components
-entity-ignore:
-  socket
-  wait
-  group
-#ignore tests in /tests
-tests-ignore: