|
@@ -31,7 +31,16 @@ export const enter = (dom) => {
|
|
|
model.addEventListener('changeSelect',(e)=>{
|
|
|
bus.emit('changeSelect',e.selected)
|
|
|
})
|
|
|
- model.addEventListener('positionChanged',(e)=>{
|
|
|
+ model.addEventListener('transformChanged',(e)=>{
|
|
|
+ bus.emit('transformChanged', {
|
|
|
+ position : model.position.clone(),
|
|
|
+ scale: model.scale.x,
|
|
|
+ rotation: model.rotation.clone(),
|
|
|
+ bottom: model.btmHeight
|
|
|
+ })
|
|
|
+ })
|
|
|
+
|
|
|
+ /* model.addEventListener('positionChanged',(e)=>{
|
|
|
bus.emit('positionChanged', e.position) //点云不是直接使用
|
|
|
})
|
|
|
model.addEventListener('scaleChanged',(e)=>{
|
|
@@ -42,7 +51,7 @@ export const enter = (dom) => {
|
|
|
})
|
|
|
model.addEventListener('bottomChanged',(e)=>{
|
|
|
bus.emit('bottomChanged', model.btmHeight)
|
|
|
- })
|
|
|
+ }) */
|
|
|
bus.emit('loadDone')
|
|
|
console.log('loadDone' )
|
|
|
}
|
|
@@ -56,27 +65,35 @@ export const enter = (dom) => {
|
|
|
return {
|
|
|
bus,
|
|
|
changeSelect(state){
|
|
|
- MergeEditor.selectModel(model, state, true)
|
|
|
+ if(model){
|
|
|
+ MergeEditor.selectModel(model, state, true)
|
|
|
+ }
|
|
|
},
|
|
|
changeScale(s){
|
|
|
- model.scale.set(s,s,s)
|
|
|
- model.dispatchEvent("scale_changed")
|
|
|
+ if(model){
|
|
|
+ model.scale.set(s,s,s)
|
|
|
+ model.dispatchEvent("scale_changed")
|
|
|
+ }
|
|
|
},
|
|
|
changeOpacity(opacity){
|
|
|
- model.travese(e=>e.material.opacity = opacity)
|
|
|
+ model && model.travese(e=>e.material.opacity = opacity)
|
|
|
},
|
|
|
changeBottom(z){
|
|
|
- MergeEditor.setModelBtmHeight(z)
|
|
|
+ model && MergeEditor.setModelBtmHeight(model,z)
|
|
|
},
|
|
|
enterRotateMode(){
|
|
|
- viewer.transformObject(model);
|
|
|
- viewer.transformationTool.setModeEnable('rotate',true)
|
|
|
- viewer.transformationTool.setModeEnable('translation',false)
|
|
|
+ if(model){
|
|
|
+ viewer.transformObject(model);
|
|
|
+ viewer.transformationTool.setModeEnable('rotate',true)
|
|
|
+ viewer.transformationTool.setModeEnable('translation',false)
|
|
|
+ }
|
|
|
},
|
|
|
enterMoveMode(){
|
|
|
- viewer.transformObject(model);
|
|
|
- viewer.transformationTool.setModeEnable('rotate',false)
|
|
|
- viewer.transformationTool.setModeEnable('translation',true)
|
|
|
+ if(model){
|
|
|
+ viewer.transformObject(model);
|
|
|
+ viewer.transformationTool.setModeEnable('rotate',false)
|
|
|
+ viewer.transformationTool.setModeEnable('translation',true)
|
|
|
+ }
|
|
|
},
|
|
|
/* leaveRotateMode(){
|
|
|
|