|
@@ -253,20 +253,22 @@ export default {
|
|
|
let modelName = item.modelName;
|
|
|
// console.log("布局模型名称", modelName);
|
|
|
let layoutModel = modelData.find(it => modelName.indexOf(it.modelName) == 0); //模型地址
|
|
|
-
|
|
|
+ // if(layoutModel.modelName=='BP_L_book01'){
|
|
|
+ // debugger
|
|
|
+ // }
|
|
|
// console.log("要加载的模型数据", item.modelName, layoutModel)
|
|
|
if (layoutModel && layoutModel.url) {//该数据存在模型地址
|
|
|
+ let url = layoutModel.url;
|
|
|
//说明当前模型存在精简模型对象,则应该使用精简模型数据
|
|
|
if(this.type ==2 && globlShowModel.includes(layoutModel.modelName + this.nextString)){
|
|
|
- if(!layoutModel.url.includes(this.nextString)){
|
|
|
- let idx = layoutModel.url.lastIndexOf('.');
|
|
|
- layoutModel.url = layoutModel.url.substr(0,idx) + this.nextString + layoutModel.url.substr(idx);//修改为精简模型地址
|
|
|
+ if(!url.includes(this.nextString)){
|
|
|
+ let idx = url.lastIndexOf('.');
|
|
|
+ url = url.substr(0,idx) + this.nextString + url.substr(idx);//修改为精简模型地址
|
|
|
}
|
|
|
}
|
|
|
- let object = realFurnitureArr.find(it=>(it.url==layoutModel.url));
|
|
|
+ let object = realFurnitureArr.find(it=>(it.url==url));
|
|
|
//列表中还没有这个数据
|
|
|
if(!object){
|
|
|
- let url = layoutModel.url;
|
|
|
let it = {
|
|
|
url:url,
|
|
|
name:layoutModel.modelName,
|
|
@@ -306,6 +308,9 @@ export default {
|
|
|
if(realData.name.includes('BP_XSPACE_deng_01')){//灯光
|
|
|
resolve();
|
|
|
}else{
|
|
|
+ // if(realData.name=='BP_L_book01'){
|
|
|
+ // debugger
|
|
|
+ // }
|
|
|
//不在白名单里面的,不加载
|
|
|
if(this.type==2){
|
|
|
if(!globlShowModel.includes(realData.name)
|