|
@@ -930,7 +930,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
if (autoLoads.length == 0) { //首次加载
|
|
|
setTimeout(() => {
|
|
|
let sizes = autoLoads.map(e => e.size || 0)
|
|
|
- console.log('需要请求加载的模型大小为', sizes, '总大小', sizes.reduce(function (total, currentValue) {
|
|
|
+ console.log('需要请求加载的模型为', autoLoads.map(e=>e.title) , '总大小', sizes.reduce(function (total, currentValue) {
|
|
|
let current = parseFloat(currentValue)
|
|
|
return total + ((typeof currentValue == 'number' || currentValue.includes('M')) ? current : current / 1024)
|
|
|
}, 0))
|
|
@@ -991,7 +991,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
}
|
|
|
|
|
|
msg = Potree.Common.CloneObject(msg)
|
|
|
- console.log(model.name, msg)
|
|
|
+ //console.log(model.name, msg)
|
|
|
bus.emit('transformChanged', msg)
|
|
|
})
|
|
|
spliceFromArr(model, props, true)
|
|
@@ -1401,7 +1401,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
title: data.title,
|
|
|
fromType: 8, raw:{},
|
|
|
//renderType : 'normal', //色彩好些,否则MeshBasic颜色偏深
|
|
|
- type:'glb', id:data.id
|
|
|
+ type:'obj', id:data.id, dontFocus:true
|
|
|
}
|
|
|
|
|
|
let modelFuns = sdk.addModel(prop)
|
|
@@ -2140,13 +2140,18 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
*/
|
|
|
if (!loadNext()) {
|
|
|
if (autoLoads.filter(e => !e.loadFinish).length == 0 && autoLoads.filter(e => e.loaded).length > 0 && !props.isFirstLoad) {//设置相机位置:当自动开始加载第一个模型时(其余的也跟着自动加载),等这批加载完后;
|
|
|
- let autoLoadsDone = autoLoads.filter(e => e.loaded).map(e => e.model)
|
|
|
- let loadTimeCost = Date.now() - loadStartTime
|
|
|
- console.log('所有模型加载完毕, 耗时', parseInt(loadTimeCost) )
|
|
|
-
|
|
|
+ let autoLoadsDone = autoLoads.filter(e => e.loaded).map(e => e.model)
|
|
|
autoLoads.filter(e => e.loaded && e.show).forEach(e => e.model.visible = true)
|
|
|
-
|
|
|
- MergeEditor.focusOn(autoLoadsDone, 1000, true, true)
|
|
|
+ if(autoLoads.length > 1){
|
|
|
+ let loadTimeCost = Date.now() - loadStartTime
|
|
|
+ console.log('所有模型加载完毕, 耗时', parseInt(loadTimeCost) )
|
|
|
+ }
|
|
|
+ loadStartTime = Date.now()
|
|
|
+
|
|
|
+ if(!props.dontFocus){
|
|
|
+ MergeEditor.focusOn(autoLoadsDone, 1000, true, true)
|
|
|
+ }
|
|
|
+
|
|
|
autoLoads.length = 0
|
|
|
}
|
|
|
}
|