jeena/pixi.js
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/GoodBoyDigital/pixi.js into dev

Browse source
This commit is contained in:
Mat Groves 2014-02-13 16:02:39 +00:00
commit 818f709764
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
examples/example 13 - Graphics/indexLineTest.html
View file

@ -25,8 +25,7 @@
var sprite= PIXI.Sprite.fromImage("spinObj_02.png"); var sprite= PIXI.Sprite.fromImage("spinObj_02.png");
//stage.addChild(sprite); //stage.addChild(sprite);
// create a renderer instance // create a renderer instance
// the 5the parameter is the anti aliasing var renderer = PIXI.autoDetectRenderer(620, 380, null, false /* transparent */, true /* antialias */);
var renderer = PIXI.autoDetectRenderer(620, 380, null, false, true);
// set the canvas width and height to fill the screen // set the canvas width and height to fill the screen
//renderer.view.style.width = window.innerWidth + "px"; //renderer.view.style.width = window.innerWidth + "px";

3
examples/example 7 - Transparent Background/index.html
View file

@ -32,7 +32,8 @@
// create a renderer instance // create a renderer instance
var renderer = PIXI.autoDetectRenderer(400, 300,false,true); var renderer = PIXI.autoDetectRenderer(400, 300, null, true, true);
// add the renderer view element to the DOM // add the renderer view element to the DOM
document.body.appendChild(renderer.view); document.body.appendChild(renderer.view);

4
src/pixi/utils/Detector.js
View file

@ -11,11 +11,11 @@
* @param width=800 {Number} the width of the renderers view * @param width=800 {Number} the width of the renderers view
* @param height=600 {Number} the height of the renderers view * @param height=600 {Number} the height of the renderers view
* @param [view] {Canvas} the canvas to use as a view, optional * @param [view] {Canvas} the canvas to use as a view, optional
* @param [antialias=false] {Boolean} sets antialias (only applicable in webGL chrome at the moment)
* @param [transparent=false] {Boolean} the transparency of the render view, default false * @param [transparent=false] {Boolean} the transparency of the render view, default false
* @param [antialias=false] {Boolean} sets antialias (only applicable in webGL chrome at the moment)
* *
*/ */
PIXI.autoDetectRenderer = function(width, height, view,antialias,transparent) PIXI.autoDetectRenderer = function(width, height, view, transparent, antialias)
{ {
if(!width)width = 800; if(!width)width = 800;
if(!height)height = 600; if(!height)height = 600;