|
@@ -982,7 +982,8 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
//console.log('change pos', model.name, model.position.toArray())
|
|
|
}
|
|
|
if (!lastState.rotation || !model.rotation.equals(lastState.rotation)) {
|
|
|
- lastState.rotation = msg.rotation = model.rotation.clone()
|
|
|
+ lastState.rotation = model.rotation.clone()
|
|
|
+ msg.rotation = model.rotation.toObject()
|
|
|
}
|
|
|
if (lastState.scale == void 0 || model.scale.x * 100 != lastState.scale) {
|
|
|
lastState.scale = msg.scale = model.scale.x * 100
|
|
@@ -1087,10 +1088,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
Potree.Utils.updateVisible(model, 'datasetSelection', show)
|
|
|
if (model.panos) {
|
|
|
model.panos.forEach(e => e.setEnable(show))
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- viewer.dispatchEvent('content_changed')
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
changeSelect(state) {
|
|
@@ -1427,16 +1425,17 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
|
|
|
// 添加模型帧
|
|
|
addFrame(frame){
|
|
|
- let key = {time: frame.time}
|
|
|
+ console.log('addFrame',frame)
|
|
|
+ let key = {time: frame.time, dur:frame.duration}
|
|
|
let getData = (data)=>{
|
|
|
- return {
|
|
|
- pos: new THREE.Vector3().copy(data.position),
|
|
|
- scale: new THREE.Vector3().copy(data.scale),
|
|
|
- qua: new THREE.Quaternion().copy(data.quaternion)
|
|
|
- }
|
|
|
+ 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)))
|
|
|
+ return info
|
|
|
}
|
|
|
- Object.assign(key, getData(frame.mat))
|
|
|
- AnimationEditor.addKey(model, 'pose', getData(frame))
|
|
|
+ //Object.assign(key, getData(frame.mat))
|
|
|
+ AnimationEditor.addKey(model, 'pose', key )
|
|
|
return {
|
|
|
destroy(){
|
|
|
AnimationEditor.removeKey(model,'pose', key)
|
|
@@ -1451,7 +1450,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
}
|
|
|
},
|
|
|
addAction(frame){// 添加模型动作
|
|
|
-
|
|
|
+ console.log('addAction',frame)
|
|
|
let key = Object.assign({},frame)
|
|
|
key.weight = key.amplitude
|
|
|
key.actionIndex = model.actions.findIndex(e=>e.name == key.key)
|
|
@@ -1485,6 +1484,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
},
|
|
|
|
|
|
addPath(frame){//走路路径
|
|
|
+ console.log('addPath',frame)
|
|
|
let key = Object.assign({},frame)
|
|
|
key.path = key.path.path
|
|
|
key.dur = key.duration
|
|
@@ -1513,13 +1513,13 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
|
|
|
},
|
|
|
|
|
|
- getCurrentMat(){// 获取当前时间改模型的姿态
|
|
|
+ /* getCurrentMat(){// 获取当前时间改模型的姿态
|
|
|
return {
|
|
|
quaternion: model.quaternion.clone(),
|
|
|
scale: model.scale.clone(),
|
|
|
position: model.position.clone()
|
|
|
}
|
|
|
- },
|
|
|
+ }, */
|
|
|
|
|
|
|
|
|
getCurrentSubtitlePixel({width , height}){// 获取当前模型旁白出现的适合位置,传入旁边dom的宽高,返回像素位置
|
|
@@ -1998,8 +1998,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
},
|
|
|
visibility(v){// 标注可见性
|
|
|
//console.log('visibility', tag.title, v)
|
|
|
- Potree.Utils.updateVisible(tag,'user', v)
|
|
|
- viewer.dispatchEvent('content_changed')
|
|
|
+ Potree.Utils.updateVisible(tag,'user', v)
|
|
|
},
|
|
|
visibilityTitle(v){
|
|
|
tag.setTitleVisi(v, 'user')
|
|
@@ -2059,13 +2058,11 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
|
|
|
|
|
|
showGrid() {
|
|
|
- Potree.Utils.updateVisible(viewer.modules.MergeEditor.ground, 'hideGrid', true)
|
|
|
- viewer.dispatchEvent('content_changed')
|
|
|
+ Potree.Utils.updateVisible(viewer.modules.MergeEditor.ground, 'hideGrid', true)
|
|
|
},
|
|
|
|
|
|
hideGrid() {
|
|
|
- Potree.Utils.updateVisible(viewer.modules.MergeEditor.ground, 'hideGrid', false)
|
|
|
- viewer.dispatchEvent('content_changed')
|
|
|
+ Potree.Utils.updateVisible(viewer.modules.MergeEditor.ground, 'hideGrid', false)
|
|
|
},
|
|
|
|
|
|
|