From e31d3ceb4a6196f565794ccfd6b4540e99e4d71b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 28 三月 2024 15:32:00 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js b/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
index c7a6fd8..02416bc 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
@@ -41,7 +41,7 @@
this.stats.update();
// Rotate the scene
this.controls.update()
- this.controls.autoRotateSpeed = 0.6;
+ this.controls.autoRotateSpeed = 2;
}
addObject = (object) => {
@@ -61,7 +61,7 @@
initCamera = () => {
const camera = new THREE.PerspectiveCamera(70, this.fullWidth / this.fullHeight, 1, 60000);
- camera.position.set(200, 200, 200);
+ camera.position.set(-300, 300, 300);
this.scene.add(camera);
return camera;
}
@@ -167,23 +167,50 @@
destroy = () => {
cancelAnimationFrame(this.animationFrame);
window.removeEventListener('resize', this.resizeHandler);
- this.renderer.dispose();
- this.controls.dispose();
+ if (this.scene) {
+ while (this.scene.children.length > 0) {
+ this.removeEntity(this.scene.children[0]);
+ }
+ this.scene = null;
+ }
+ if (this.renderer) {
+ this.renderer.dispose();
+ this.renderer.forceContextLoss();
+ this.renderer.context = null;
+ this.renderer.domElement = null;
+ this.renderer = null;
+ }
+ if (this.controls) {
+ this.controls.dispose();
+ this.controls = null;
+ }
+ this.camera = null;
+ this.objects = [];
+ while (this.dom?.firstChild) {
+ this.dom.removeChild(this.dom.firstChild);
+ }
+ }
+
+ removeEntity = (object) => {
+ if (object.material) object.material.dispose();
+ if (object.geometry) object.geometry.dispose();
+ if (object.texture) object.texture.dispose();
+ this.scene.remove(object);
}
};
const initLight = (scene) => {
- const directionalLight = new THREE.DirectionalLight(0xffffff, 0.6); // 鍏夐鑹诧紝寮哄害
- directionalLight.position.set(1, 1, 1).normalize();
+ const directionalLight = new THREE.DirectionalLight(0xffffff, 8);
+ directionalLight.position.set(-300, 300, 300);
scene.add(directionalLight);
- const ambientLight = new THREE.AmbientLight(0xf0f0f0, 3);
+ const ambientLight = new THREE.AmbientLight(0xf0f0f0, 8);
scene.add(ambientLight);
const spotLight = new THREE.SpotLight(0xffffff, 8);
- spotLight.position.set(0, 1000, 0);
+ spotLight.position.set(-300, 300, 0);
spotLight.angle = Math.PI / 4; // 瑙掑害
- spotLight.distance = 1500; // 璺濈
+ spotLight.distance = 800; // 璺濈
spotLight.decay = 0; // 鍏夎“
// 鍏夌収闃村奖鍙婂叾鐢熸晥鑼冨洿
spotLight.castShadow = true;
@@ -202,7 +229,9 @@
const buildDemo = (scene) => {
const boxGeometry = new THREE.BoxGeometry(100, 100, 100);
- const boxMaterial = new THREE.MeshBasicMaterial({ color: 0x40739e });
+ const boxMaterial = new THREE.MeshStandardMaterial({
+ color: '#222f3e',
+ });
const boxMesh = new THREE.Mesh(boxGeometry, boxMaterial);
boxMesh.position.set(0, 0, 0);
scene.add(boxMesh)
--
Gitblit v1.9.1