|
@@ -17,7 +17,7 @@ const ModelTypes = {
|
|
}
|
|
}
|
|
let cesAspect
|
|
let cesAspect
|
|
|
|
|
|
-
|
|
|
|
|
|
+const isLocalVer = false //是否可调模型离地高度
|
|
/*
|
|
/*
|
|
const Id_noIntersect = -100 //path绘制在地图上的点,modelId传这个值,勿更改
|
|
const Id_noIntersect = -100 //path绘制在地图上的点,modelId传这个值,勿更改
|
|
let isValidPoint = (modelId)=>{//所存的modelId没被删或者它本身不在模型上
|
|
let isValidPoint = (modelId)=>{//所存的modelId没被删或者它本身不在模型上
|
|
@@ -84,6 +84,11 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if(isLocal){//本地配置
|
|
|
|
+ Potree.settings.isLocal = Potree.settings.tileOriginUrl = isLocal2
|
|
|
|
+ }
|
|
|
|
+
|
|
if(laserRoot != void 0){
|
|
if(laserRoot != void 0){
|
|
laserRoot.slice(-1) == '/' && (laserRoot = laserRoot.slice(0,-1)) //去掉最后一个'/'
|
|
laserRoot.slice(-1) == '/' && (laserRoot = laserRoot.slice(0,-1)) //去掉最后一个'/'
|
|
Potree.settings.urls.prefix = laserRoot
|
|
Potree.settings.urls.prefix = laserRoot
|
|
@@ -99,7 +104,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
Potree.settings.urls.panoPrefix = ossRoot //vision.txt
|
|
Potree.settings.urls.panoPrefix = ossRoot //vision.txt
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -108,9 +113,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
|
|
|
|
|
|
|
const tagLimitDis = 8;
|
|
const tagLimitDis = 8;
|
|
- /* if(isLocal2){//本地配置
|
|
|
|
- Potree.settings.isLocal = Potree.settings.tileOriginUrl = isLocal2
|
|
|
|
- } */
|
|
|
|
|
|
+
|
|
Potree.settings.showCompass = true
|
|
Potree.settings.showCompass = true
|
|
Potree.settings.compassDom = dom.querySelector('#direction')
|
|
Potree.settings.compassDom = dom.querySelector('#direction')
|
|
Potree.settings.mergeType2 = true //标识新版
|
|
Potree.settings.mergeType2 = true //标识新版
|
|
@@ -826,7 +829,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
let model
|
|
let model
|
|
let bus = props.bus = mitt()
|
|
let bus = props.bus = mitt()
|
|
//console.log('addModel',props)
|
|
//console.log('addModel',props)
|
|
- props.isFirstLoad = isLocal ? props.bottom == void 0 : (props.isDynamicAdded || props.mode == 'single') // 在编辑时用户添加的 或 展示单个模型 (props.mode='single'模型展示页, props.mode='many'融合页)
|
|
|
|
|
|
+ props.isFirstLoad = isLocalVer ? props.bottom == void 0 : (props.isDynamicAdded || props.mode == 'single') // 在编辑时用户添加的 或 展示单个模型 (props.mode='single'模型展示页, props.mode='many'融合页)
|
|
if (props.opacity == void 0) props.opacity = 1
|
|
if (props.opacity == void 0) props.opacity = 1
|
|
//if (props.type == 'obj' ) props.type = 'glb'
|
|
//if (props.type == 'obj' ) props.type = 'glb'
|
|
props.scale /= 100
|
|
props.scale /= 100
|