From 870825594827a2c5848c3910dae9a58baf566fdc Mon Sep 17 00:00:00 2001 From: Richard Davey Date: Tue, 13 Oct 2020 10:56:21 +0100 Subject: [PATCH] Removed Layer3D Game Object and old MeshPipeline --- {src/gameobjects => plugins}/layer3d/Layer3D.js | 0 .../gameobjects => plugins}/layer3d/Layer3DCamera.js | 0 .../layer3d/Layer3DCanvasRenderer.js | 0 .../layer3d/Layer3DCreator.js | 0 .../layer3d/Layer3DFactory.js | 0 {src/gameobjects => plugins}/layer3d/Layer3DLight.js | 0 .../gameobjects => plugins}/layer3d/Layer3DRender.js | 0 .../layer3d/Layer3DWebGLRenderer.js | 0 .../pipelines => plugins/layer3d}/MeshPipeline.js | 0 src/gameobjects/index.js | 3 --- src/renderer/webgl/PipelineManager.js | 2 -- src/renderer/webgl/pipelines/const.js | 12 +----------- 12 files changed, 1 insertion(+), 16 deletions(-) rename {src/gameobjects => plugins}/layer3d/Layer3D.js (100%) rename {src/gameobjects => plugins}/layer3d/Layer3DCamera.js (100%) rename {src/gameobjects => plugins}/layer3d/Layer3DCanvasRenderer.js (100%) rename {src/gameobjects => plugins}/layer3d/Layer3DCreator.js (100%) rename {src/gameobjects => plugins}/layer3d/Layer3DFactory.js (100%) rename {src/gameobjects => plugins}/layer3d/Layer3DLight.js (100%) rename {src/gameobjects => plugins}/layer3d/Layer3DRender.js (100%) rename {src/gameobjects => plugins}/layer3d/Layer3DWebGLRenderer.js (100%) rename {src/renderer/webgl/pipelines => plugins/layer3d}/MeshPipeline.js (100%) diff --git a/src/gameobjects/layer3d/Layer3D.js b/plugins/layer3d/Layer3D.js similarity index 100% rename from src/gameobjects/layer3d/Layer3D.js rename to plugins/layer3d/Layer3D.js diff --git a/src/gameobjects/layer3d/Layer3DCamera.js b/plugins/layer3d/Layer3DCamera.js similarity index 100% rename from src/gameobjects/layer3d/Layer3DCamera.js rename to plugins/layer3d/Layer3DCamera.js diff --git a/src/gameobjects/layer3d/Layer3DCanvasRenderer.js b/plugins/layer3d/Layer3DCanvasRenderer.js similarity index 100% rename from src/gameobjects/layer3d/Layer3DCanvasRenderer.js rename to plugins/layer3d/Layer3DCanvasRenderer.js diff --git a/src/gameobjects/layer3d/Layer3DCreator.js b/plugins/layer3d/Layer3DCreator.js similarity index 100% rename from src/gameobjects/layer3d/Layer3DCreator.js rename to plugins/layer3d/Layer3DCreator.js diff --git a/src/gameobjects/layer3d/Layer3DFactory.js b/plugins/layer3d/Layer3DFactory.js similarity index 100% rename from src/gameobjects/layer3d/Layer3DFactory.js rename to plugins/layer3d/Layer3DFactory.js diff --git a/src/gameobjects/layer3d/Layer3DLight.js b/plugins/layer3d/Layer3DLight.js similarity index 100% rename from src/gameobjects/layer3d/Layer3DLight.js rename to plugins/layer3d/Layer3DLight.js diff --git a/src/gameobjects/layer3d/Layer3DRender.js b/plugins/layer3d/Layer3DRender.js similarity index 100% rename from src/gameobjects/layer3d/Layer3DRender.js rename to plugins/layer3d/Layer3DRender.js diff --git a/src/gameobjects/layer3d/Layer3DWebGLRenderer.js b/plugins/layer3d/Layer3DWebGLRenderer.js similarity index 100% rename from src/gameobjects/layer3d/Layer3DWebGLRenderer.js rename to plugins/layer3d/Layer3DWebGLRenderer.js diff --git a/src/renderer/webgl/pipelines/MeshPipeline.js b/plugins/layer3d/MeshPipeline.js similarity index 100% rename from src/renderer/webgl/pipelines/MeshPipeline.js rename to plugins/layer3d/MeshPipeline.js diff --git a/src/gameobjects/index.js b/src/gameobjects/index.js index 1873724f1..98fa25320 100644 --- a/src/gameobjects/index.js +++ b/src/gameobjects/index.js @@ -124,15 +124,12 @@ if (typeof WEBGL_RENDERER) // WebGL only Game Objects GameObjects.Shader = require('./shader/Shader'); GameObjects.Mesh = require('./mesh/Mesh'); - GameObjects.Layer3D = require('./layer3d/Layer3D'); GameObjects.Factories.Shader = require('./shader/ShaderFactory'); GameObjects.Factories.Mesh = require('./mesh/MeshFactory'); - GameObjects.Factories.Layer3D = require('./layer3d/Layer3DFactory'); GameObjects.Creators.Shader = require('./shader/ShaderCreator'); GameObjects.Creators.Mesh = require('./mesh/MeshCreator'); - GameObjects.Creators.Layer3D = require('./layer3d/Layer3DCreator'); GameObjects.Light = require('./lights/Light'); GameObjects.LightsManager = require('./lights/LightsManager'); diff --git a/src/renderer/webgl/PipelineManager.js b/src/renderer/webgl/PipelineManager.js index 5785769d6..151233e63 100644 --- a/src/renderer/webgl/PipelineManager.js +++ b/src/renderer/webgl/PipelineManager.js @@ -14,7 +14,6 @@ var LightPipeline = require('./pipelines/LightPipeline'); var MultiPipeline = require('./pipelines/MultiPipeline'); var RopePipeline = require('./pipelines/RopePipeline'); var SinglePipeline = require('./pipelines/SinglePipeline'); -var MeshPipeline = require('./pipelines/MeshPipeline'); /** * @classdesc @@ -147,7 +146,6 @@ var PipelineManager = new Class({ this.add(CONST.SINGLE_PIPELINE, new SinglePipeline({ game: game })); this.add(CONST.ROPE_PIPELINE, new RopePipeline({ game: game })); this.add(CONST.LIGHT_PIPELINE, new LightPipeline({ game: game })); - this.add(CONST.MESH_PIPELINE, new MeshPipeline({ game: game })); this.set(this.MULTI_PIPELINE); }, diff --git a/src/renderer/webgl/pipelines/const.js b/src/renderer/webgl/pipelines/const.js index ae0a20c56..fa8171bf6 100644 --- a/src/renderer/webgl/pipelines/const.js +++ b/src/renderer/webgl/pipelines/const.js @@ -54,17 +54,7 @@ var PIPELINE_CONST = { * @const * @since 3.50.0 */ - ROPE_PIPELINE: 'RopePipeline', - - /** - * The Mesh Pipeline. - * - * @name Phaser.Renderer.WebGL.Pipelines.MESH_PIPELINE - * @type {string} - * @const - * @since 3.50.0 - */ - MESH_PIPELINE: 'MeshPipeline' + ROPE_PIPELINE: 'RopePipeline' };