From 2823537eb07f2382c1a330df207a7be4e595179c Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 07 四月 2024 14:04:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack
---
zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js | 57 ++++++++++++++++++++++++++-------------------------------
1 files changed, 26 insertions(+), 31 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 4ded7ab..9f6818d 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
@@ -69,6 +69,7 @@
// 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));
}
@@ -88,7 +89,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());
@@ -120,13 +121,14 @@
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 = true; // 鑷姩鏃嬭浆
@@ -195,20 +197,21 @@
mesh.position.set(0, 10, 0);
mesh.scale.set(5, 5, 5);
mesh.name = '1-1-1';
- // mesh.rotation.x = Utils.rotationParseNum(270);
mesh.traverse(function (child) {
if (child.isMesh) {
-
if (child.name === '涓嶈鍒�') {
// child.visible = false;
- console.log(material);
+ child.material.color.set(0xE8B67E);
}
if (child.name === '璐ф灦') {
+ // child.visible = false;
child.material.color.set(0x4680BF);
}
- // if (child.name === '鎵樼洏') {
- // child.material.color.set(0xBEBEBE);
- // }
+ if (child.name === '鎵樼洏') {
+ // child.visible = false;
+ child.material.color.set(0xBEBEBE);
+ }
+ child.name = '1-1-1'
child.castShadow = true;
child.receiveShadow = true;
}
@@ -274,29 +277,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, 10);
- 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