🐞 fix: fixed layer bug

Author: xiangechen

packages/chili-three/src/cameraController.ts

@@ -1,7 +1,15 @@
 // Part of the Chili3d Project, under the AGPL-3.0 License.
 // See LICENSE file in the project root for full license information.
 
-import { CameraType, ICameraController, Observable, Precision, VisualNode, XYZLike } from "chili-core";
+import {
+    CameraType,
+    ICameraController,
+    Observable,
+    Precision,
+    ViewMode,
+    VisualNode,
+    XYZLike,
+} from "chili-core";
 import {
     Box3,
     Camera,
@@ -12,6 +20,7 @@ import {
     Sphere,
     Vector3,
 } from "three";
+import { Constants } from "./constants";
 import { ThreeGeometry } from "./threeGeometry";
 import { ThreeHelper } from "./threeHelper";
 import { ThreeView } from "./threeView";
@@ -81,10 +90,11 @@ export class CameraController extends Observable implements ICameraController {
     }
 
     private createCamera(near: number, far: number) {
+        let camera: PerspectiveCamera | OrthographicCamera;
         if (this.cameraType === "perspective") {
-            return new PerspectiveCamera(CAMERA_FOV, this._width / this._height, near, far);
+            camera = new PerspectiveCamera(CAMERA_FOV, this._width / this._height, near, far);
         } else {
-            return new OrthographicCamera(
+            camera = new OrthographicCamera(
                 -this._width / 2,
                 this._width / 2,
                 this._height / 2,
@@ -93,6 +103,20 @@ export class CameraController extends Observable implements ICameraController {
                 far,
             );
         }
+        this.setCameraLayer(camera, this.view.mode);
+        return camera;
+    }
+
+    setCameraLayer(camera: Camera, mode: ViewMode) {
+        if (mode === ViewMode.wireframe) {
+            camera.layers.enable(Constants.Layers.Wireframe);
+            camera.layers.disable(Constants.Layers.Solid);
+        } else if (mode === ViewMode.solid) {
+            camera.layers.enable(Constants.Layers.Solid);
+            camera.layers.disable(Constants.Layers.Wireframe);
+        } else {
+            camera.layers.enableAll();
+        }
     }
 
     pan(dx: number, dy: number): void {

packages/chili-three/src/threeView.ts

@@ -93,15 +93,7 @@ export class ThreeView extends Observable implements IView {
     }
     set mode(value: ViewMode) {
         this.setProperty("mode", value, () => {
-            if (value === ViewMode.wireframe) {
-                this.camera.layers.enable(Constants.Layers.Wireframe);
-                this.camera.layers.disable(Constants.Layers.Solid);
-            } else if (value === ViewMode.solid) {
-                this.camera.layers.enable(Constants.Layers.Solid);
-                this.camera.layers.disable(Constants.Layers.Wireframe);
-            } else {
-                this.camera.layers.enableAll();
-            }
+            this.cameraController.setCameraLayer(this.camera, this.mode);
         });
     }