|
@@ -1080,7 +1080,22 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
|
|
|
},
|
|
|
|
|
|
-
|
|
|
+ moveModelTo(mouse, pos3d){//'移动到这里'
|
|
|
+ console.log('moveModelTo', mouse)
|
|
|
+ let viewport = viewer.mainViewport
|
|
|
+ if(!pos3d){
|
|
|
+ let width = viewport.width * viewer.renderArea.clientWidth
|
|
|
+ let height = viewport.height * viewer.renderArea.clientHeight
|
|
|
+ let pointer = Potree.Utils.convertScreenPositionToNDC(null, mouse, width, height);
|
|
|
+
|
|
|
+ let {x,y} = Potree.Utils.getPointerPosAtHeight(model.boundCenter.z, pointer)
|
|
|
+ pos3d = new THREE.Vector3(x,y, model.boundCenter.z)
|
|
|
+ }
|
|
|
+
|
|
|
+ MergeEditor.moveBoundCenterTo(model, pos3d) //使模型中心的xy在鼠标所在位置
|
|
|
+
|
|
|
+ model.dispatchEvent("position_changed")
|
|
|
+ },
|
|
|
|
|
|
changeShow(show) {
|
|
|
props.show = show //for autoLoads show model
|
|
@@ -1351,14 +1366,11 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
let bus = mitt()
|
|
|
|
|
|
|
|
|
- AnimationEditor.addEventListener('atTime',e=>{//发送当前动画时间,同步字幕
|
|
|
- let time = /* THREE.Math.clamp( */e.time/* , 0, AnimationEditor.duration) */
|
|
|
- //console.log('currentTime',time)
|
|
|
- bus.emit('currentTime',time)
|
|
|
+ AnimationEditor.addEventListener('atTime',e=>{//发送当前动画时间,同步字幕
|
|
|
+ //console.log('currentTime',e.time )
|
|
|
+ bus.emit('currentTime',e.time )
|
|
|
})
|
|
|
- /* AnimationEditor.addEventListener('stop',e=>{
|
|
|
- bus.emit('stop')
|
|
|
- }) */
|
|
|
+
|
|
|
|
|
|
let funs = {
|
|
|
bus,
|