Chuck.js Now all new with WEB_GL ! haha stupid config typo! arrgh

This commit is contained in:
logsol 2014-01-17 02:13:59 +01:00
parent 73d24ed14c
commit 0072f0e6b5
4 changed files with 26 additions and 13 deletions

View file

@ -17,6 +17,7 @@ function (Parent, DomController, PIXI, Settings, NotificationCenter) {
this.stage = null; this.stage = null;
this.container = null; this.container = null;
this.init(); this.init();
this.pixi = PIXI;
} }
PixiView.prototype = Object.create(Parent.prototype); PixiView.prototype = Object.create(Parent.prototype);
@ -25,14 +26,25 @@ function (Parent, DomController, PIXI, Settings, NotificationCenter) {
if(Settings.USE_WEBGL) { if(Settings.USE_WEBGL) {
this.renderer = new PIXI.WebGLRenderer(Settings.STAGE_WIDTH, Settings.STAGE_HEIGHT); this.renderer = new PIXI.WebGLRenderer(Settings.STAGE_WIDTH, Settings.STAGE_HEIGHT);
console.log('WebGLRenderer')
} else { } else {
this.renderer = new PIXI.CanvasRenderer(Settings.STAGE_WIDTH, Settings.STAGE_HEIGHT); this.renderer = new PIXI.CanvasRenderer(Settings.STAGE_WIDTH, Settings.STAGE_HEIGHT);
console.log('CanvasRenderer')
} }
this.stage = stage = new PIXI.Stage(0x333333); this.stage = new PIXI.Stage(0x333333);
this.initCamera(); this.initCamera();
/*
var blurFilter = new PIXI.BlurFilter();
blurFilter.blurX = 12;
blurFilter.blurY = 0;
var grayFilter = new PIXI.GrayFilter();
grayFilter.gray = .6;
this.stage.filters = [grayFilter];
*/
this.setCanvas(this.renderer.view); this.setCanvas(this.renderer.view);
} }
@ -106,6 +118,7 @@ function (Parent, DomController, PIXI, Settings, NotificationCenter) {
} }
PixiView.prototype.initCamera = function () { PixiView.prototype.initCamera = function () {
this.container = new PIXI.DisplayObjectContainer(); this.container = new PIXI.DisplayObjectContainer();
this.stage.addChild(this.container); this.stage.addChild(this.container);
} }

View file

@ -17,7 +17,7 @@ define({
GRAPHICS_SUBPATH_TILES: 'Tiles/', GRAPHICS_SUBPATH_TILES: 'Tiles/',
RATIO: 21, //35 RATIO: 21, //35
TILE_SIZE: 65, //15, 25 is original picture TILE_SIZE: 15, //15, 25 is original picture
CAMERA_IS_ORTHOGRAPHIC: true, CAMERA_IS_ORTHOGRAPHIC: true,
VIEW_CONTROLLER: 0 ? 'Three' : 'Pixi', VIEW_CONTROLLER: 0 ? 'Three' : 'Pixi',
@ -45,7 +45,7 @@ define({
// BROWSER // BROWSER
CANVAS_DOM_ID: 'canvasContainer', CANVAS_DOM_ID: 'canvasContainer',
IS_BROWSER_ENVIRONMENT: typeof window !== 'undefined', IS_BROWSER_ENVIRONMENT: typeof window !== 'undefined',
USE_WEGBL: true, USE_WEBGL: true,
// NETWORKING // NETWORKING
WORLD_UPDATE_BROADCAST_INTERVAL: 70, WORLD_UPDATE_BROADCAST_INTERVAL: 70,

View file

@ -1,3 +1,3 @@
define(["Lib/Vendor/Pixi/pixi.dev"], function() { define(["Lib/Vendor/Pixi/pixi.dev"], function(PIXI) {
return PIXI; return PIXI;
}) })

View file

@ -2047,10 +2047,10 @@ PIXI.MovieClip.prototype.constructor = PIXI.MovieClip;
* @readOnly * @readOnly
*/ */
Object.defineProperty( PIXI.MovieClip.prototype, 'totalFrames', { Object.defineProperty( PIXI.MovieClip.prototype, 'totalFrames', {
get: function() { get: function() {
return this.textures.length; return this.textures.length;
} }
}); });
@ -3685,11 +3685,11 @@ PIXI.EventTarget = function () {
}; };
this.removeAllEventListeners = function( type ) { this.removeAllEventListeners = function( type ) {
var a = listeners[type]; var a = listeners[type];
if (a) if (a)
a.length = 0; a.length = 0;
}; };
}; };
/** /**