From 9d0acfb65c80c4948c305ca01338f894b87346a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 09:44:37 +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 | 76 ++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 32 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 26f3309..019533c 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
@@ -7,7 +7,8 @@
import { OutlinePass } from 'three/examples/jsm/postprocessing/OutlinePass';
import { ShaderPass } from 'three/examples/jsm/postprocessing/ShaderPass';
import { FXAAShader } from 'three/examples/jsm/shaders/FXAAShader';
-
+import { FBXLoader } from 'three/examples/jsm/loaders/FBXLoader'
+import * as Utils from '../../utils'
const help = false;
@@ -63,11 +64,9 @@
initScene = () => {
const scene = new THREE.Scene();
- // scene.background = new THREE.Color(0xf0f0f0);
- // scene.background = new THREE.Color(0x333333);
-
// scene.background = new THREE.Color(0xf8f8f8);
scene.background = new THREE.Color(0x7a7a7a);
+ scene.fog = new THREE.Fog(scene.background, 1, 5000);
if (help) {
scene.add(new THREE.AxesHelper(1000));
}
@@ -87,7 +86,7 @@
// renderer.useLegacyLights = false; // 鏃х増鍏夋簮 閲嶈
renderer.shadowMap.enabled = true;
// this.renderer.shadowMap.type = THREE.BasicShadowMap; // 鏈�浣庨槾褰�
- // this.renderer.toneMapping = THREE.ReinhardToneMapping;
+ // renderer.toneMapping = THREE.ReinhardToneMapping;
renderer.toneMapping = THREE.ACESFilmicToneMapping;
renderer.setPixelRatio(window.devicePixelRatio);
renderer.setSize(this.getFullWidth(), this.getFullHeight());
@@ -119,16 +118,17 @@
initControls = () => {
const controls = new OrbitControls(this.camera, this.renderer.domElement);
// controls.enableRotate = false; // 绂佺敤鏁翠綋鏃嬭浆鍔熻兘
- controls.enablePan = true; // 鍏佽骞崇Щ
+ controls.enablePan = false; // 鍏佽骞崇Щ
controls.enableDamping = true; // 寮�鍚樆灏�
controls.dampingFactor = 0.08; // 闃诲凹鍥犲瓙
controls.enableZoom = true; // 鍏佽缂╂斁
// controls.minDistance = 1; // 鏈�灏忕缉鏀捐窛绂�
// controls.maxDistance = 30; // 鏈�澶х缉鏀捐窛绂�
controls.minPolarAngle = 0; // 鏈�灏忎刊浠拌搴︼紙鍚戜笅鐪嬶級
+ controls.minPolarAngle = Math.PI / 2.1;
controls.maxPolarAngle = Math.PI / 2.1; // 鏈�澶т刊浠拌搴︼紙鍚戜笂鐪嬶級
controls.rotateSpeed = 0.6; // 瑙嗚绉诲姩閫熷害鍑忔參
- controls.autoRotate = false; // 鑷姩鏃嬭浆
+ controls.autoRotate = true; // 鑷姩鏃嬭浆
controls.target = new THREE.Vector3(0, 250, 0) // 灞忓箷涓績鐐� 骞虫浛 camera鐨刲ookAt
return controls;
@@ -173,8 +173,12 @@
if (intersects.length === 0) {
return;
}
- this.outlinePass.selectedObjects = [intersects[0].object];
let objName = intersects[0].object.name;
+ this.objects.forEach(obj => {
+ if (obj.name === objName) {
+ this.outlinePass.selectedObjects = [obj];
+ }
+ })
if (objName && this.handleClick) {
this.handleClick(objName, x, y);
}
@@ -183,7 +187,23 @@
}
generateMesh = (fn) => {
- fn(this.addObject);
+ const loader = new FBXLoader();
+ fn(loader, this.addObject);
+ }
+
+ setNewSelectedMesh = (objName) => {
+ for (const mesh of this.objects) {
+ if (mesh.name === objName) {
+ this.outlinePass.selectedObjects = [mesh];
+ break;
+ }
+ }
+ }
+
+ rePerspective = (maxHeight) => {
+ const cameraPosScale = 0.7;
+ this.camera.position.set(-maxHeight * cameraPosScale, maxHeight * cameraPosScale, maxHeight * cameraPosScale);
+ this.controls.target = new THREE.Vector3(0, maxHeight * 0.53, 0);
}
destroy = () => {
@@ -231,29 +251,21 @@
};
const initLight = (scene) => {
- const directionalLight = new THREE.DirectionalLight(0xffffff, 8);
- directionalLight.position.set(1, 1, 1);
- scene.add(directionalLight);
+ const hemiLight = new THREE.HemisphereLight(0xffffff, 0xffffff, 6);
+ hemiLight.color.setHSL(0.6, 1, 0.6);
+ hemiLight.groundColor.setHSL(0.095, 1, 0.75);
+ hemiLight.position.set(0, 1500, 0);
+ scene.add(hemiLight);
- const ambientLight = new THREE.AmbientLight(0xf0f0f0, 18);
- scene.add(ambientLight);
+ const dirLight = new THREE.DirectionalLight(0xffffff, 2.5);
+ dirLight.color.setHSL(0.1, 1, 0.95);
+ dirLight.position.set(-10, 10, 10);
+ dirLight.position.multiplyScalar(30);
+ scene.add(dirLight);
- const spotLight = new THREE.SpotLight(0xffffff, 8);
- spotLight.position.set(-300, 1000, 0);
- spotLight.angle = Math.PI / 4; // 瑙掑害
- spotLight.distance = 800; // 璺濈
- spotLight.decay = 0; // 鍏夎“
- // 鍏夌収闃村奖鍙婂叾鐢熸晥鑼冨洿
- spotLight.castShadow = true;
- spotLight.shadow.camera.near = 50;
- spotLight.shadow.camera.far = 2000;
- spotLight.shadow.bias = - 0.000222;
- // 闃村奖鐗规晥楂樹綆鍊�
- spotLight.shadow.mapSize.width = 1024;
- spotLight.shadow.mapSize.height = 1024;
- scene.add(spotLight);
-
- if (help) {
- scene.add(new THREE.SpotLightHelper(spotLight));
- }
+ const dirLight1 = new THREE.DirectionalLight(0xffffff, 2.5);
+ dirLight1.color.setHSL(0.1, 1, 0.95);
+ dirLight1.position.set(10, 10, -10);
+ dirLight1.position.multiplyScalar(30);
+ scene.add(dirLight1);
}
\ No newline at end of file
--
Gitblit v1.9.1