|
@@ -1145,7 +1145,14 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
//}
|
|
|
model.dispatchEvent({ type: 'rotation_changed' , by2d:true})
|
|
|
},
|
|
|
-
|
|
|
+ getModelPose(){
|
|
|
+ return {
|
|
|
+ position: model.position.clone(),
|
|
|
+ rotation: model.rotation.toObject(),
|
|
|
+ quaternion: model.quaternion.toObject(),
|
|
|
+ scale: model.scale.x * 100
|
|
|
+ }
|
|
|
+ },
|
|
|
enterRotateMode() {
|
|
|
if (model) {
|
|
|
if (MergeEditor.split) {//分屏校准
|
|
@@ -1214,7 +1221,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
updateMap()
|
|
|
}
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
enterScaleSet() {//设置比例
|
|
|
let bus = new mitt()
|
|
|
let length, measureBuilded;
|
|
@@ -1345,7 +1352,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
|
|
|
|
|
|
AnimationEditor.addEventListener('atTime',e=>{//发送当前动画时间,同步字幕
|
|
|
- let time = THREE.Math.clamp(e.time, 0, AnimationEditor.duration)
|
|
|
+ let time = /* THREE.Math.clamp( */e.time/* , 0, AnimationEditor.duration) */
|
|
|
bus.emit('currentTime',time)
|
|
|
})
|
|
|
|
|
@@ -1426,15 +1433,16 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
// 添加模型帧
|
|
|
addFrame(frame){
|
|
|
console.log('addFrame',frame)
|
|
|
- let key = {time: frame.time, dur:frame.duration}
|
|
|
+ let key = {time: frame.time }
|
|
|
let getData = (data)=>{
|
|
|
let info = {}
|
|
|
data.position && (info.pos = new THREE.Vector3().copy(data.position))
|
|
|
data.scale != void 0 && (info.scale = new THREE.Vector3(data.scale/100,data.scale/100,data.scale/100))
|
|
|
- data.rotation && (info.qua = new THREE.Quaternion().setFromEuler(new THREE.Euler().setFromVector3(data.rotation)))
|
|
|
+ //data.rotation && (info.qua = new THREE.Quaternion().setFromEuler(new THREE.Euler().setFromVector3(data.rotation)))
|
|
|
+ data.quaternion && (info.qua = new THREE.Quaternion().copy(data.quaternion))
|
|
|
return info
|
|
|
}
|
|
|
- //Object.assign(key, getData(frame.mat))
|
|
|
+ Object.assign(key, getData(frame.mat))
|
|
|
AnimationEditor.addKey(model, 'pose', key )
|
|
|
return {
|
|
|
destroy(){
|
|
@@ -1445,6 +1453,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
AnimationEditor.reOrderKey(model, 'pose', key)
|
|
|
},
|
|
|
setMat(data){//设置帧
|
|
|
+ console.log('设置帧',data.scale)
|
|
|
Object.assign(key,getData(data))
|
|
|
}
|
|
|
}
|