Merge pull request #40 from adireddy/develop

application utility class updated to specify renderer to use

Author: Adi

docs.xml

@@ -13485,34 +13485,37 @@ Documentation for this class was provided by <a href="https://developer.mozilla.
 			<x path="Bool"/>
 			<meta><m n=":noCompletion"/></meta>
 		</_skipFrame>
-		<_setDefaultValues set="method" line="96">
+		<_setDefaultValues set="method" line="103">
 			<f a=""><x path="Void"/></f>
 			<meta><m n=":noCompletion"/></meta>
 		</_setDefaultValues>
-		<start public="1" set="method" line="107"><f a=""><x path="Void"/></f></start>
-		<_onWindowResize set="method" line="127">
+		<start public="1" set="method" line="118"><f a="?renderer" v="'auto'">
+	<c path="String"/>
+	<x path="Void"/>
+</f></start>
+		<_onWindowResize set="method" line="142">
 			<f a="event">
 				<c path="js.html.Event"/>
 				<x path="Void"/>
 			</f>
 			<meta><m n=":noCompletion"/></meta>
 		</_onWindowResize>
-		<_onRequestAnimationFrame set="method" line="136">
+		<_onRequestAnimationFrame set="method" line="151">
 			<f a=""><x path="Void"/></f>
 			<meta><m n=":noCompletion"/></meta>
 		</_onRequestAnimationFrame>
-		<_calculateElapsedTime set="method" line="148">
+		<_calculateElapsedTime set="method" line="163">
 			<f a=""><x path="Void"/></f>
 			<meta><m n=":noCompletion"/></meta>
 		</_calculateElapsedTime>
-		<set_stats set="method" line="154">
+		<set_stats set="method" line="169">
 			<f a="val">
 				<x path="Bool"/>
 				<x path="Bool"/>
 			</f>
 			<meta><m n=":noCompletion"/></meta>
 		</set_stats>
-		<new public="1" set="method" line="91"><f a=""><x path="Void"/></f></new>
+		<new public="1" set="method" line="98"><f a=""><x path="Void"/></f></new>
 		<meta><m n=":keep"/></meta>
 	</class>
 	<typedef path="pixi.CanvasElement" params="" file="pixi/DomDefinitions.hx" module="pixi.DomDefinitions">

haxelib.json

@@ -4,8 +4,8 @@
   "tags": ["js","haxe","pixi","extern","web"],
   "description": "Externs of pixi.js v2.2.5 for Haxe - JavaScript 2D webGL renderer with canvas fallback.",
   "contributors": ["adireddy"],
-  "releasenote": "added applyScale method DisplayObject",
-  "version": "2.2.7",
+  "releasenote": "application utility class updated",
+  "version": "2.2.8",
   "url": "https://github.com/adireddy/haxe-pixi",
   "dependencies": {
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pixijs",
-  "version": "2.2.7",
+  "version": "2.2.8",
   "description": "Externs of pixi.js v2.2.0 for Haxe - JavaScript 2D webGL renderer with canvas fallback.",
   "repository": {
     "type": "git",

pixi/Application.hx

@@ -8,6 +8,8 @@
 
 package pixi;
 
+import pixi.renderers.webgl.WebGLRenderer;
+import pixi.renderers.canvas.CanvasRenderer;
 import js.html.Event;
 import js.html.CanvasElement;
 import js.Browser;
@@ -79,6 +81,11 @@ class Application {
 	 */
 	var _stage(default, null):Stage;
 
+	public static inline var AUTO:String = "auto";
+	public static inline var RECOMMENDED:String = "recommended";
+	public static inline var CANVAS:String = "canvas";
+	public static inline var WEBGL:String = "webgl";
+
 	@:noCompletion var _canvas:CanvasElement;
 	@:noCompletion var _renderer:IRenderer;
 	@:noCompletion var _stats:Stats;
@@ -104,7 +111,11 @@ class Application {
 		_skipFrame = false;
 	}
 
-	public function start() {
+	/*
+	 * Type of the renderer to use AUTO | RECOMMENDED | CANVAS | WEBGL
+	 * @default AUTO
+	 */
+	public function start(?renderer:String = AUTO) {
 		_canvas = Browser.document.createCanvasElement();
 		_canvas.style.width = width + "px";
 		_canvas.style.height = height + "px";
@@ -117,7 +128,11 @@ class Application {
 		renderingOptions.view = _canvas;
 		renderingOptions.resolution = pixelRatio;
 
-		_renderer = Detector.autoDetectRenderer(width, height, renderingOptions);
+		if (renderer == AUTO) _renderer = Detector.autoDetectRenderer(width, height, renderingOptions);
+		else if (renderer == RECOMMENDED) _renderer = Detector.autoDetectRecommendedRenderer(width, height, renderingOptions);
+		else if (renderer == CANVAS) _renderer = new CanvasRenderer(width, height, renderingOptions);
+		else _renderer = new WebGLRenderer(width, height, renderingOptions);
+
 		Browser.document.body.appendChild(_renderer.view);
 		if (resize) Browser.window.onresize = _onWindowResize;
 		Browser.window.requestAnimationFrame(cast _onRequestAnimationFrame);

samples/_output/hx-pixi-basics.js

@@ -21,7 +21,8 @@ pixi.Application.prototype = {
 		this.resize = true;
 		this._skipFrame = false;
 	}
-	,start: function() {
+	,start: function(renderer) {
+		if(renderer == null) renderer = "auto";
 		var _this = window.document;
 		this._canvas = _this.createElement("canvas");
 		this._canvas.style.width = this.width + "px";
@@ -32,7 +33,7 @@ pixi.Application.prototype = {
 		var renderingOptions = { };
 		renderingOptions.view = this._canvas;
 		renderingOptions.resolution = this.pixelRatio;
-		this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions);
+		if(renderer == "auto") this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions); else if(renderer == "recommended") this._renderer = PIXI.autoDetectRecommendedRenderer(this.width,this.height,renderingOptions); else if(renderer == "canvas") this._renderer = new PIXI.CanvasRenderer(this.width,this.height,renderingOptions); else this._renderer = new PIXI.WebGLRenderer(this.width,this.height,renderingOptions);
 		window.document.body.appendChild(this._renderer.view);
 		if(this.resize) window.onresize = $bind(this,this._onWindowResize);
 		window.requestAnimationFrame($bind(this,this._onRequestAnimationFrame));
@@ -108,13 +109,13 @@ samples.basics.Main.main = function() {
 samples.basics.Main.__super__ = pixi.Application;
 samples.basics.Main.prototype = $extend(pixi.Application.prototype,{
 	_init: function() {
-		this.set_stats(true);
 		this.backgroundColor = 13158;
 		this.onUpdate = $bind(this,this._onUpdate);
 		this.resize = false;
 		this.width = 800;
 		this.height = 600;
 		pixi.Application.prototype.start.call(this);
+		this.set_stats(true);
 	}
 	,_onUpdate: function(elapsedTime) {
 		this._bunny.rotation += 0.1;

samples/_output/hx-pixi-bitmaptext.js

@@ -21,7 +21,8 @@ pixi.Application.prototype = {
 		this.resize = true;
 		this._skipFrame = false;
 	}
-	,start: function() {
+	,start: function(renderer) {
+		if(renderer == null) renderer = "auto";
 		var _this = window.document;
 		this._canvas = _this.createElement("canvas");
 		this._canvas.style.width = this.width + "px";
@@ -32,7 +33,7 @@ pixi.Application.prototype = {
 		var renderingOptions = { };
 		renderingOptions.view = this._canvas;
 		renderingOptions.resolution = this.pixelRatio;
-		this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions);
+		if(renderer == "auto") this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions); else if(renderer == "recommended") this._renderer = PIXI.autoDetectRecommendedRenderer(this.width,this.height,renderingOptions); else if(renderer == "canvas") this._renderer = new PIXI.CanvasRenderer(this.width,this.height,renderingOptions); else this._renderer = new PIXI.WebGLRenderer(this.width,this.height,renderingOptions);
 		window.document.body.appendChild(this._renderer.view);
 		if(this.resize) window.onresize = $bind(this,this._onWindowResize);
 		window.requestAnimationFrame($bind(this,this._onRequestAnimationFrame));

samples/_output/hx-pixi-blur.js

@@ -21,7 +21,8 @@ pixi.Application.prototype = {
 		this.resize = true;
 		this._skipFrame = false;
 	}
-	,start: function() {
+	,start: function(renderer) {
+		if(renderer == null) renderer = "auto";
 		var _this = window.document;
 		this._canvas = _this.createElement("canvas");
 		this._canvas.style.width = this.width + "px";
@@ -32,7 +33,7 @@ pixi.Application.prototype = {
 		var renderingOptions = { };
 		renderingOptions.view = this._canvas;
 		renderingOptions.resolution = this.pixelRatio;
-		this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions);
+		if(renderer == "auto") this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions); else if(renderer == "recommended") this._renderer = PIXI.autoDetectRecommendedRenderer(this.width,this.height,renderingOptions); else if(renderer == "canvas") this._renderer = new PIXI.CanvasRenderer(this.width,this.height,renderingOptions); else this._renderer = new PIXI.WebGLRenderer(this.width,this.height,renderingOptions);
 		window.document.body.appendChild(this._renderer.view);
 		if(this.resize) window.onresize = $bind(this,this._onWindowResize);
 		window.requestAnimationFrame($bind(this,this._onRequestAnimationFrame));

samples/_output/hx-pixi-bunnymark.js

@@ -25,7 +25,8 @@ pixi.Application.prototype = {
 		this.resize = true;
 		this._skipFrame = false;
 	}
-	,start: function() {
+	,start: function(renderer) {
+		if(renderer == null) renderer = "auto";
 		var _this = window.document;
 		this._canvas = _this.createElement("canvas");
 		this._canvas.style.width = this.width + "px";
@@ -36,7 +37,7 @@ pixi.Application.prototype = {
 		var renderingOptions = { };
 		renderingOptions.view = this._canvas;
 		renderingOptions.resolution = this.pixelRatio;
-		this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions);
+		if(renderer == "auto") this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions); else if(renderer == "recommended") this._renderer = PIXI.autoDetectRecommendedRenderer(this.width,this.height,renderingOptions); else if(renderer == "canvas") this._renderer = new PIXI.CanvasRenderer(this.width,this.height,renderingOptions); else this._renderer = new PIXI.WebGLRenderer(this.width,this.height,renderingOptions);
 		window.document.body.appendChild(this._renderer.view);
 		if(this.resize) window.onresize = $bind(this,this._onWindowResize);
 		window.requestAnimationFrame($bind(this,this._onRequestAnimationFrame));

samples/_output/hx-pixi-colourmatrix.js

@@ -21,7 +21,8 @@ pixi.Application.prototype = {
 		this.resize = true;
 		this._skipFrame = false;
 	}
-	,start: function() {
+	,start: function(renderer) {
+		if(renderer == null) renderer = "auto";
 		var _this = window.document;
 		this._canvas = _this.createElement("canvas");
 		this._canvas.style.width = this.width + "px";
@@ -32,7 +33,7 @@ pixi.Application.prototype = {
 		var renderingOptions = { };
 		renderingOptions.view = this._canvas;
 		renderingOptions.resolution = this.pixelRatio;
-		this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions);
+		if(renderer == "auto") this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions); else if(renderer == "recommended") this._renderer = PIXI.autoDetectRecommendedRenderer(this.width,this.height,renderingOptions); else if(renderer == "canvas") this._renderer = new PIXI.CanvasRenderer(this.width,this.height,renderingOptions); else this._renderer = new PIXI.WebGLRenderer(this.width,this.height,renderingOptions);
 		window.document.body.appendChild(this._renderer.view);
 		if(this.resize) window.onresize = $bind(this,this._onWindowResize);
 		window.requestAnimationFrame($bind(this,this._onRequestAnimationFrame));

samples/_output/hx-pixi-graphics.js

@@ -25,7 +25,8 @@ pixi.Application.prototype = {
 		this.resize = true;
 		this._skipFrame = false;
 	}
-	,start: function() {
+	,start: function(renderer) {
+		if(renderer == null) renderer = "auto";
 		var _this = window.document;
 		this._canvas = _this.createElement("canvas");
 		this._canvas.style.width = this.width + "px";
@@ -36,7 +37,7 @@ pixi.Application.prototype = {
 		var renderingOptions = { };
 		renderingOptions.view = this._canvas;
 		renderingOptions.resolution = this.pixelRatio;
-		this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions);
+		if(renderer == "auto") this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions); else if(renderer == "recommended") this._renderer = PIXI.autoDetectRecommendedRenderer(this.width,this.height,renderingOptions); else if(renderer == "canvas") this._renderer = new PIXI.CanvasRenderer(this.width,this.height,renderingOptions); else this._renderer = new PIXI.WebGLRenderer(this.width,this.height,renderingOptions);
 		window.document.body.appendChild(this._renderer.view);
 		if(this.resize) window.onresize = $bind(this,this._onWindowResize);
 		window.requestAnimationFrame($bind(this,this._onRequestAnimationFrame));

samples/_output/hx-pixi-movieclip.js

@@ -25,7 +25,8 @@ pixi.Application.prototype = {
 		this.resize = true;
 		this._skipFrame = false;
 	}
-	,start: function() {
+	,start: function(renderer) {
+		if(renderer == null) renderer = "auto";
 		var _this = window.document;
 		this._canvas = _this.createElement("canvas");
 		this._canvas.style.width = this.width + "px";
@@ -36,7 +37,7 @@ pixi.Application.prototype = {
 		var renderingOptions = { };
 		renderingOptions.view = this._canvas;
 		renderingOptions.resolution = this.pixelRatio;
-		this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions);
+		if(renderer == "auto") this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions); else if(renderer == "recommended") this._renderer = PIXI.autoDetectRecommendedRenderer(this.width,this.height,renderingOptions); else if(renderer == "canvas") this._renderer = new PIXI.CanvasRenderer(this.width,this.height,renderingOptions); else this._renderer = new PIXI.WebGLRenderer(this.width,this.height,renderingOptions);
 		window.document.body.appendChild(this._renderer.view);
 		if(this.resize) window.onresize = $bind(this,this._onWindowResize);
 		window.requestAnimationFrame($bind(this,this._onRequestAnimationFrame));

samples/_output/hx-pixi-nape.js

@@ -3382,7 +3382,8 @@ pixi.Application.prototype = {
 		this.resize = true;
 		this._skipFrame = false;
 	}
-	,start: function() {
+	,start: function(renderer) {
+		if(renderer == null) renderer = "auto";
 		var _this = window.document;
 		this._canvas = _this.createElement("canvas");
 		this._canvas.style.width = this.width + "px";
@@ -3393,7 +3394,7 @@ pixi.Application.prototype = {
 		var renderingOptions = { };
 		renderingOptions.view = this._canvas;
 		renderingOptions.resolution = this.pixelRatio;
-		this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions);
+		if(renderer == "auto") this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions); else if(renderer == "recommended") this._renderer = PIXI.autoDetectRecommendedRenderer(this.width,this.height,renderingOptions); else if(renderer == "canvas") this._renderer = new PIXI.CanvasRenderer(this.width,this.height,renderingOptions); else this._renderer = new PIXI.WebGLRenderer(this.width,this.height,renderingOptions);
 		window.document.body.appendChild(this._renderer.view);
 		if(this.resize) window.onresize = $bind(this,this._onWindowResize);
 		window.requestAnimationFrame($bind(this,this._onRequestAnimationFrame));

samples/_output/hx-pixi-particles.js

@@ -30,7 +30,8 @@ pixi.Application.prototype = {
 		this.resize = true;
 		this._skipFrame = false;
 	}
-	,start: function() {
+	,start: function(renderer) {
+		if(renderer == null) renderer = "auto";
 		var _this = window.document;
 		this._canvas = _this.createElement("canvas");
 		this._canvas.style.width = this.width + "px";
@@ -41,7 +42,7 @@ pixi.Application.prototype = {
 		var renderingOptions = { };
 		renderingOptions.view = this._canvas;
 		renderingOptions.resolution = this.pixelRatio;
-		this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions);
+		if(renderer == "auto") this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions); else if(renderer == "recommended") this._renderer = PIXI.autoDetectRecommendedRenderer(this.width,this.height,renderingOptions); else if(renderer == "canvas") this._renderer = new PIXI.CanvasRenderer(this.width,this.height,renderingOptions); else this._renderer = new PIXI.WebGLRenderer(this.width,this.height,renderingOptions);
 		window.document.body.appendChild(this._renderer.view);
 		if(this.resize) window.onresize = $bind(this,this._onWindowResize);
 		window.requestAnimationFrame($bind(this,this._onRequestAnimationFrame));

samples/_output/hx-pixi-pixidude.js

@@ -21,7 +21,8 @@ pixi.Application.prototype = {
 		this.resize = true;
 		this._skipFrame = false;
 	}
-	,start: function() {
+	,start: function(renderer) {
+		if(renderer == null) renderer = "auto";
 		var _this = window.document;
 		this._canvas = _this.createElement("canvas");
 		this._canvas.style.width = this.width + "px";
@@ -32,7 +33,7 @@ pixi.Application.prototype = {
 		var renderingOptions = { };
 		renderingOptions.view = this._canvas;
 		renderingOptions.resolution = this.pixelRatio;
-		this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions);
+		if(renderer == "auto") this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions); else if(renderer == "recommended") this._renderer = PIXI.autoDetectRecommendedRenderer(this.width,this.height,renderingOptions); else if(renderer == "canvas") this._renderer = new PIXI.CanvasRenderer(this.width,this.height,renderingOptions); else this._renderer = new PIXI.WebGLRenderer(this.width,this.height,renderingOptions);
 		window.document.body.appendChild(this._renderer.view);
 		if(this.resize) window.onresize = $bind(this,this._onWindowResize);
 		window.requestAnimationFrame($bind(this,this._onRequestAnimationFrame));

samples/_output/hx-pixi-rendertexture.js

@@ -21,7 +21,8 @@ pixi.Application.prototype = {
 		this.resize = true;
 		this._skipFrame = false;
 	}
-	,start: function() {
+	,start: function(renderer) {
+		if(renderer == null) renderer = "auto";
 		var _this = window.document;
 		this._canvas = _this.createElement("canvas");
 		this._canvas.style.width = this.width + "px";
@@ -32,7 +33,7 @@ pixi.Application.prototype = {
 		var renderingOptions = { };
 		renderingOptions.view = this._canvas;
 		renderingOptions.resolution = this.pixelRatio;
-		this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions);
+		if(renderer == "auto") this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions); else if(renderer == "recommended") this._renderer = PIXI.autoDetectRecommendedRenderer(this.width,this.height,renderingOptions); else if(renderer == "canvas") this._renderer = new PIXI.CanvasRenderer(this.width,this.height,renderingOptions); else this._renderer = new PIXI.WebGLRenderer(this.width,this.height,renderingOptions);
 		window.document.body.appendChild(this._renderer.view);
 		if(this.resize) window.onresize = $bind(this,this._onWindowResize);
 		window.requestAnimationFrame($bind(this,this._onRequestAnimationFrame));

samples/_output/hx-pixi-snake.js

@@ -21,7 +21,8 @@ pixi.Application.prototype = {
 		this.resize = true;
 		this._skipFrame = false;
 	}
-	,start: function() {
+	,start: function(renderer) {
+		if(renderer == null) renderer = "auto";
 		var _this = window.document;
 		this._canvas = _this.createElement("canvas");
 		this._canvas.style.width = this.width + "px";
@@ -32,7 +33,7 @@ pixi.Application.prototype = {
 		var renderingOptions = { };
 		renderingOptions.view = this._canvas;
 		renderingOptions.resolution = this.pixelRatio;
-		this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions);
+		if(renderer == "auto") this._renderer = PIXI.autoDetectRenderer(this.width,this.height,renderingOptions); else if(renderer == "recommended") this._renderer = PIXI.autoDetectRecommendedRenderer(this.width,this.height,renderingOptions); else if(renderer == "canvas") this._renderer = new PIXI.CanvasRenderer(this.width,this.height,renderingOptions); else this._renderer = new PIXI.WebGLRenderer(this.width,this.height,renderingOptions);
 		window.document.body.appendChild(this._renderer.view);
 		if(this.resize) window.onresize = $bind(this,this._onWindowResize);
 		window.requestAnimationFrame($bind(this,this._onRequestAnimationFrame));