|
@@ -102,7 +102,8 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
Potree.settings.urls.prefix3 = panoOSSRoot //tile
|
|
|
}
|
|
|
if(ossRoot){
|
|
|
- Potree.settings.urls.panoPrefix = ossRoot //vision.txt
|
|
|
+ //Potree.settings.urls.panoPrefix = ossRoot //vision.txt
|
|
|
+ Potree.settings.urls.setPrefix(8, ossRoot)//vision.txt
|
|
|
}
|
|
|
|
|
|
|
|
@@ -1000,9 +1001,9 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
})
|
|
|
|
|
|
MergeEditor.modelAdded(model)
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+ load4dkkMedias(model)
|
|
|
+
|
|
|
if (props.mode == 'single') {//模型查看页
|
|
|
MergeEditor.noNeedSelection = true
|
|
|
setTimeout(() => {
|
|
@@ -1016,9 +1017,9 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
} else {
|
|
|
bus.emit('loadDone',model)
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
//console.log('loadDone' )
|
|
|
}
|
|
|
let progressFun = (progress) => {
|
|
@@ -2455,7 +2456,33 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
}
|
|
|
|
|
|
|
|
|
+function load4dkkMedias(model){//加载四维看看的一些媒体物品
|
|
|
+ let {sceneJsonPath,surveillancePath} = model.props.raw
|
|
|
+
|
|
|
+ if(sceneJsonPath){//box图片视频
|
|
|
+ Potree.loadFile(sceneJsonPath,null,(json)=>{
|
|
|
+ console.log(model, 'sceneJsonPath', json)
|
|
|
+ //json.surveillances //监控开关?
|
|
|
+
|
|
|
|
|
|
+ })
|
|
|
+
|
|
|
+ }
|
|
|
+ if(surveillancePath){//监控
|
|
|
+ Potree.loadFile(surveillancePath,null,(json)=>{
|
|
|
+ console.log(model, 'surveillancePath', json)
|
|
|
+ })
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ //cutModelPath裁剪模型路径
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+}
|
|
|
|
|
|
/*
|
|
|
|