|
@@ -230,7 +230,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
//Potree.fileServer = axios
|
|
|
Potree.settings.libsUrl = './lib/'
|
|
|
let loadStartTime = Date.now()
|
|
|
-
|
|
|
+ Potree.settings.maxMemory = 2000 //!!!!因为模型很多所以多加了500
|
|
|
//正式环境(本地调试会打不开)
|
|
|
if (location.host === 'mix3d.4dkankan.com') {
|
|
|
Potree.settings.urls.prefix = Potree.settings.urls.prefix6
|
|
@@ -304,9 +304,11 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
window.cesErrorCallback = ()=>{
|
|
|
//sdk.setBackdrop('none')
|
|
|
}
|
|
|
- Potree.settings.queryCloudLonLatUrl = Potree.settings.urls.prefix+"/laser/4dage/{sceneCode}/getDataSetAndControlPoint"
|
|
|
+ //Potree.settings.queryCloudLonLatUrl = Potree.settings.urls.prefix+"/laser/4dage/{sceneCode}/getDataSetAndControlPoint"
|
|
|
|
|
|
- let { THREE } = Potree.mergeEditStart(dom, mapDom)
|
|
|
+ let { THREE } = Potree.mergeEditStart(dom, mapDom, {
|
|
|
+ queryCloudLonLatUrl:Potree.settings.urls.prefix+"/laser/4dage/{sceneCode}/getDataSetAndControlPoint"
|
|
|
+ })
|
|
|
let {MergeEditor, AnimationEditor} = viewer.modules
|
|
|
|
|
|
|
|
@@ -1119,8 +1121,9 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
//if (props.type == 'obj') props.type = 'glb'
|
|
|
props.scale && (props.scale /= 100)
|
|
|
|
|
|
-
|
|
|
-
|
|
|
+ if(props.raw.type == 7){
|
|
|
+ props.fromType = (props.type == 'osgb' || props.type == 'b3dm') ? 4 : 0
|
|
|
+ }
|
|
|
let getBaseRotation = () => {
|
|
|
if(ModelTypes[props.fromType]?.rot90 && props.type != 'obj'){
|
|
|
return new THREE.Euler(Math.PI / 2, 0, 0)
|