修复threelayer 错误调用this.renderer review by luox

xilanhuaweidapao · xilanhuaweidapao · commit a1f5030b4eeb · 2023-06-25T17:43:23.000+08:00
diff --git a/src/common/overlay/threejs/ThreeLayerRenderer.js b/src/common/overlay/threejs/ThreeLayerRenderer.js
@@ -267,7 +267,7 @@ export class ThreeLayerRenderer {
     if (coordinate && object3D) {
       this.setPosition(object3D, coordinate);
     }
-    this.renderer && this.renderer.scene.add(object3D);
+    this.scene.add(object3D);
   }
 
   /**
@@ -276,7 +276,7 @@ export class ThreeLayerRenderer {
     * @returns {ThreeLayer} ThreeLayer的实例对象。
     */
   clearMesh() {
-    let scene = this.renderer.scene;
+    let scene = this.scene;
     if (!scene) {
       return this;
     }
@@ -295,7 +295,7 @@ export class ThreeLayerRenderer {
        * @returns {ThreeLayer} ThreeLayer的实例对象。
        */
   clearAll(clearCamera) {
-    let scene = this.renderer.scene;
+    let scene = this.scene;
     if (!scene) {
       return this;
     }
diff --git a/src/mapboxgl/overlay/ThreeLayer.js b/src/mapboxgl/overlay/ThreeLayer.js
@@ -123,10 +123,7 @@ export class ThreeLayer extends mapboxgl.Evented {
    * @returns {ThreeLayer} ThreeLayer的实例对象。
    */
   addObject(object3D, coordinate) {
-    if (coordinate && object3D) {
-      this.setPosition(object3D, coordinate);
-    }
-    this.renderer && this.renderer.scene.add(object3D);
+    this.renderer && this.renderer.addObject(object3D, coordinate);
   }
 
   /**
diff --git a/src/maplibregl/overlay/ThreeLayer.js b/src/maplibregl/overlay/ThreeLayer.js
@@ -95,10 +95,7 @@ export class ThreeLayer extends maplibregl.Evented {
    * @returns {ThreeLayer} ThreeLayer的实例对象。
    */
   addObject(object3D, coordinate) {
-    if (coordinate && object3D) {
-      this.setPosition(object3D, coordinate);
-    }
-    this.renderer && this.renderer.scene.add(object3D);
+    this.renderer && this.renderer.addObject(object3D, coordinate);
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ export class ThreeLayerRenderer {`
`267`	`267`	`if (coordinate && object3D) {`
`268`	`268`	`this.setPosition(object3D, coordinate);`
`269`	`269`	`}`
`270`		`- this.renderer && this.renderer.scene.add(object3D);`
	`270`	`+ this.scene.add(object3D);`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`/**`
`@@ -276,7 +276,7 @@ export class ThreeLayerRenderer {`
`276`	`276`	`* @returns {ThreeLayer} ThreeLayer的实例对象。`
`277`	`277`	`*/`
`278`	`278`	`clearMesh() {`
`279`		`- let scene = this.renderer.scene;`
	`279`	`+ let scene = this.scene;`
`280`	`280`	`if (!scene) {`
`281`	`281`	`return this;`
`282`	`282`	`}`
`@@ -295,7 +295,7 @@ export class ThreeLayerRenderer {`
`295`	`295`	`* @returns {ThreeLayer} ThreeLayer的实例对象。`
`296`	`296`	`*/`
`297`	`297`	`clearAll(clearCamera) {`
`298`		`- let scene = this.renderer.scene;`
	`298`	`+ let scene = this.scene;`
`299`	`299`	`if (!scene) {`
`300`	`300`	`return this;`
`301`	`301`	`}`