|
@@ -24779,14 +24779,20 @@
|
|
|
//MergeEditor.maintainBoundXY(model)
|
|
|
e.by2d || MergeEditor.maintainBoundCenter(model);
|
|
|
_updateBound();
|
|
|
- model.dispatchEvent('transformChanged');
|
|
|
+ model.dispatchEvent({
|
|
|
+ type: 'transformChanged',
|
|
|
+ byControl: e.byControl
|
|
|
+ });
|
|
|
};
|
|
|
- model.addEventListener('position_changed', () => {
|
|
|
+ model.addEventListener('position_changed', e => {
|
|
|
//要先发送position_changed再其他
|
|
|
_updateBound();
|
|
|
MergeEditor.getBoundCenter(model); //更新boundcenter
|
|
|
|
|
|
- model.dispatchEvent('transformChanged');
|
|
|
+ model.dispatchEvent({
|
|
|
+ type: 'transformChanged',
|
|
|
+ byControl: e.byControl
|
|
|
+ });
|
|
|
});
|
|
|
model.addEventListener("rotation_changed", maintainCenter);
|
|
|
model.addEventListener("scale_changed", maintainCenter);
|
|
@@ -71823,7 +71829,8 @@
|
|
|
//add:
|
|
|
|
|
|
object.dispatchEvent({
|
|
|
- type: "position_changed"
|
|
|
+ type: "position_changed",
|
|
|
+ byControl: true
|
|
|
});
|
|
|
} else if (mode === 'scale') {
|
|
|
if (axis.search('XYZ') !== -1) {
|
|
@@ -71874,7 +71881,8 @@
|
|
|
//add:
|
|
|
|
|
|
object.dispatchEvent({
|
|
|
- type: "scale_changed"
|
|
|
+ type: "scale_changed",
|
|
|
+ byControl: true
|
|
|
});
|
|
|
} else if (mode === 'rotate') {
|
|
|
if (this.rotateMethod == 2) {
|
|
@@ -71984,7 +71992,8 @@
|
|
|
//add:
|
|
|
|
|
|
object.dispatchEvent({
|
|
|
- type: "rotation_changed"
|
|
|
+ type: "rotation_changed",
|
|
|
+ byControl: true
|
|
|
});
|
|
|
}
|
|
|
this.dispatchEvent(changeEvent);
|