Test

Webeled · Webeled · commit 77b553ac2aab · 2013-10-07T20:56:44.000+01:00
diff --git a/examples/camera/basic follow.php b/examples/camera/basic follow.php
@@ -28,7 +28,7 @@ function create() {
 
 		game.add.tileSprite(0, 0, 2000, 2000, 'background');
 
-        game.world.setSize(1400,1400);
+        game.world.setBounds(1400,1400);
 
         for(var i=0,nb=10;i<nb;i++){
 
diff --git a/examples/camera/follow styles.php b/examples/camera/follow styles.php
@@ -36,7 +36,7 @@ function preload() {
     function create() {
 
         //make the world larger than the actual canvas
-        game.world.setSize(1400,1400);
+        game.world.setBounds(1400,1400);
 
         for(var i=0,nb=10;i<nb;i++){
 
@@ -46,18 +46,12 @@ function create() {
         
 
         // background images
-        game.add.sprite(0, 0, 'sky')
-            .scrollFactor.setTo(0, 0);
-        game.add.sprite(0, 360, 'ground')
-            .scrollFactor.setTo(0.5, 0.1);
-        game.add.sprite(0, 400, 'river')
-            .scrollFactor.setTo(1.3, 0.16);
-        game.add.sprite(200, 120, 'cloud0')
-            .scrollFactor.setTo(0.3, 0.1);
-        game.add.sprite(-60, 120, 'cloud1')
-            .scrollFactor.setTo(0.5, 0.1);
-        game.add.sprite(900, 170, 'cloud2')
-            .scrollFactor.setTo(0.7, 0.1);
+        game.add.sprite(0, 0, 'sky');
+        game.add.sprite(0, 360, 'ground');
+        game.add.sprite(0, 400, 'river');
+        game.add.sprite(200, 120, 'cloud0');
+        game.add.sprite(-60, 120, 'cloud1');
+        game.add.sprite(900, 170, 'cloud2');
 
 
         // ufo sprite
diff --git a/examples/camera/moving the camera.php b/examples/camera/moving the camera.php
@@ -18,12 +18,11 @@ function create() {
 		game.stage.backgroundColor = '#2d2d2d';
 
 		//	Make our game world 2000x2000 pixels in size (the default is to match the game size)
-		game.world.setSize(2000, 2000);
+		game.world.setBounds(2000, 2000);
 
 		for (var i = 0; i < 50; i++)
 		{
 			var s = game.add.sprite(game.world.randomX, game.world.randomY, 'mushroom');
-			s.scrollFactor.setTo(0.5, 0.5);
 		}
 
 		for (var i = 0; i < 50; i++)
@@ -34,7 +33,6 @@ function create() {
 		for (var i = 0; i < 50; i++)
 		{
 			var s = game.add.sprite(game.world.randomX, game.world.randomY, 'mushroom');
-			s.scrollFactor.setTo(2, 2);
 		}
 
 	}
diff --git a/examples/camera/moving the game camera.php b/examples/camera/moving the game camera.php
@@ -19,7 +19,7 @@ function create() {
 
 
 		//setting the size of the game world larger than the tilemap's size
-		game.world.setSize(2000,2000);
+		game.world.setBounds(2000,2000);
 
 		game.stage.backgroundColor = '#255d3b';
 
diff --git a/examples/camera/world sprite.php b/examples/camera/world sprite.php
@@ -12,7 +12,7 @@
 
         function preload() {
 
-        game.world.setSize(1920, 1200);
+        game.world.setBounds(1920, 1200);
 
         game.load.image('backdrop', 'assets/pics/remember-me.jpg');
         game.load.image('card', 'assets/sprites/mana_card.png');
diff --git a/examples/display/linkedList.php b/examples/display/linkedList.php
@@ -47,12 +47,6 @@ function create() {
         list.add(e.input);
         list.add(f.input);
 
-        list.dump();
-
-        // list.remove(d.input);
-
-        // list.dump();
-
     }
 
 })();
diff --git a/examples/games/starstruck.php b/examples/games/starstruck.php
@@ -31,7 +31,6 @@ function create() {
         game.stage.backgroundColor = '#000000';
 
         bg = game.add.tileSprite(0, 0, 800, 600, 'background');
-        bg.scrollFactor.setTo(0, 0);
 
         map = game.add.tilemap(0, 0, 'level1');
         map.setCollisionRange(1, 12, true, true, true, true);
diff --git a/examples/groups/add to group 1.php b/examples/groups/add to group 1.php
@@ -46,7 +46,7 @@ function create() {
     }
     function render() {
 
-        game.debug.renderText('ufo added to game.world.group and "friendAndFoe" group', 20, 24);
+        game.debug.renderText('ufo added to game.world.and "friendAndFoe" group', 20, 24);
         game.debug.renderText('others ONLY added to "enemies" group', 20, 40);
 
     }
diff --git a/examples/groups/call all.php b/examples/groups/call all.php
@@ -36,7 +36,7 @@ function kill(item) {
         item.kill();
     }
     function reviveAll() {
-        game.world.group.callAll('revive');
+        game.world.callAll('revive');
     }
     function render() {
 
diff --git a/examples/groups/display order.php b/examples/groups/display order.php
@@ -20,7 +20,7 @@ function preload() {
 
     }
 
-    var items;
+    var items,
     card;
 
     function create() {
diff --git a/examples/groups/for each.php b/examples/groups/for each.php
@@ -27,7 +27,7 @@ function create() {
     }
     function update() {
         // Animating alpha property of each item using forEach() method.
-        game.world.group.forEach(function(item) {
+        game.world.forEach(function(item) {
             // Update alpha first.
             item.alpha -= item.alphaIncSpeed;
             // Check for switch between increasing and descreasing.
diff --git a/examples/groups/get first.php b/examples/groups/get first.php
@@ -45,7 +45,7 @@ function update() {
             timer = game.time.now +cycle;
             
             // Get the first alive item and kill it.
-            var item = game.world.group.getFirstAlive();
+            var item = game.world.getFirstAlive();
 
             if(item){
 
@@ -60,7 +60,7 @@ function render() {
 
         game.debug.renderText('One item will be killed each second.', 280, 420);
         // Get living and dead number of a group.
-        game.debug.renderText('Living: ' + game.world.group.countLiving() + ', Dead: ' + game.world.group.countDead(), 330, 440);
+        game.debug.renderText('Living: ' + game.world.countLiving() + ', Dead: ' + game.world.countDead(), 330, 440);
     }
 
 })();
diff --git a/examples/groups/group as layer.php b/examples/groups/group as layer.php
@@ -11,7 +11,7 @@
     var game = new Phaser.Game(800, 600, Phaser.CANVAS, '', { preload: preload, create: create,render:render});
 
         function preload() {
-        game.world.setSize(1280, 800);
+        game.world.setBounds(1280, 800);
 
         game.load.image('ground', 'assets/tests/ground-2x.png');
         game.load.image('river', 'assets/tests/river-2x.png');
@@ -44,28 +44,22 @@ function create() {
 
         // Add sky background to skyLayer.
         var sky = new Phaser.Sprite(game, 0, 0, 'sky');
-        sky.scrollFactor.setTo(0, 0);
         skyLayer.add(sky);
 
         // Add clouds to cloudLayer.
         var cloud0 = new Phaser.Sprite(game, 200, 120, 'cloud0');
-        cloud0.scrollFactor.setTo(0.3, 0.1);
         var cloud1 = new Phaser.Sprite(game, -60, 120, 'cloud1');
-        cloud1.scrollFactor.setTo(0.5, 0.1);
         var cloud2 = new Phaser.Sprite(game, 900, 170, 'cloud2');
-        cloud2.scrollFactor.setTo(0.7, 0.1);
         cloudLayer.add(cloud0);
         cloudLayer.add(cloud1);
         cloudLayer.add(cloud2);
 
         // Add ground sprite to groundLayer.
         var ground = new Phaser.Sprite(game, 0, 360, 'ground');
-        ground.scrollFactor.setTo(0.5, 0.1);
         groundLayer.add(ground);
 
         // Add river to riverLayer.
         var river = new Phaser.Sprite(game, 0, 400, 'river');
-        river.scrollFactor.setTo(1.3, 0.16);
         riverLayer.add(river);
 
         // Add sprites to spriteLayer.
diff --git a/examples/groups/group transform - tween.php b/examples/groups/group transform - tween.php
@@ -28,18 +28,9 @@ function preload() {
         game.load.image('arm-r', 'assets/sprites/robot/arm-r.png');
         game.load.image('leg-l', 'assets/sprites/robot/leg-l.png');
         game.load.image('leg-r', 'assets/sprites/robot/leg-r.png');
-        game.load.spritesheet('item', 'assets/buttons/number-buttons-90x90.png', 90, 90);
         
     }
     function create() {
-        // Add some items.
-        var item;
-        for (var i = 0; i < 3; i++) {
-            // Give the items a different alpha increase speed.
-            item = game.add.sprite(290, 98 * (i + 1), 'item', i);
-            // An item besides the left one.
-            item = game.add.sprite(388, 98 * (i + 1), 'item', i + 3);
-        }
         // Use groups of sprites to create a big robot.
         // Robot itself, you can subclass group class in a real game.
         robot = game.add.group();
diff --git a/examples/groups/recyling.php b/examples/groups/recyling.php
@@ -58,7 +58,7 @@ function render() {
 
         game.debug.renderText('Recycle baddies from a group using getFirstExists.', 16, 24);
         game.debug.renderText('Notice that you cannot add more than 8 baddies since we only create 8 instance.', 16, 36);
-        game.debug.renderText('Living baddies: ' + (enemies.countLiving()+1), 340, 420);
+        game.debug.renderText('Living baddies: ' + (enemies.countLiving()), 340, 420);
     }
 
 })();
diff --git a/examples/groups/set All.php b/examples/groups/set All.php
@@ -30,7 +30,7 @@ function create() {
     }
     function resetAlpha() {
         // Set "alpha" value of all the childs.
-        game.world.group.setAll('alpha', Math.random());
+        game.world.setAll('alpha', Math.random());
     }
     function render() {
 
diff --git a/examples/groups/swap children inside a group.php b/examples/groups/swap children inside a group.php
@@ -16,13 +16,12 @@ function preload() {
         game.load.image('atari2', 'assets/sprites/atari800xl.png');
     }
 
-    var atari1;
-    var atari2;
+    var atari1,
+        atari2;
 
     function create() {
 
         //  Items are rendered in the depth order in which they are added to the Group
-
         atari1 = game.add.sprite(100, 100, 'atari1');
         atari2 = game.add.sprite(250, 90, 'atari2');
 
@@ -32,8 +31,8 @@ function create() {
 
     function swapSprites() {
 
-        //  The 2 Sprites are in the global world Group, but this will work for any Group:
-        game.world.group.swap(atari1, atari2);
+        //The 2 Sprites are in the global world Group (World class extends the Group class), but this will work for any Group:
+        game.world.swap(atari1, atari2);
 
     }
 
diff --git a/examples/input/game scale.php b/examples/input/game scale.php
@@ -27,7 +27,7 @@ function preload() {
     function create() {
 
     	//We increase the size of our game world
-        game.world.setSize(2000, 2000);
+        game.world.setBounds(2000, 2000);
 
         for (var i = 0; i < 1000; i++)
         {
diff --git a/examples/input/keyboard.php b/examples/input/keyboard.php
@@ -15,7 +15,7 @@
     var speed=4;
 
     function preload() {
-        game.world.setSize(1280, 600);
+        game.world.setBounds(1280, 600);
         game.load.image('ground', 'assets/tests/ground-2x.png');
         game.load.image('river', 'assets/tests/river-2x.png');
         game.load.image('sky', 'assets/tests/sky-2x.png');
@@ -31,18 +31,12 @@ function preload() {
     }
     function create() {
         // background images
-        game.add.sprite(0, 0, 'sky')
-            .scrollFactor.setTo(0, 0);
-        game.add.sprite(0, 360, 'ground')
-            .scrollFactor.setTo(0.5, 0.5);
-        game.add.sprite(0, 400, 'river')
-            .scrollFactor.setTo(1.3, 1.3);
-        game.add.sprite(200, 120, 'cloud0')
-            .scrollFactor.setTo(0.3, 0.3);
-        game.add.sprite(-60, 120, 'cloud1')
-            .scrollFactor.setTo(0.5, 0.3);
-        game.add.sprite(900, 170, 'cloud2')
-            .scrollFactor.setTo(0.7, 0.3);
+        game.add.sprite(0, 0, 'sky');
+        game.add.sprite(0, 360, 'ground');
+        game.add.sprite(0, 400, 'river');
+        game.add.sprite(200, 120, 'cloud0');
+        game.add.sprite(-60, 120, 'cloud1');
+        game.add.sprite(900, 170, 'cloud2');
 
         // Create a ufo sprite as player.
         ufo = game.add.sprite(320, 240, 'ufo');
@@ -53,25 +47,23 @@ function create() {
 
         // Add 2 sprite to display hold direction.
         leftBtn = game.add.sprite(160 - 112, 200, 'button', 0);
-        leftBtn.scrollFactor.setTo(0, 0);
         leftBtn.alpha = 0;
         rightBtn = game.add.sprite(640 - 112, 200, 'button', 1);
         rightBtn.alpha = 0;
-        rightBtn.scrollFactor.setTo(0, 0);
     }
     function update() {
         // Check key states every frame.
         // Move ONLY one of the left and right key is hold.
         if (game.input.keyboard.isDown(Phaser.Keyboard.LEFT) &&
             !game.input.keyboard.isDown(Phaser.Keyboard.RIGHT)) {
             ufo.x -= speed;
-            ufo.rotation = -15;
+            ufo.angle = -15;
             leftBtn.alpha = 0.6;
         }
         else if (game.input.keyboard.isDown(Phaser.Keyboard.RIGHT) &&
             !game.input.keyboard.isDown(Phaser.Keyboard.LEFT)) {
             ufo.x += speed;
-            ufo.rotation = 15;
+            ufo.angle = 15;
             rightBtn.alpha = 0.6;
         }
         else {
diff --git a/examples/input/override browser keyboard controls.php b/examples/input/override browser keyboard controls.php
diff --git a/examples/input/pixelpick3.php b/examples/input/pixelpick3.php
diff --git a/examples/misc/random generators.php b/examples/misc/random generators.php
diff --git a/examples/quadtree/quadtree.php b/examples/quadtree/quadtree.php

Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,11 @@ function create() {`
`18`	`18`	`game.stage.backgroundColor = '#2d2d2d';`
`19`	`19`
`20`	`20`	`// Make our game world 2000x2000 pixels in size (the default is to match the game size)`
`21`		`- game.world.setSize(2000, 2000);`
	`21`	`+ game.world.setBounds(2000, 2000);`
`22`	`22`
`23`	`23`	`for (var i = 0; i < 50; i++)`
`24`	`24`	`{`
`25`	`25`	`var s = game.add.sprite(game.world.randomX, game.world.randomY, 'mushroom');`
`26`		`- s.scrollFactor.setTo(0.5, 0.5);`
`27`	`26`	`}`
`28`	`27`
`29`	`28`	`for (var i = 0; i < 50; i++)`
`@@ -34,7 +33,6 @@ function create() {`
`34`	`33`	`for (var i = 0; i < 50; i++)`
`35`	`34`	`{`
`36`	`35`	`var s = game.add.sprite(game.world.randomX, game.world.randomY, 'mushroom');`
`37`		`- s.scrollFactor.setTo(2, 2);`
`38`	`36`	`}`
`39`	`37`
`40`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ function create() {`
`46`	`46`	`}`
`47`	`47`	`function render() {`
`48`	`48`
`49`		`- game.debug.renderText('ufo added to game.world.group and "friendAndFoe" group', 20, 24);`
	`49`	`+ game.debug.renderText('ufo added to game.world.and "friendAndFoe" group', 20, 24);`
`50`	`50`	`game.debug.renderText('others ONLY added to "enemies" group', 20, 40);`
`51`	`51`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ function kill(item) {`
`36`	`36`	`item.kill();`
`37`	`37`	`}`
`38`	`38`	`function reviveAll() {`
`39`		`- game.world.group.callAll('revive');`
	`39`	`+ game.world.callAll('revive');`
`40`	`40`	`}`
`41`	`41`	`function render() {`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ function preload() {`
`20`	`20`
`21`	`21`	`}`
`22`	`22`
`23`		`- var items;`
	`23`	`+ var items,`
`24`	`24`	`card;`
`25`	`25`
`26`	`26`	`function create() {`