From 8f902a43cd8fb6e07605d2db7e35eaaa2f540879 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 06 三月 2023 14:36:02 +0800
Subject: [PATCH] #
---
static/js/app.js | 57 +++++++++++++++++++++++++++------------------------------
1 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/static/js/app.js b/static/js/app.js
index 7a25951..7a4c8ef 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -12,7 +12,8 @@
import {StoreCrn} from './object/StoreCrn.js';
import {StoreConvey} from './object/StoreConvey.js';
import {StoreGoods} from './object/StoreGoods.js';
-
+import {StaTask} from './object/StaTask.js';
+import {DefineModel} from './object/DefineModel.js'
var APP = {
@@ -25,8 +26,8 @@
this.firstTime = 1;
this.stats = null;
this.outlinePass = null;
- this.goodTypes=[];//瀛樺偍鎵�鏈夌殑搴撲綅绫诲瀷
this.crnTasks = [];// 鍫嗗灈鏈哄垪琛�
+ this.staTasks = [];// 杈撻�佺嚎鍒楄〃
this.moveForward = false;//鏄惁鍚戝墠杩愯
this.moveBackward = false;//鏄惁鍚戝悗杩愯
this.moveLeft = false;//鏄惁鍚戝乏杩愯
@@ -56,6 +57,7 @@
this.initObjectSelect();
this.initPointLockControl(this);
this.initFloor();
+ this.initDefineModel();
this.initBuilding();
this.initConvey();
}
@@ -72,6 +74,7 @@
this.stats.end();
this.queryCrn();
this.crnMove();
+ this.querySta();
}
this.initScene = function () {
this.scene = new THREE.Scene();
@@ -96,7 +99,7 @@
// this.renderer.toneMapping = THREE.CineonToneMapping; // 鑹茶皟
this.renderer.setSize(window.innerWidth, window.innerHeight);
this.renderer.setPixelRatio( window.devicePixelRatio );
- this.renderer.shadowMap.enabled = true;
+ // this.renderer.shadowMap.enabled = true; // 鏄惁寮�鍚槾褰�
this.renderer.shadowMap.type = THREE.BasicShadowMap;
this.dom = document.getElementById("container");
this.dom.appendChild(this.renderer.domElement);
@@ -111,7 +114,7 @@
// 闃村奖鑱氬厜鐏�
let pointLight = new THREE.SpotLight(0xFFFAFA,1);
pointLight.position.set(0, 1500, 2500);
- pointLight.castShadow = true;
+ // pointLight.castShadow = true; // 鏄惁寮�鍚槾褰�
pointLight.shadow.camera.near = 2000;
pointLight.shadow.camera.far = 10000;
pointLight.shadow.mapSize.height = 200000;
@@ -140,7 +143,7 @@
this.scene.background = new THREE.Color( 0x333333 );
} else {
const cubeTextureLoader = new THREE.CubeTextureLoader();
- cubeTextureLoader.setPath( '../static/img/skybox0/' );
+ cubeTextureLoader.setPath( '../static/img/skybox/' );
this.scene.background = cubeTextureLoader.load([
"px.jpg", "nx.jpg",
"py.jpg", "ny.jpg",
@@ -177,7 +180,7 @@
this.composer.addPass( this.fxaaPass );
}
this.initObjectSelect = function(){
- new ObjectSelect(this.scene, this.camera, this.outlinePass);
+ new ObjectSelect(this.scene, this.camera, this.outlinePass, this);
}
this.initPointLockControl = function(object){
this.controls = new PointerLockControls( this.camera, document.body );
@@ -309,6 +312,9 @@
// this.addObject(new Floor({position: {}}))
}
+ this.initDefineModel = () => {
+ const model = new DefineModel(this);
+ }
this.initBuilding = function () {
let buildingData = buildingObjects.objects;
for (let i = 0; i < buildingData.length; i++) {
@@ -336,20 +342,6 @@
if (line.bins !== null) {
new StoreGoods(object, line.bins, shelf);
}
- //鏄剧ず搴撲綅涓婄殑璐х墿
- // for (var bin of line.bins) {
- // let existGoods=this.getExistedGoodType(bin.State);
- // let storeGoods = new StoreGoods(optionGroup, bin);
- // if(existGoods==null) {
- // let goods=storeGoods.create();
- // object.addObject(goods);
- // this.goodTypes.push({type: bin.State, object: goods});
- // } else {
- // let goods= storeGoods.clone(existGoods);
- // object.addObject(goods);
- // }
- // }
-
}
}
this.firstTime = 0;
@@ -370,20 +362,25 @@
}
}
}
- this.getExistedGoodType=function(state){
- for (let i=0;i<this.goodTypes.length;i++) {
- let type=this.goodTypes[i];
- if(type.type===state) {
- return type.object;
- }
- }
- return null;
- }
- this.crnMove = function (object) {
+ this.crnMove = function () {
for (let crnTask of this.crnTasks) {
crnTask.move();
}
}
+ this.querySta = function () {
+ if (StaDatas !== null && this.firstTime === 0) {
+ for (let staData of StaDatas) {
+ let staTask = getArrVal(this.staTasks, "no", staData.no);
+ if (null == staTask) {
+ this.staTasks.push(new StaTask(staData, this));
+ } else {
+ if(!staTask.run && !staTask.isDel) {
+ staTask.modify(staData);
+ }
+ }
+ }
+ }
+ }
// 鍔熻兘鏂规硶鍖�
this.changeStats = function () {
--
Gitblit v1.9.1