|
@@ -3,9 +3,10 @@ import mitt from 'mitt'
|
|
|
import axios from 'axios' //{ axios } from '@/api'
|
|
|
|
|
|
/*
|
|
|
-在线版
|
|
|
+在线版 已经不维护
|
|
|
https://xj-mix3d.4dkankan.com/fire/#/home 新疆消防救援总队火灾现场勘验重建平台
|
|
|
-
|
|
|
+本地
|
|
|
+https://192.168.0.25/fire/#/home
|
|
|
*/
|
|
|
|
|
|
let requestLoadCount = 0
|
|
@@ -252,7 +253,7 @@ export const enter = (dom, mapDom, isLocal, lonlat) => {
|
|
|
console.log('2d->3d isHight ',isHight)
|
|
|
measure.setSelected(isHight, 'byList')
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -473,6 +474,25 @@ export const enter = (dom, mapDom, isLocal, lonlat) => {
|
|
|
},{once:true})
|
|
|
Potree.config.mapBG = '#134'
|
|
|
|
|
|
+ //------------
|
|
|
+
|
|
|
+ viewer.mapViewer.setRenderCloud()
|
|
|
+
|
|
|
+
|
|
|
+ /* viewer.mapViewer.viewports[0].noPointcloud = false;
|
|
|
+
|
|
|
+
|
|
|
+ let oldMapRender = viewer.mapViewer.render ,
|
|
|
+ oldMapClear = viewer.mapViewer.clear
|
|
|
+ viewer.mapViewer.render = ()=>{
|
|
|
+ viewer.renderDefault({
|
|
|
+ viewports: viewer.mapViewer.viewports,
|
|
|
+ camera: viewer.mapViewer.camera,
|
|
|
+ render: oldMapRender,
|
|
|
+ clear: oldMapClear,
|
|
|
+ })
|
|
|
+ } */
|
|
|
+
|
|
|
//-------
|
|
|
|
|
|
let map = viewer.mapViewer.mapLayer.maps.find(e=>e.name == 'map')
|
|
@@ -597,11 +617,8 @@ export const enter = (dom, mapDom, isLocal, lonlat) => {
|
|
|
readyToAddModel = false
|
|
|
}else{
|
|
|
readyToAddModel = true
|
|
|
-
|
|
|
- //0看看,1看见,2深时,3用户上传三维模型,4深时mesh,5深光点云,6深光mesh
|
|
|
- if(props.fromType == 1 || props.fromType == 4 || props.fromType == 6 ){//来自4dkk的3dtiles初始需要转90度
|
|
|
- props.rotation = new THREE.Euler(Math.PI/2, 0,0)
|
|
|
- }
|
|
|
+
|
|
|
+ props.rotation = result.getDefaultRotation()
|
|
|
}
|
|
|
|
|
|
|
|
@@ -767,7 +784,12 @@ export const enter = (dom, mapDom, isLocal, lonlat) => {
|
|
|
model && model.rotation.setFromVector3(rot)
|
|
|
model && model.dispatchEvent({type:'rotation_changed'})
|
|
|
},
|
|
|
-
|
|
|
+ getDefaultRotation(){
|
|
|
+ //0看看,1看见,2深时,3用户上传三维模型,4深时mesh,5深光点云,6深光mesh
|
|
|
+ if(props.fromType == 1 || props.fromType == 4 || props.fromType == 6 ){//来自4dkk的3dtiles初始需要转90度
|
|
|
+ return new THREE.Euler(Math.PI/2, 0,0)
|
|
|
+ }else return new THREE.Euler(0,0,0)
|
|
|
+ },
|
|
|
enterRotateMode(){
|
|
|
if(model){
|
|
|
if(MergeEditor.split){//分屏校准
|