|
@@ -662,10 +662,17 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
|
|
|
|
|
|
let startLoad = (prop) => {
|
|
|
//if(autoLoads.filter(e=>e.loaded).length>1)return console.log('取消加载', prop), prop.onError()
|
|
|
+/* if(props.raw.visible === 0){//用于临时隐藏
|
|
|
+ setTimeout(()=>{
|
|
|
+ spliceFromArr(model, false)
|
|
|
+ bus.emit('loadError' )
|
|
|
+ },1)
|
|
|
+
|
|
|
+ return
|
|
|
+} */
|
|
|
Potree.Log(`--开始加载--`, { font: { color: '#f68' } });
|
|
|
- console.log('id:', prop.id, ', title:', prop.title, ', filename:', Potree.Common.getNameFromURL(prop.url), ', modelType:', prop.modelType, prop)
|
|
|
-
|
|
|
-
|
|
|
+ console.log('id:', prop.id, ', title:', prop.title, ', filename:', Potree.Common.getNameFromURL(prop.url), ', type:', prop.type, prop)
|
|
|
+
|
|
|
prop.unlit = props.renderType != 'normal'
|
|
|
prop.maximumScreenSpaceError = 60
|
|
|
Potree.addModel(prop, prop.done, prop.progressFun, prop.onError)
|
|
@@ -715,7 +722,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
|
|
|
if (!props.isFirstLoad) {
|
|
|
model.visible = false//先不显示,防止卡顿
|
|
|
}
|
|
|
-
|
|
|
+ model.showInPano = props.raw.showInPano
|
|
|
props.opacity < 100 && result.changeOpacity(props.opacity)
|
|
|
|
|
|
model.addEventListener('changeSelect', (e) => {
|
|
@@ -775,7 +782,6 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
|
|
|
spliceFromArr(model, false)
|
|
|
}
|
|
|
|
|
|
-
|
|
|
try {
|
|
|
props.url = JSON.parse(props.url) //去掉 '\'
|
|
|
} catch (e) { }
|
|
@@ -812,7 +818,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
|
|
|
Potree.Utils.updateVisible(MergeEditor.boxHelper, 'showPanos', false)
|
|
|
|
|
|
let changeVisi = (object) => {
|
|
|
- Potree.Utils.updateVisible(object, 'showPanos', object == model && Potree.settings.modelSkybox)
|
|
|
+ Potree.Utils.updateVisible(object, 'showPanos', object == model && Potree.settings.modelSkybox || object.showInPano)
|
|
|
}
|
|
|
|
|
|
|