|
@@ -646,6 +646,8 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
//console.log('getPose',position, target)
|
|
|
return pose
|
|
|
},
|
|
|
+
|
|
|
+
|
|
|
comeTo(o = {}) {
|
|
|
//console.log('comeTo',o.position, o.target)
|
|
|
//飞到某个点
|
|
@@ -713,7 +715,11 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
}))
|
|
|
return deferred.promise()
|
|
|
},
|
|
|
-
|
|
|
+ comeToByLatLng(lonlat){//飞到指定经纬度
|
|
|
+ let pos = viewer.transform.lonlatToLocal.forward(lonlat)
|
|
|
+ let location = viewer.mainViewport.view.position.clone().setX(pos.x).setY(pos.y)
|
|
|
+ viewer.scene.view.setView({position:location, duration:500});
|
|
|
+ },
|
|
|
|
|
|
setBackdrop(sky, type, { scale, rotate }={}) {//天空盒背景
|
|
|
//console.log('天空盒背景', sky,type)
|
|
@@ -1173,7 +1179,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
MergeEditor.transformControls.attach(model)
|
|
|
MergeEditor.transformControls.mode = 'scale'
|
|
|
}
|
|
|
- }
|
|
|
+ },
|
|
|
leaveTransform() {
|
|
|
console.log('leaveTransform')
|
|
|
if (MergeEditor.split) {//分屏校准
|
|
@@ -1393,7 +1399,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
changeVisibilityRange(range){
|
|
|
visibleRange = range
|
|
|
updateVisiByRange()
|
|
|
- };
|
|
|
+ },
|
|
|
// 更改模型名称
|
|
|
changeTitle(name){
|
|
|
model.name = name
|
|
@@ -1406,11 +1412,11 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
model.titleLabel.fontsize = fontsize
|
|
|
model.titleLabel.updateTexture();
|
|
|
viewer.dispatchEvent('content_changed')
|
|
|
- }
|
|
|
+ },
|
|
|
|
|
|
// 添加模型帧
|
|
|
- addFrame: (frame){
|
|
|
- let key = {time: frame:time}
|
|
|
+ addFrame(frame){
|
|
|
+ let key = {time: frame.time}
|
|
|
let getData = (data)=>{
|
|
|
return {
|
|
|
pos: new THREE.Vector3().copy(data.position),
|
|
@@ -1427,13 +1433,13 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
changeTime(time){
|
|
|
key.time = time
|
|
|
AnimationEditor.reOrderKey(model, 'pose', key)
|
|
|
- }
|
|
|
+ },
|
|
|
setMat(data){//设置帧
|
|
|
Object.assign(key,getData(data))
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
- addAction: (frame){// 添加模型动作
|
|
|
+ addAction(frame){// 添加模型动作
|
|
|
|
|
|
let key = Object.assign({},frame)
|
|
|
key.weight = key.amplitude
|
|
@@ -1507,7 +1513,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
AnimationEditor.at(s)
|
|
|
},
|
|
|
|
|
|
- getCurrentSubtitlePixel(size: {width: number, height: number}){// 获取当前模型旁白出现的适合位置,传入旁边dom的宽高,返回像素位置
|
|
|
+ getCurrentSubtitlePixel({width , height}){// 获取当前模型旁白出现的适合位置,传入旁边dom的宽高,返回像素位置
|
|
|
let bound = model.boundingBox
|
|
|
let boundPoint = [
|
|
|
new THREE.Vector3(bound.min.x, bound.min.y, bound.min.z ),
|
|
@@ -1552,15 +1558,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
|
|
|
|
|
|
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+ },
|
|
|
|
|
|
|
|
|
|
|
@@ -2059,7 +2057,9 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
hideGrid() {
|
|
|
Potree.Utils.updateVisible(viewer.modules.MergeEditor.ground, 'hideGrid', false)
|
|
|
viewer.dispatchEvent('content_changed')
|
|
|
- }
|
|
|
+ },
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|