Skip to content

Commit 44dfbb2

Browse files
[fix]ThreeLayer不再支持CanvasRenderer review by qiw
1 parent ebb6a91 commit 44dfbb2

File tree

3 files changed

+7
-17
lines changed

3 files changed

+7
-17
lines changed

src/common/overlay/threejs/ThreeLayerRenderer.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@
1010
*/
1111

1212
import * as THREE from "three";
13-
import { Util } from '../../commontypes/Util';
1413
import { Transform } from "./Transform";
1514

1615
const projection = Transform.projection;
1716
const {
1817
Color,
1918
Scene,
2019
WebGLRenderer,
21-
CanvasRenderer,
2220
PerspectiveCamera,
2321
Vector3,
2422
Shape,
@@ -45,10 +43,9 @@ const cancel = window.cancelAnimationFrame ||
4543
* @category Visualization Three
4644
* @classdesc Three 图层渲染器
4745
* @param {ThreeLayer} layer - ThreeJs图层。
48-
* @param {string} [renderer="gl"] - 图层渲染方式(canvas或WebGL)。取值:"gl","canvas"
46+
* @param {string} [renderer="gl"] - 图层渲染器,仅支持"gl"。'canvas'在v11.1.0后被弃用
4947
* @param {Object} options - threejs渲染器初始化参数对象。参数内容详见:
50-
* [WebGLRenderer]{@link https://threejs.org/docs/index.html#api/renderers/WebGLRenderer}/
51-
* [CanvasRenderer]{@link https://threejs.org/docs/index.html#examples/renderers/CanvasRenderer}
48+
* [WebGLRenderer]{@link https://threejs.org/docs/index.html#api/renderers/WebGLRenderer}
5249
*
5350
*/
5451
export class ThreeLayerRenderer {
@@ -470,11 +467,6 @@ export class ThreeLayerRenderer {
470467
}, this.options);
471468
context.autoClear = true;
472469
context.clear();
473-
} else {
474-
context = new CanvasRenderer(Util.extend({
475-
'canvas': this.canvas,
476-
'alpha': true
477-
}, this.options));
478470
}
479471
context.setClearColor(new Color(1, 1, 1), 0);
480472
context.canvas = this.canvas;

src/mapboxgl/overlay/ThreeLayer.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ import { ThreeLayerRenderer } from "@supermap/iclient-common/overlay/threejs/Thr
1818
* @classdesc Three 图层类。
1919
* @modulecategory Overlay
2020
* @param {string} id - 图层 ID。
21-
* @param {string} [renderer="gl"] - 图层渲染方式( canvas 或 WebGL )。取值:"gl","canvas"
21+
* @param {string} [renderer="gl"] - 图层渲染器,仅支持"gl"。'canvas'在v11.1.0后被弃用
2222
* @param {Object} options - 初始化参数。
2323
* @param {Object} options.threeOptions - threejs 渲染器初始化参数对象。参数内容详见:
2424
* {@link THREE.WebGLRenderer}
25-
* {@link THREE.CanvasRenderer}。
2625
*
2726
* @extends {mapboxgl.Evented}
2827
* @fires ThreeLayer#render
@@ -151,7 +150,7 @@ export class ThreeLayer extends mapboxgl.Evented {
151150
/**
152151
* @function ThreeLayer.prototype.getThreeRenderer
153152
* @description 获取 threejs renderer。
154-
* @returns {THREE.WebGLRenderer|THREE.CanvasRenderer} threejs renderer。
153+
* @returns {THREE.WebGLRenderer} threejs renderer。
155154
*/
156155
getThreeRenderer() {
157156
return this.renderer.context;

src/maplibregl/overlay/ThreeLayer.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ import { ThreeLayerRenderer } from "@supermap/iclient-common/overlay/threejs/Thr
1818
* @version 11.1.0
1919
* @modulecategory Overlay
2020
* @param {string} id - 图层 ID。
21-
* @param {string} [renderer="gl"] - 图层渲染方式( canvas 或 WebGL )。取值:"gl","canvas"
21+
* @param {string} [renderer="gl"] - 图层渲染器,仅支持"gl"。'canvas'在v11.1.0后被弃用
2222
* @param {Object} options - 初始化参数。
2323
* @param {Object} options.threeOptions - threejs 渲染器初始化参数对象。参数内容详见:
24-
* {@link THREE.WebGLRenderer}
25-
* {@link THREE.CanvasRenderer}。
24+
* {@link THREE.WebGLRenderer}。
2625
*
2726
* @extends {maplibregl.Evented}
2827
* @fires ThreeLayer#render
@@ -123,7 +122,7 @@ export class ThreeLayer extends maplibregl.Evented {
123122
/**
124123
* @function ThreeLayer.prototype.getThreeRenderer
125124
* @description 获取 threejs renderer。
126-
* @returns {THREE.WebGLRenderer|THREE.CanvasRenderer} threejs renderer。
125+
* @returns {THREE.WebGLRenderer} threejs renderer。
127126
*/
128127
getThreeRenderer() {
129128
return this.renderer.context;

0 commit comments

Comments
 (0)