|
@@ -2626,8 +2626,8 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
function load4dkkMedias(model){//加载四维看看的一些媒体物品
|
|
|
if(model.isPointcloud)return
|
|
|
let {sceneJsonPath,surveillancePath} = model.props.raw
|
|
|
-
|
|
|
- if(sceneJsonPath){//box图片视频
|
|
|
+ console.log(sceneJsonPath,surveillancePath)
|
|
|
+ if(sceneJsonPath){//box图片视频 /oss/scene_view_data/SG-jm-Xwq0FwSkFy4/data/scene.json
|
|
|
Potree.loadFile(sceneJsonPath+ '?m='+Date.now(),null,(json)=>{
|
|
|
//console.log(model.name, 'sceneJson', json, json.surveillances)
|
|
|
|
|
@@ -2655,7 +2655,10 @@ function load4dkkMedias(model){//加载四维看看的一些媒体物品
|
|
|
prop.model = model
|
|
|
prop.position = Potree.Utils.tran4dkkVecInModel(new THREE.Vector3().fromArray(prop.pos), model) ,
|
|
|
prop.rotation = new THREE.Euler().setFromQuaternion(new THREE.Quaternion().fromArray(prop.qua)),
|
|
|
- prop.url = 'oss/scene_view_data/'+ model.props.raw.num + '/user/'+prop.url,
|
|
|
+ //prop.url = location.origin + '/oss/scene_view_data/'+ model.props.raw.num + '/user/'+prop.url,
|
|
|
+ prop.url = location.origin + sceneJsonPath.replace('data/scene.json','user/'+prop.url), //offline different
|
|
|
+
|
|
|
+
|
|
|
prop.id = prop.sid
|
|
|
//Potree.settings.urls.getPrefix(8,model)
|
|
|
//isNew:true, //是否新创建而非加载
|