|
@@ -740,6 +740,7 @@ export const enter = (dom, isLocal) => {
|
|
|
},
|
|
|
|
|
|
enterAlignment(){//开始校准
|
|
|
+
|
|
|
result.leaveTransform()
|
|
|
MergeEditor.enterSplit()
|
|
|
|
|
@@ -756,10 +757,10 @@ export const enter = (dom, isLocal) => {
|
|
|
},
|
|
|
leaveAlignment(){
|
|
|
//console.log('leaveAlignment',model.position, model.rotation)
|
|
|
- MergeEditor.leaveSplit()
|
|
|
-
|
|
|
- MergeEditor.transformControls.detach()
|
|
|
+ MergeEditor.leaveSplit()
|
|
|
+ MergeEditor.transformControls.detach()
|
|
|
MergeEditor.transformControls2.detach()
|
|
|
+
|
|
|
},
|
|
|
|
|
|
enterScaleSet(){//设置比例
|