[fix]ThreeLayer不再支持CanvasRenderer review by qiw

luoxiao-supermap · luoxiao-supermap · commit 44dfbb225c5f · 2023-06-25T17:25:36.000+08:00
diff --git a/src/common/overlay/threejs/ThreeLayerRenderer.js b/src/common/overlay/threejs/ThreeLayerRenderer.js
@@ -10,15 +10,13 @@
  */
 
 import * as THREE from "three";
-import { Util } from '../../commontypes/Util';
 import { Transform } from "./Transform";
 
 const projection = Transform.projection;
 const {
   Color,
   Scene,
   WebGLRenderer,
-  CanvasRenderer,
   PerspectiveCamera,
   Vector3,
   Shape,
@@ -45,10 +43,9 @@ const cancel = window.cancelAnimationFrame ||
  * @category  Visualization Three
  * @classdesc Three 图层渲染器
  * @param {ThreeLayer} layer - ThreeJs图层。
- * @param {string} [renderer="gl"] - 图层渲染方式(canvas或WebGL)。取值："gl","canvas"。
+ * @param {string} [renderer="gl"] - 图层渲染器，仅支持"gl"。'canvas'在v11.1.0后被弃用。
  * @param {Object} options - threejs渲染器初始化参数对象。参数内容详见:
- *          [WebGLRenderer]{@link https://threejs.org/docs/index.html#api/renderers/WebGLRenderer}/
- *          [CanvasRenderer]{@link https://threejs.org/docs/index.html#examples/renderers/CanvasRenderer}
+ *          [WebGLRenderer]{@link https://threejs.org/docs/index.html#api/renderers/WebGLRenderer}
  *
  */
 export class ThreeLayerRenderer {
@@ -470,11 +467,6 @@ export class ThreeLayerRenderer {
       }, this.options);
       context.autoClear = true;
       context.clear();
-    } else {
-      context = new CanvasRenderer(Util.extend({
-        'canvas': this.canvas,
-        'alpha': true
-      }, this.options));
     }
     context.setClearColor(new Color(1, 1, 1), 0);
     context.canvas = this.canvas;
diff --git a/src/mapboxgl/overlay/ThreeLayer.js b/src/mapboxgl/overlay/ThreeLayer.js
@@ -18,11 +18,10 @@ import { ThreeLayerRenderer } from "@supermap/iclient-common/overlay/threejs/Thr
  * @classdesc Three 图层类。
  * @modulecategory Overlay
  * @param {string} id - 图层 ID。
- * @param {string} [renderer="gl"] - 图层渲染方式( canvas 或 WebGL )。取值："gl","canvas"。
+ * @param {string} [renderer="gl"] - 图层渲染器，仅支持"gl"。'canvas'在v11.1.0后被弃用。
  * @param {Object} options - 初始化参数。
  * @param {Object} options.threeOptions - threejs 渲染器初始化参数对象。参数内容详见:
  *          {@link THREE.WebGLRenderer}
- *          {@link THREE.CanvasRenderer}。
  *
  * @extends {mapboxgl.Evented}
  * @fires ThreeLayer#render
@@ -151,7 +150,7 @@ export class ThreeLayer extends mapboxgl.Evented {
   /**
    * @function ThreeLayer.prototype.getThreeRenderer
    * @description 获取 threejs renderer。
-   * @returns {THREE.WebGLRenderer|THREE.CanvasRenderer} threejs renderer。
+   * @returns {THREE.WebGLRenderer} threejs renderer。
    */
   getThreeRenderer() {
     return this.renderer.context;
diff --git a/src/maplibregl/overlay/ThreeLayer.js b/src/maplibregl/overlay/ThreeLayer.js
@@ -18,11 +18,10 @@ import { ThreeLayerRenderer } from "@supermap/iclient-common/overlay/threejs/Thr
  * @version 11.1.0
  * @modulecategory Overlay
  * @param {string} id - 图层 ID。
- * @param {string} [renderer="gl"] - 图层渲染方式( canvas 或 WebGL )。取值："gl","canvas"。
+ * @param {string} [renderer="gl"] - 图层渲染器，仅支持"gl"。'canvas'在v11.1.0后被弃用。
  * @param {Object} options - 初始化参数。
  * @param {Object} options.threeOptions - threejs 渲染器初始化参数对象。参数内容详见:
- *          {@link THREE.WebGLRenderer}
- *          {@link THREE.CanvasRenderer}。
+ *          {@link THREE.WebGLRenderer}。
  *
  * @extends {maplibregl.Evented}
  * @fires ThreeLayer#render
@@ -123,7 +122,7 @@ export class ThreeLayer extends maplibregl.Evented {
   /**
    * @function ThreeLayer.prototype.getThreeRenderer
    * @description 获取 threejs renderer。
-   * @returns {THREE.WebGLRenderer|THREE.CanvasRenderer} threejs renderer。
+   * @returns {THREE.WebGLRenderer} threejs renderer。
    */
   getThreeRenderer() {
     return this.renderer.context;
