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

Merge pull request #15 from ewdicus/master

Browse source 
Removed some merge conflict tags from Detector.js
This commit is contained in:
Mat Groves 2013-03-21 01:47:20 -07:00
commit 0702bb02fd
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,19 +17,15 @@ PIXI.autoDetectRenderer = function(width, height, view)
if(!height)height = 600; if(!height)height = 600;
// BORROWED from Mr Doob (mrdoob.com) // BORROWED from Mr Doob (mrdoob.com)
var webgl = ( function () { try { return !! window.WebGLRenderingContext && !! document.createElement( 'canvas' ).getContext( 'experimental-webgl' ); } catch( e ) { return false; } } )() var webgl = ( function () { try { return !! window.WebGLRenderingContext && !! document.createElement( 'canvas' ).getContext( 'experimental-webgl' ); } catch( e ) { return false; } } )();
//console.log(webgl); //console.log(webgl);
if( webgl ) if( webgl )
{ {
<<<<<<< HEAD return new PIXI.WebGLRenderer(width, height, view);
return new PIXI.WebGLRenderer(width, height, view)
=======
return new PIXI.WebGLRenderer(width, height, view)
>>>>>>> Interactivity Added
} }
return new PIXI.CanvasRenderer(width, height, view); return new PIXI.CanvasRenderer(width, height, view);
} };