|
|
@@ -12,8 +12,8 @@ export default {
|
|
|
gltfLayouts: [],
|
|
|
instancedFurList:[],
|
|
|
|
|
|
- graderGltfLayouts: [],//花园地块的模型对象
|
|
|
- graderInstancedFurList:[],//花园地块的模型
|
|
|
+ // graderGltfLayouts: [],//花园地块的模型对象
|
|
|
+ // graderInstancedFurList:[],//花园地块的模型
|
|
|
|
|
|
arrFrunList:[],
|
|
|
promise_list:[],
|
|
|
@@ -22,7 +22,7 @@ export default {
|
|
|
tmpList:[],
|
|
|
realList:[],
|
|
|
nextString:'_simple',//精简模型后缀
|
|
|
- lastFrunList:[],
|
|
|
+ // lastFrunList:[],
|
|
|
}
|
|
|
},
|
|
|
watch: {},
|
|
|
@@ -91,15 +91,16 @@ export default {
|
|
|
// 通过默认布局
|
|
|
this.furnHandle(this.arrFrunList,[]);
|
|
|
},
|
|
|
+ //加载其他空间的家具模型
|
|
|
loadLastSpaceModel(){
|
|
|
if(!this.changeSpaces || this.changeSpaces.length==0){
|
|
|
return false;
|
|
|
}
|
|
|
- let layoutIds = this.changeSpaces.map(it=>it.layoutId);
|
|
|
+ let spaceIds = this.changeSpaces.map(it=>it.spaceId);
|
|
|
+ let layoutIds = this.spaceList.filter(item=>spaceIds.includes(item.spaceId)).map(it=>it.layoutId);
|
|
|
let list = this.arrFrunList.filter(item=>{
|
|
|
return !layoutIds.includes(item.id)
|
|
|
})
|
|
|
- let spaceIds = this.changeSpaces.map(it=>it.spaceId);
|
|
|
let spaceList = this.spaceList.filter(item=>{
|
|
|
return !spaceIds.includes(item.spaceId)
|
|
|
})
|
|
|
@@ -438,11 +439,6 @@ export default {
|
|
|
},
|
|
|
// 删除对应空间家具模型
|
|
|
deleteLayoutModel(spaceObj, layoutObj){
|
|
|
- if(!layoutObj){//删除完家具模型后，修改空间的布局id为0，表示当前空间不存在布局了
|
|
|
- spaceObj.delateLayoutId = true;//当前空间已经删除了家具模型
|
|
|
- }else{
|
|
|
- spaceObj.delateLayoutId = false;
|
|
|
- }
|
|
|
const oldLayoutIndex = this.arrFrunList.findIndex((item)=>{
|
|
|
return item.id == spaceObj.layoutId
|
|
|
})
|
|
|
@@ -451,8 +447,11 @@ export default {
|
|
|
this.arrFrunList[oldLayoutIndex] = layoutObj
|
|
|
// this.arrFrunList.splice(oldLayoutIndex,1)
|
|
|
}
|
|
|
-
|
|
|
- console.log("准备删除模型", spaceObj, this.gltfLayouts);
|
|
|
+ if(!layoutObj){//当前空间不存在布局了
|
|
|
+ this.arrFrunList.splice(oldLayoutIndex,1)
|
|
|
+ spaceObj.layoutId = null;//为了确保传递到下一页的空间里面也没有布局信息，确保布局一致
|
|
|
+ }
|
|
|
+ console.log("准备删除模型", spaceObj,oldLayoutIndex, this.gltfLayouts);
|
|
|
//寻找当前空间下的所有家具模型对象
|
|
|
const gltfLayoutModels = this.gltfLayouts.filter(item => {
|
|
|
return spaceObj.layoutId == item.userData.layoutId && spaceObj.spaceId == item.userData.spaceId;
|
|
|
@@ -483,7 +482,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
this.scene.remove(...deleList);//释放家具的资源,this.instancedFurList
|
|
|
- console.log("删除模型了", spaceObj, this.gltfLayouts,this.lastFrunList);
|
|
|
+ console.log("删除模型了", spaceObj, this.gltfLayouts);
|
|
|
},
|
|
|
// 计算家具的位置
|
|
|
calculateLayoutModelSize() {
|
|
|
@@ -1132,12 +1131,19 @@ export default {
|
|
|
this.loadlayoutByID(layoutObj.groupType, element, resolve);
|
|
|
})
|
|
|
)
|
|
|
+ }else{//空间不存在布局，需要请求布局信息
|
|
|
+ promise_list.push(
|
|
|
+ new Promise((resolve, reject) => {
|
|
|
+ this.loadlayoutByID(element.groupType, element, resolve);
|
|
|
+ })
|
|
|
+ )
|
|
|
}
|
|
|
}
|
|
|
Promise.all(promise_list).then(()=>{
|
|
|
this.$nextTick(()=>{
|
|
|
console.log("新布局替换完成",this.changeLayouts, changeSpaces,this.arrFrunList.map(it=>it.id));
|
|
|
this.furnHandle(this.changeLayouts, changeSpaces);//先加载变化的空间的布局
|
|
|
+ this.updataPageData();//更新数据
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
@@ -1180,12 +1186,13 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if(layoutObj==null){
|
|
|
- console.warn("没有合适的布局", layoutObj);
|
|
|
- // this.deleteLayoutModel(spaceObj, layoutObj);//删除当前的布局
|
|
|
+ console.warn("没有合适的布局", layoutObj,spaceObj.layoutId);
|
|
|
+ spaceObj.groupType = groupType;
|
|
|
+ this.deleteLayoutModel(spaceObj, layoutObj);//删除当前的布局
|
|
|
return resolve()
|
|
|
}
|
|
|
console.log("找出最合适的布局", layoutObj)
|
|
|
- console.log("更新空间的布局ID=", spaceObj.layoutId)
|
|
|
+ console.log("更新空间的布局ID=", spaceObj.layoutId,'=>',layoutObj.id)
|
|
|
|
|
|
// 合适的布局更现有布局相同-不在需要了，因为这此之前已经把所有的家具都删除了
|
|
|
// if(spaceObj.layoutId == layoutObj.id && !spaceObj.delateLayoutId){
|
caodongdong