|
@@ -20,7 +20,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
|
|
|
Potree.settings.isOfficial = true //标记为正式、非测试版本
|
|
|
//Potree.fileServer = axios
|
|
|
Potree.settings.libsUrl = './lib/'
|
|
|
-
|
|
|
+ let loadStartTime = Date.now()
|
|
|
|
|
|
//正式环境(本地调试会打不开)
|
|
|
if (location.host === 'mix3d.4dkankan.com') {
|
|
@@ -227,7 +227,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
|
|
|
//isLocal = false
|
|
|
let autoLoads = /* window.autoLoads = */ []
|
|
|
let readyToAddModel
|
|
|
- let maxLoadingCount = /* isLocal ? 1 : */2; //正在加载模型的最大数目
|
|
|
+ let maxLoadingCount = 3; //正在加载模型的最大数目
|
|
|
|
|
|
let mainBackground = viewer.background
|
|
|
|
|
@@ -1267,7 +1267,9 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
|
|
|
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)
|
|
|
- console.log('所有模型加载完毕')
|
|
|
+ let loadTimeCost = Date.now() - loadStartTime
|
|
|
+ console.log('所有模型加载完毕, 耗时', parseInt(loadTimeCost) )
|
|
|
+
|
|
|
autoLoads.filter(e => e.loaded && e.show).forEach(e => e.model.visible = true)
|
|
|
|
|
|
MergeEditor.focusOn(autoLoadsDone, 1000, true, true)
|