From c4b00b0268f35a7a9e016e818b0f6e27bc3876f0 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 28 三月 2024 08:56:50 +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 | 45 ++++++++++++++++-----------------------------
zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx | 4 ++--
2 files changed, 18 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 4de41d5..d09eb65 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
@@ -56,7 +56,7 @@
initScene = () => {
const scene = new THREE.Scene();
// scene.background = new THREE.Color(0xf0f0f0);
- // scene.background = new THREE.Color(0x333333);
+ scene.background = new THREE.Color(0x333333);
if (help) {
scene.add(new THREE.AxesHelper(1000));
}
@@ -64,7 +64,7 @@
}
initCamera = () => {
- const camera = new THREE.PerspectiveCamera(70, window.innerWidth / window.innerHeight, 1, 10000);
+ const camera = new THREE.PerspectiveCamera(70, this.fullWidth / this.fullHeight, 1, 60000);
camera.position.set(debugCamera.x, debugCamera.y, debugCamera.z);
this.scene.add(camera);
return camera;
@@ -79,7 +79,7 @@
// this.renderer.toneMapping = THREE.ReinhardToneMapping;
renderer.toneMapping = THREE.ACESFilmicToneMapping;
renderer.setPixelRatio(window.devicePixelRatio);
- renderer.setSize(300, 500);
+ renderer.setSize(this.fullWidth, this.fullHeight);
container.appendChild(renderer.domElement);
return renderer;
}
@@ -114,7 +114,7 @@
windowResize = () => {
let that = this;
window.addEventListener('resize', function () {
- that.camera.aspect = window.innerWidth / window.innerHeight;
+ that.camera.aspect = this.fullWidth / this.fullHeight;
that.camera.updateProjectionMatrix();
that.renderer.setSize(that.fullWidth, that.fullHeight);
}, false);
@@ -161,8 +161,7 @@
}
build = () => {
- // 1.build floor
- buildFloor(this.scene);
+ buildDemo(this.scene);
}
handleClick = () => {
@@ -171,7 +170,6 @@
};
const initLight = (scene) => {
-
const directionalLight = new THREE.DirectionalLight(0xffffff, 0.6); // 鍏夐鑹诧紝寮哄害
directionalLight.position.set(1, 1, 1).normalize();
scene.add(directionalLight);
@@ -180,41 +178,30 @@
scene.add(ambientLight);
const spotLight = new THREE.SpotLight(0xffffff, 8);
- spotLight.position.set(1617, 2500, 4022);
- spotLight.angle = Math.PI * 1;
- spotLight.decay = 0;
+ spotLight.position.set(0, 1000, 0);
+ spotLight.angle = Math.PI / 4; // 瑙掑害
+ spotLight.distance = 1500; // 璺濈
+ spotLight.decay = 0; // 鍏夎“
+ // 鍏夌収闃村奖鍙婂叾鐢熸晥鑼冨洿
spotLight.castShadow = true;
- spotLight.shadow.camera.near = 200;
+ 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;
-
- const targetObject = new THREE.Object3D();
- targetObject.position.set(1617, 0, 4022);
- spotLight.target = targetObject;
-
scene.add(spotLight);
+
if (help) {
scene.add(new THREE.SpotLightHelper(spotLight));
}
}
-const buildFloor = (scene) => {
- const boxGeometry = new THREE.BoxGeometry(100, 100, 100); // 216涓洪暱搴︼紝10涓哄搴︼紝10涓洪珮搴�
+const buildDemo = (scene) => {
+ const boxGeometry = new THREE.BoxGeometry(100, 100, 100);
const boxMaterial = new THREE.MeshBasicMaterial({ color: 0x40739e });
const boxMesh = new THREE.Mesh(boxGeometry, boxMaterial);
- boxMesh.position.set(0, 0, 0); // 鏍规嵁浣犵殑闇�姹傝缃綅缃�
+ boxMesh.position.set(0, 0, 0);
scene.add(boxMesh)
return boxMesh;
-
- const size = 100;
- const divisions = 100;
- const helper = new THREE.GridHelper(size, divisions);
- helper.position.x = size / 2;
- helper.position.z = size / 2;
- helper.material.opacity = 0.25;
- helper.material.transparent = true;
- scene.add(helper);
- return helper;
}
\ No newline at end of file
diff --git a/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx b/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
index 5b7275a..cda5f4f 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
@@ -10,8 +10,8 @@
return {
threeContainer: {
zIndex: 99,
- width: '300px',
- height: '500px',
+ width: '500px',
+ height: '600px',
}
}
})
--
Gitblit v1.9.1