Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack

Junjie

2024-04-13 6d3811f6adf069d87e3b9072066cbb0c8acf6275

 zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js

@@ -50,11 +50,11 @@
    }

    getFullWidth = () => {
        return this.dom.offsetWidth;
        return this.dom?.offsetWidth;
    }

    getFullHeight = () => {
        return this.dom.offsetHeight;
        return this.dom?.offsetHeight;
    }

    addObject = (object) => {
@@ -90,7 +90,7 @@
        renderer.toneMapping = THREE.ACESFilmicToneMapping;
        renderer.setPixelRatio(window.devicePixelRatio);
        renderer.setSize(this.getFullWidth(), this.getFullHeight());
        this.dom.appendChild(renderer.domElement);
        this.dom?.appendChild(renderer.domElement);
        return renderer;
    }

@@ -136,7 +136,7 @@

    initStats = () => {
        const stats = new Stats();
        this.dom.appendChild(stats.dom);
        this.dom?.appendChild(stats.dom);
        if (!help) {
            stats.domElement.style.display = 'none';
        }
@@ -183,7 +183,7 @@
                this.handleClick(objName, x, y);
            }
        }
        this.dom.addEventListener("click", this.handleClickEvent, false);
        this.dom?.addEventListener("click", this.handleClickEvent, false);
    }

    generateMesh = (fn) => {
@@ -200,9 +200,15 @@
        }
    }

    rePerspective = (maxHeight) => {
        this.camera.position.set(-maxHeight * 0.8, maxHeight * 0.8, maxHeight * 0.8);
        this.controls.target = new THREE.Vector3(0, maxHeight * 0.55, 0);
    rePerspective = (maxHeight, normalHeight) => {
        const height = Math.max(maxHeight, normalHeight)
        const cameraPosScale = 0.7;
        this.camera.position.set(
            -height * cameraPosScale, 
            height * cameraPosScale, 
            height * cameraPosScale
            );
        this.controls.target = new THREE.Vector3(0, maxHeight * 0.53, 0);
    }

    destroy = () => {
@@ -233,7 +239,7 @@
            this.controls.dispose();
            this.controls = null;
        }
        this.dom.removeEventListener("click", this.handleClickEvent);
        this.dom?.removeEventListener("click", this.handleClickEvent);
        this.camera = null;
        this.objects = [];
        while (this.dom?.firstChild) {