Merge remote-tracking branch 'photonstorm_phaser/dev' into dev

Author: gltovar

README.md

@@ -41,6 +41,8 @@ Change Log
 
 Version 1.1.3 - in build
 
+* New: The object returned by Math.sinCosGenerator now contains a length property.
+* New: Phaser.BitmapData object. Can be used as a texture for a Sprite or Tiling Sprite. See the new examples and docs for details.
 * New: RenderTexture.render now takes a Phaser.Group. Also added renderXY for when you don't want to make a new Point object.
 * New: Implementing PluginManager.remove, added PluginManager.removeAll (thanks crazysam)
 * New: Added scrollFactorX/scrollFactorY to TilemapLayers (thanks jcd-as)
@@ -69,6 +71,8 @@ Version 1.1.3 - in build
 * Updated: If running in Canvas mode and you have a render function it will save the context and reset the transform before running your render function
 * Updated: Sprite will now check the exists property of the Group it is in, if the Group.exists = false the Sprite won't update.
 * Updated: Lots of small documentation tweaks across various files such as Pointer.
+* Updated: If you specify 'null' as a Group parent it will now revert to using the World as the parent (before only 'undefined' worked)
+
 
 
 

build/config.php

@@ -59,7 +59,6 @@
 
     <script src="../src/pixi/textures/BaseTexture.js"></script>
     <script src="../src/pixi/textures/Texture.js"></script>
-    <script src="../src/pixi/textures/RenderTexture.js"></script>
 
     <script src="../src/pixi/utils/EventTarget.js"></script>
     <script src="../src/pixi/utils/Polyk.js"></script>
@@ -88,6 +87,7 @@
 
 	<script src="../src/gameobjects/Events.js"></script>
 	<script src="../src/gameobjects/GameObjectFactory.js"></script>
+	<script src="../src/gameobjects/BitmapData.js"></script>
 	<script src="../src/gameobjects/Sprite.js"></script>
 	<script src="../src/gameobjects/TileSprite.js"></script>
 	<script src="../src/gameobjects/Text.js"></script>

examples/_site/view_full.html

@@ -95,6 +95,7 @@
         <script src="../src/input/InputHandler.js"></script>
         <script src="../src/gameobjects/Events.js"></script>
         <script src="../src/gameobjects/GameObjectFactory.js"></script>
+        <script src="../src/gameobjects/BitmapData.js"></script>
         <script src="../src/gameobjects/Sprite.js"></script>
         <script src="../src/gameobjects/TileSprite.js"></script>
         <script src="../src/gameobjects/Text.js"></script>

examples/_site/view_lite.html

@@ -94,6 +94,7 @@
         <script src="../src/input/InputHandler.js"></script>
         <script src="../src/gameobjects/Events.js"></script>
         <script src="../src/gameobjects/GameObjectFactory.js"></script>
+        <script src="../src/gameobjects/BitmapData.js"></script>
         <script src="../src/gameobjects/Sprite.js"></script>
         <script src="../src/gameobjects/TileSprite.js"></script>
         <script src="../src/gameobjects/Text.js"></script>

examples/display/bitmapdata wobble.js

@@ -0,0 +1,77 @@
+
+var game = new Phaser.Game(800, 600, Phaser.AUTO, 'phaser-example', { preload: preload, create: create, update: update });
+
+function preload() {
+
+    game.load.image('ball', 'assets/sprites/shinyball.png');
+
+}
+
+var bmd;
+
+var waveSize = 8;
+var wavePixelChunk = 2;
+var waveData;
+var waveDataCounter;
+
+function create() {
+
+	//	Create our BitmapData object at a size of 32x64
+	bmd = game.add.bitmapData('ball', 32, 64);
+
+    //  And apply it to 100 randomly positioned sprites
+    for (var i = 0; i < 100; i++)
+    {
+        game.add.sprite(game.world.randomX, game.world.randomY, bmd);
+    }
+
+    //  Populate the wave with some data
+	waveData = game.math.sinCosGenerator(32, 8, 8, 2);
+
+}
+
+function update() {
+
+	//	Clear the BitmapData
+	bmd.clear();
+
+	updateWobblyBall();
+
+}
+
+//  This creates a simple sine-wave effect running through our BitmapData.
+//  This is then duplicated across all 100 sprites using it, meaning we only have to calculate it and upload it to the GPU once.
+
+function updateWobblyBall()
+{
+	var s = 0;
+	var copyRect = { x: 0, y: 0, w: wavePixelChunk, h: 32 };
+	var copyPoint = { x: 0, y: 0 };
+
+	for (var x = 0; x < 32; x += wavePixelChunk)
+	{
+		copyPoint.x = x;
+		copyPoint.y = waveSize + (waveSize / 2) + waveData.sin[s];
+
+		bmd.context.drawImage(game.cache.getImage('ball'), copyRect.x, copyRect.y, copyRect.w, copyRect.h, copyPoint.x, copyPoint.y, copyRect.w, copyRect.h);
+			
+		copyRect.x += wavePixelChunk;
+			
+		s++;
+	}
+
+	//	Now all the pixel data has been redrawn we render it to the BitmapData object.
+	//	In CANVAS mode this doesn't do anything, but on WebGL it pushes the new texture to the GPU.
+	//	If your game is exclusively running under Canvas you ca safely ignore this step.
+	bmd.render();
+
+	//	Cycle through the wave data - this is what causes the image to "undulate"
+	game.math.shift(waveData.sin);
+	
+	waveDataCounter++;
+	
+	if (waveDataCounter == waveData.length)
+	{
+		waveDataCounter = 0;
+	}
+}

examples/tilemaps/sci fly.js

@@ -52,6 +52,7 @@ function create() {
 
     sprite = game.add.sprite(450, 80, 'phaser');
     sprite.anchor.setTo(0.5, 0.5);
+    sprite.angle = 45;
 
     game.camera.follow(sprite);
     // game.camera.deadzone = new Phaser.Rectangle(160, 160, layer.renderWidth-320, layer.renderHeight-320);
@@ -111,7 +112,7 @@ function update() {
 
 function render() {
 
-    // game.debug.renderSpriteCorners(sprite);
+    game.debug.renderSpriteBounds(sprite);
     // game.debug.renderSpriteInfo(sprite, 32, 32);
     // game.debug.renderSpriteCoords(sprite, 32, 32);
 

examples/wip/bmd.js

@@ -0,0 +1,82 @@
+
+var game = new Phaser.Game(800, 600, Phaser.AUTO, 'phaser-example', { preload: preload, create: create, update: update, render: render });
+
+function preload() {
+
+    game.load.image('atari1', 'assets/sprites/atari130xe.png');
+    game.load.image('coke', 'assets/sprites/cokecan.png');
+    game.load.image('mushroom', 'assets/sprites/mushroom2.png');
+    game.load.image('ball', 'assets/sprites/shinyball.png');
+
+}
+
+var bmd;
+
+function create() {
+
+	bmd = game.add.bitmapData('ball', 32, 64);
+
+	console.log(bmd);
+
+    //  And apply it to 100 randomly positioned sprites
+    for (var i = 0; i < 100; i++)
+    {
+        game.add.sprite(game.world.randomX - 32, game.world.randomY - 64, bmd);
+    }
+
+    //  Populate the wave with some data
+	waveData = game.math.sinCosGenerator(32, 8, 8, 2);
+
+}
+
+function update() {
+
+	bmd.clear();
+
+	updateWobblyBall();
+
+}
+
+//  This creates a simple sine-wave effect running through our DynamicTexture.
+//  This is then duplicated across all sprites using it, meaning we only have to calculate it once.
+
+var waveSize = 8;
+var wavePixelChunk = 2;
+var waveData;
+var waveDataCounter;
+
+function updateWobblyBall()
+{
+	var s = 0;
+	var copyRect = { x: 0, y: 0, w: wavePixelChunk, h: 32 };
+	var copyPoint = { x: 0, y: 0 };
+
+	for (var x = 0; x < 32; x += wavePixelChunk)
+	{
+		copyPoint.x = x;
+		copyPoint.y = waveSize + (waveSize / 2) + waveData.sin[s];
+
+		bmd.context.drawImage(game.cache.getImage('ball'), copyRect.x, copyRect.y, copyRect.w, copyRect.h, copyPoint.x, copyPoint.y, copyRect.w, copyRect.h);
+			
+		copyRect.x += wavePixelChunk;
+			
+		s++;
+	}
+
+	//	Cycle through the wave data - this is what causes the image to "undulate"
+	game.math.shift(waveData.sin);
+	
+	waveDataCounter++;
+	
+	if (waveDataCounter == waveData.length)
+	{
+		waveDataCounter = 0;
+	}
+}
+
+
+function render() {
+
+	bmd.render();
+
+}

examples/wip/bmd2.js

@@ -0,0 +1,47 @@
+
+var game = new Phaser.Game(800, 600, Phaser.AUTO, 'phaser-example', { preload: preload, create: create, update: update, render: render });
+
+function preload() {
+
+    game.load.image('atari1', 'assets/sprites/atari130xe.png');
+    game.load.image('coke', 'assets/sprites/cokecan.png');
+    game.load.image('mushroom', 'assets/sprites/mushroom2.png');
+    game.load.image('ball', 'assets/sprites/shinyball.png');
+
+}
+
+var bmd;
+
+function create() {
+
+	//game.stage.backgroundColor = '#450034';
+
+	bmd = game.add.bitmapData('bob', 800, 600);
+
+    //  And apply it to 100 randomly positioned sprites
+    for (var i = 0; i < 100; i++)
+    {
+    	bmd.setPixel(game.world.randomX, game.world.randomY, Math.random() * 255, Math.random() * 255, 255);
+    }
+
+    bmd.context.fillStyle = '#ffffff';
+    bmd.context.fillRect(20,20,16,16);
+
+    var d = game.add.sprite(0, 0, bmd);
+
+}
+
+function update() {
+
+	// bmd.clear();
+
+	// updateWobblyBall();
+
+}
+
+
+function render() {
+
+	// bmd.render();
+
+}

examples/wip/index.php

@@ -77,7 +77,6 @@ function printJSLinks($dir, $files) {
         <meta charset="UTF-8" />
         <title>phaser</title>
         <base href="../"></base>
-        <script src="http://cdnjs.cloudflare.com/ajax/libs/gsap/1.10.3/TweenMax.min.js"></script>
         <?php
             require('../../build/config.php');
 

src/Phaser.js

@@ -29,6 +29,7 @@ var Phaser = Phaser || {
 	TILEMAPLAYER: 10,
 	EMITTER: 11,
 	POLYGON: 12,
+	BITMAPDATA: 13,
 
 	NONE: 0,
 	LEFT: 1,