|
@@ -408,7 +408,7 @@ export const enter = (dom, isLocal) => {
|
|
|
|
|
|
Potree.addModel(prop, prop.done , prop.progressFun, prop.onError)
|
|
|
prop.loading = true
|
|
|
- console.log('-------开始加载 id:', prop.id, 'title:', prop.title, ', filename:', getName(prop.url), prop )
|
|
|
+ console.log('-------开始加载 id:', prop.id, 'title:', prop.title, ', filename:', Potree.Common.getNameFromURL(prop.url), prop )
|
|
|
}
|
|
|
|
|
|
let spliceFromArr = (model,loaded)=>{
|
|
@@ -483,11 +483,16 @@ export const enter = (dom, isLocal) => {
|
|
|
|
|
|
let onError = function ( xhr ) {
|
|
|
bus.emit('loadError', xhr)
|
|
|
- console.log('loadError!!!!!!!!!', getName(props.url), props.size, xhr)
|
|
|
+ console.log('loadError!!!!!!!!!', Potree.Common.getNameFromURL(props.url), props.size, xhr)
|
|
|
spliceFromArr(model,false)
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+ try{
|
|
|
+ //根据逗号,拆分为arr
|
|
|
+ props.url = props.url.split(',')
|
|
|
+ }catch(e){
|
|
|
+ console.error(e)
|
|
|
+ }
|
|
|
|
|
|
props.done = done; props.progressFun = progressFun; props.onError = onError
|
|
|
|
|
@@ -595,12 +600,7 @@ export const enter = (dom, isLocal) => {
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
- function getName(url){
|
|
|
- return url.split('/').pop()
|
|
|
- }
|
|
|
-
|
|
|
+
|
|
|
|
|
|
console.log('版本: 2023.3.24-0')
|
|
|
|