diff --git a/src/renderer/webgl/pipelines/LightPipeline.js b/src/renderer/webgl/pipelines/LightPipeline.js index 430aeca52..bc90f1763 100644 --- a/src/renderer/webgl/pipelines/LightPipeline.js +++ b/src/renderer/webgl/pipelines/LightPipeline.js @@ -7,10 +7,8 @@ var Class = require('../../../utils/Class'); var GetFastValue = require('../../../utils/object/GetFastValue'); -var ModelViewProjection = require('./components/ModelViewProjection'); var PointLightShaderSourceFS = require('../shaders/PointLight-frag.js'); var PointLightShaderSourceVS = require('../shaders/PointLight-vert.js'); -var ProjectOrtho = require('../mvp/ProjectOrtho'); var TransformMatrix = require('../../../gameobjects/components/TransformMatrix'); var WebGLPipeline = require('../WebGLPipeline'); @@ -68,10 +66,6 @@ var LightPipeline = new Class({ Extends: WebGLPipeline, - Mixins: [ - ModelViewProjection - ], - initialize: function LightPipeline (config) @@ -207,8 +201,6 @@ var LightPipeline = new Class({ this.lightCount = 0; this.forceZero = true; - - this.mvpInit(); }, /** @@ -334,7 +326,6 @@ var LightPipeline = new Class({ */ onBind: function () { - this.mvpUpdate(); return this; }, @@ -400,26 +391,6 @@ var LightPipeline = new Class({ return this; }, - /** - * Resizes this pipeline and updates the projection. - * - * @method Phaser.Renderer.WebGL.Pipelines.MultiPipeline#resize - * @since 3.0.0 - * - * @param {number} width - The new width. - * @param {number} height - The new height. - * - * @return {this} This WebGLPipeline instance. - */ - resize: function (width, height) - { - WebGLPipeline.prototype.resize.call(this, width, height); - - ProjectOrtho(this, 0, this.width, this.height, 0, -1000, 1000); - - return this; - }, - /** * This function sets all the needed resources for each camera pass. * diff --git a/src/renderer/webgl/pipelines/MultiPipeline.js b/src/renderer/webgl/pipelines/MultiPipeline.js index f8df62c8d..5503e50f6 100644 --- a/src/renderer/webgl/pipelines/MultiPipeline.js +++ b/src/renderer/webgl/pipelines/MultiPipeline.js @@ -8,8 +8,6 @@ var Class = require('../../../utils/Class'); var Earcut = require('../../../geom/polygon/Earcut'); var GetFastValue = require('../../../utils/object/GetFastValue'); -var ModelViewProjection = require('./components/ModelViewProjection'); -var ProjectOrtho = require('../mvp/ProjectOrtho'); var ShaderSourceFS = require('../shaders/Multi-frag.js'); var ShaderSourceVS = require('../shaders/Multi-vert.js'); var TransformMatrix = require('../../../gameobjects/components/TransformMatrix'); @@ -72,10 +70,6 @@ var MultiPipeline = new Class({ Extends: WebGLPipeline, - Mixins: [ - ModelViewProjection - ], - initialize: function MultiPipeline (config) @@ -292,8 +286,6 @@ var MultiPipeline = new Class({ * @since 3.12.0 */ this.polygonCache = []; - - this.mvpInit(); }, /** @@ -319,43 +311,6 @@ var MultiPipeline = new Class({ return this; }, - /** - * Called every time a Game Object needs to use this pipeline. - * - * @method Phaser.Renderer.WebGL.Pipelines.MultiPipeline#onBind - * @since 3.0.0 - * - * @param {Phaser.GameObjects.GameObject} [gameObject] - The Game Object that invoked this pipeline, if any. - * - * @return {this} This WebGLPipeline instance. - */ - onBind: function () - { - this.mvpUpdate(); - - return this; - }, - - /** - * Resizes this pipeline and updates the projection. - * - * @method Phaser.Renderer.WebGL.Pipelines.MultiPipeline#resize - * @since 3.0.0 - * - * @param {number} width - The new width. - * @param {number} height - The new height. - * - * @return {this} This WebGLPipeline instance. - */ - resize: function (width, height) - { - WebGLPipeline.prototype.resize.call(this, width, height); - - ProjectOrtho(this, 0, this.width, this.height, 0, -1000, 1000); - - return this; - }, - /** * Assigns a texture to the current batch. If a different texture is already set it creates a new batch object. * diff --git a/src/renderer/webgl/pipelines/RopePipeline.js b/src/renderer/webgl/pipelines/RopePipeline.js index 33c441218..8107ace16 100644 --- a/src/renderer/webgl/pipelines/RopePipeline.js +++ b/src/renderer/webgl/pipelines/RopePipeline.js @@ -5,7 +5,6 @@ */ var Class = require('../../../utils/Class'); -var ModelViewProjection = require('./components/ModelViewProjection'); var MultiPipeline = require('./MultiPipeline'); /** @@ -49,10 +48,6 @@ var RopePipeline = new Class({ Extends: MultiPipeline, - Mixins: [ - ModelViewProjection - ], - initialize: function RopePipeline (config) diff --git a/src/renderer/webgl/pipelines/SinglePipeline.js b/src/renderer/webgl/pipelines/SinglePipeline.js index 9d45bf086..421820a4a 100644 --- a/src/renderer/webgl/pipelines/SinglePipeline.js +++ b/src/renderer/webgl/pipelines/SinglePipeline.js @@ -6,7 +6,6 @@ var Class = require('../../../utils/Class'); var GetFastValue = require('../../../utils/object/GetFastValue'); -var ModelViewProjection = require('./components/ModelViewProjection'); var MultiPipeline = require('./MultiPipeline'); var ShaderSourceFS = require('../shaders/Single-frag.js'); var ShaderSourceVS = require('../shaders/Single-vert.js'); @@ -51,10 +50,6 @@ var SinglePipeline = new Class({ Extends: MultiPipeline, - Mixins: [ - ModelViewProjection - ], - initialize: function SinglePipeline (config)