diff --git a/res/app/components/stf/screen/fast-image-render/index.js b/res/app/components/stf/screen/fast-image-render/index.js index 62d2255b..f1e25fee 100644 --- a/res/app/components/stf/screen/fast-image-render/index.js +++ b/res/app/components/stf/screen/fast-image-render/index.js @@ -6,53 +6,6 @@ // ------------------------------------------------------------------------------------------------- -function FastPixiRender(canvasElement, options) { - this.options = options - - this.stage = new PIXI.Stage(0x000000) - - this.canvasWidth = 643 - this.canvasHeight = 1149 - - switch (this.options.render) { - case 'pixi': - this.renderer = new PIXI.autoDetectRenderer(this.canvasWidth, this.canvasHeight, canvasElement) - break; - case 'pixi-canvas': - this.renderer = new PIXI.CanvasRenderer(this.canvasWidth, this.canvasHeight, canvasElement) - break; - case 'pixi-webgl': - this.renderer = new PIXI.WebGLRenderer(this.canvasWidth, this.canvasHeight, canvasElement) - break; - } -} - - -FastPixiRender.prototype.draw = function (image) { - -// if (this.baseTexture) { -// this.baseTexture.destroy() -// } - this.baseTexture = new PIXI.BaseTexture(image) - - if (this.texture) { - this.texture.destroy(true) - } - this.texture = new PIXI.Texture(this.baseTexture) - - if (this.sprite) { - this.sprite.setTexture(this.texture) - //this.stage.removeChild(this.sprite) - } else { - this.sprite = new PIXI.Sprite(this.texture) - this.stage.addChild(this.sprite) - } - - this.renderer.render(this.stage) -} - -// ------------------------------------------------------------------------------------------------- - function CanvasRender(canvasElement, options) { var checkForCanvasElement = function checkForCanvasElement() { if (!canvasElement) { @@ -454,8 +407,6 @@ function FastImageRender(canvasElement, options) { if (this.options.render === 'webgl') { this.render = new WebGLRender(canvasElement, options) - } else if (this.options.render.indexOf('pixi') !== -1) { - this.render = new FastPixiRender(canvasElement, options) } else { this.render = new CanvasRender(canvasElement, options) } diff --git a/res/app/components/stf/screen/screen-directive.js b/res/app/components/stf/screen/screen-directive.js index cba64992..c3f9ab7b 100644 --- a/res/app/components/stf/screen/screen-directive.js +++ b/res/app/components/stf/screen/screen-directive.js @@ -1,4 +1,3 @@ -var FastImageLoader = require('./fast-image-render').FastImageLoader var FastImageRender = require('./fast-image-render').FastImageRender module.exports = function DeviceScreenDirective($document, ScalingService, $rootScope) { @@ -7,8 +6,7 @@ module.exports = function DeviceScreenDirective($document, ScalingService, $root template: require('./screen.jade'), link: function (scope, element, attrs) { scope.device.promise.then(function (device) { - var imageLoader = new FastImageLoader() - , canvas = element.find('canvas')[0] + var canvas = element.find('canvas')[0] , imageRender = new FastImageRender(canvas, {render: 'canvas'}) , finger = element.find('span') , input = element.find('textarea') @@ -60,14 +58,14 @@ module.exports = function DeviceScreenDirective($document, ScalingService, $root } function loadScreen() { - imageLoader.load(device.display.url + + imageRender.load(device.display.url + '?width=' + displayWidth + '&height=' + displayHeight + '&time=' + Date.now() ) } - imageLoader.onLoad = function (image) { + imageRender.onLoad = function (image) { if (scope.canView && scope.showScreen) { // Check to set the size only if updated @@ -102,7 +100,7 @@ module.exports = function DeviceScreenDirective($document, ScalingService, $root } - imageLoader.onError = function () { + imageRender.onError = function () { scope.$apply(function () { scope.displayError = true }) @@ -152,7 +150,7 @@ module.exports = function DeviceScreenDirective($document, ScalingService, $root } scope.$on('$destroy', function () { - loader.onload = loader.onerror = null + imageRender.onLoad = imageRender.onError = null stop() })