From a8fd706ff4f0ad0c2fb565bb45b61c9b83c9cdd2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 10 十二月 2021 11:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
static/js/app.js | 140 ++++++++++++++++++++++++++++------------------
1 files changed, 84 insertions(+), 56 deletions(-)
diff --git a/static/js/app.js b/static/js/app.js
index 70f8577..e8dedd1 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -29,6 +29,8 @@
this.initLight();
this.initFloor();
this.initModel();
+ // 鍙栨暟鎹�
+ this.initStoreData();
}
this.animate = function () {
requestAnimationFrame(this.animate.bind(this));
@@ -36,6 +38,7 @@
this.renderer.render(this.scene, this.camera);
this.stats.end();
this.initStoreObjects(this);
+ this.modelMove();
}
this.initScene = function () {
this.scene = new THREE.Scene();
@@ -121,7 +124,7 @@
}
this.initStats = function () {
this.stats = new Stats();
- this.dom.appendChild( this.stats.dom );
+ // this.dom.appendChild( this.stats.dom );
}
this.initBackground = function () {
const cubeTextureLoader = new THREE.CubeTextureLoader();
@@ -131,7 +134,7 @@
"posy.jpg", "negy.jpg",
"posz.jpg", "negz.jpg"
]);
- this.scene.background = new THREE.Color( 0xf0f0f0 );
+ this.scene.background = new THREE.Color( 0x17c5dc );
}
this.removeObject = function (nameorid) {
for (let i = 0; i < this.objects.length; i++) {
@@ -161,6 +164,79 @@
helper.material.opacity = 0.25;
helper.material.transparent = true;
this.addObject( helper );
+ }
+ this.initStoreObjects = function (object) {
+ if (this.firstTime === 1) {
+ // initStore();
+ if (Store3DData !== null) {
+ for(let i = 0;i<Store3DData.data.length;i++){
+ let optionArea = Store3DData.data[i];
+ let area = new Store3DData(optionArea);
+ object.addObject(area);
+ for (let j = 0; j<optionArea.store.length;j++){
+ let optionStore = optionArea[j];
+ optionStore.position=CommonFunction.transPosition(optionStore.position,optionArea.position)
+ let store =new Store(optionStore);
+ object.addObject(store);
+ for (let k = 0; k < optionStore.groups.length;k++){
+ let optionGroup = optionStore.groups[k];
+ optionGroup.position
+ }
+ }
+ }
+
+
+
+
+ //鏄剧ず浠撳簱鍖哄煙
+ // for (let i = 0; i < Store3DData.Areas.length; i++) {
+ // let optionArea = Store3DData.Areas[i];
+ // let area = new StoreArea(optionArea);
+ // object.addObject(area);
+ // //鏄剧ず浠撳簱
+ // for (let j = 0; j < optionArea.Stores.length; j++) {
+ // let optionStore = optionArea.Stores[j];
+ // optionStore.Position = CommonFunction.transPosition(optionStore.Position, optionArea.Position);
+ // let store = new Store(optionStore);
+ // // object.addObject(store);
+ // //鏄剧ず姣忚淇℃伅
+ // for (let k = 0; k < optionStore.Groups.length; k++) {
+ // let optionGroup = optionStore.Groups[k];
+ // optionGroup.Position = CommonFunction.transPosition(optionGroup.Position, optionStore.Position);
+ // let shelf = new StoreShelf(optionGroup);
+ // let group=new StoreGroup(optionGroup,1);
+ // object.addObject(shelf);
+ // // object.addObject(group);
+ // //鏄剧ず搴撲綅涓婄殑璐х墿
+ // for (let m = 0; m < optionGroup.Bins.length; m++) {
+ // let optionBin = optionGroup.Bins[m];
+ // let existGoods=this.getExistedGoodType(optionBin.State);
+ // let storeGoods = new StoreGoods(optionGroup, optionBin);
+ // if(existGoods==null) {
+ // let goods=storeGoods.create();
+ // object.addObject(goods);
+ // this.goodTypes.push({type: optionBin.State, object: goods});
+ // } else {
+ // let goods= storeGoods.clone(existGoods);
+ // object.addObject(goods);
+ // }
+ // }
+ // }
+ //
+ // }
+ // }
+ this.firstTime = 0;
+ }
+ }
+ }
+ 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.initModel = function () {
let that = this;
@@ -197,12 +273,12 @@
.setPath( '../static/model/obj/' )
.load( '璐у弶.obj', function ( object ) {
object.position.z = -500;
- object.position.x = -1560;
+ object.position.x = -2060;
object.scale.set(0.025, 0.025, 0.025);
object.rotateY(- Math.PI / 2)
that.addObject( object );
}, null, null );
- });
+ });
new MTLLoader(manager)
.setPath( '../static/model/obj/' )
.load( '杞借揣鍙�.mtl', function ( materials ) {
@@ -212,7 +288,7 @@
.setPath( '../static/model/obj/' )
.load( '杞借揣鍙�.obj', function ( object ) {
object.position.z = -500;
- object.position.x = -1560;
+ object.position.x = -2060;
object.scale.set(0.025, 0.025, 0.025);
object.rotateY(- Math.PI / 2)
that.addObject( object );
@@ -227,65 +303,17 @@
.setPath( '../static/model/obj/' )
.load( '鍫嗗灈鏈烘湰浣�.obj', function ( object ) {
object.position.z = -500;
- object.position.x = -1560;
+ object.position.x = -2060;
object.scale.set(0.025, 0.025, 0.025);
object.rotateY(- Math.PI / 2)
that.addObject( object );
}, null, null );
});
}
- this.initStoreObjects = function (object) {
- if (this.firstTime === 1) {
- if (Store3DData !== null) {
- //鏄剧ず浠撳簱鍖哄煙
- for (let i = 0; i < Store3DData.Areas.length; i++) {
- let optionArea = Store3DData.Areas[i];
- let area = new StoreArea(optionArea);
- object.addObject(area);
- //鏄剧ず浠撳簱
- for (let j = 0; j < optionArea.Stores.length; j++) {
- let optionStore = optionArea.Stores[j];
- optionStore.Position = CommonFunction.transPosition(optionStore.Position, optionArea.Position);
- let store = new Store(optionStore);
- // object.addObject(store);
- //鏄剧ず姣忚淇℃伅
- for (let k = 0; k < optionStore.Groups.length; k++) {
- let optionGroup = optionStore.Groups[k];
- optionGroup.Position = CommonFunction.transPosition(optionGroup.Position, optionStore.Position);
- let shelf = new StoreShelf(optionGroup);
- let group=new StoreGroup(optionGroup,1);
- object.addObject(shelf);
- // object.addObject(group);
- //鏄剧ず搴撲綅涓婄殑璐х墿
- for (let m = 0; m < optionGroup.Bins.length; m++) {
- let optionBin = optionGroup.Bins[m];
- let existGoods=this.getExistedGoodType(optionBin.State);
- let storeGoods = new StoreGoods(optionGroup, optionBin);
- if(existGoods==null) {
- let goods=storeGoods.create();
- object.addObject(goods);
- this.goodTypes.push({type: optionBin.State, object: goods});
- } else {
- let goods= storeGoods.clone(existGoods);
- object.addObject(goods);
- }
- }
- }
+ this.modelMove = function () {
- }
- }
- this.firstTime = 0;
- }
- }
}
- 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.initStoreData = function () {
}
},
--
Gitblit v1.9.1