|
@@ -1187,7 +1187,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
}
|
|
}
|
|
},
|
|
},
|
|
leaveTransform() {
|
|
leaveTransform() {
|
|
- console.log('leaveTransform')
|
|
|
|
|
|
+ //console.log('leaveTransform')
|
|
if (MergeEditor.split) {//分屏校准
|
|
if (MergeEditor.split) {//分屏校准
|
|
MergeEditor.setTransformState(null)
|
|
MergeEditor.setTransformState(null)
|
|
} else {
|
|
} else {
|
|
@@ -1427,6 +1427,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
model.name = name
|
|
model.name = name
|
|
if(model.titleLabel){
|
|
if(model.titleLabel){
|
|
model.titleLabel.setText(name)
|
|
model.titleLabel.setText(name)
|
|
|
|
+ viewer.dispatchEvent('content_changed')
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
|
|
@@ -1472,9 +1473,11 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
key.speed = key.speed || 1
|
|
key.speed = key.speed || 1
|
|
key.action = model.actions.find(e=>e.name == key.key)
|
|
key.action = model.actions.find(e=>e.name == key.key)
|
|
if(!key.action){
|
|
if(!key.action){
|
|
- //return console.error('cannot find action', key.key)
|
|
|
|
- console.log('没找到动作,暂时先用第一个')
|
|
|
|
- key.action = model.actions[0]
|
|
|
|
|
|
+ //return console.error('cannot find action', key.key)
|
|
|
|
+ let random = Math.floor(Math.random() * (model.actions.length))
|
|
|
|
+ random = Math.min(model.actions.length-1, random)
|
|
|
|
+ console.log('没找到动作,暂时先用第'+ random +'个')
|
|
|
|
+ key.action = model.actions[random]
|
|
}
|
|
}
|
|
delete key.amplitude
|
|
delete key.amplitude
|
|
delete key.key
|
|
delete key.key
|
|
@@ -1813,7 +1816,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
},
|
|
},
|
|
changeLine({width,color,altitudeAboveGround}){
|
|
changeLine({width,color,altitudeAboveGround}){
|
|
path.setPathWidth(width)
|
|
path.setPathWidth(width)
|
|
- path.setPathColor(color)
|
|
|
|
|
|
+ path.setColor(color)
|
|
},
|
|
},
|
|
changeVisibilityRange(far){//设置消失距离
|
|
changeVisibilityRange(far){//设置消失距离
|
|
path.setFadeFar(far== -1 ? 0 : far)
|
|
path.setFadeFar(far== -1 ? 0 : far)
|