Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 15:43:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix children's rotations drifting when scale group

Browse source
This commit is contained in:
David Rowe 2017-10-05 14:36:25 +13:00
parent 63e7521711
commit 4855e0f528
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
scripts/shapes/modules/selection.js
View file

@ -55,6 +55,7 @@ SelectionManager = function (side) {
position: properties.position,
parentID: properties.parentID,
localPosition: properties.localPosition,
localRotation: properties.localRotation,
registrationPoint: properties.registrationPoint,
rotation: properties.rotation,
dimensions: properties.dimensions,
@ -363,7 +364,8 @@ SelectionManager = function (side) {
for (i = 1, length = selection.length; i < length; i++) {
Entities.editEntity(selection[i].id, {
dimensions: Vec3.multiply(factor, selection[i].dimensions),
localPosition: Vec3.multiply(factor, selection[i].localPosition)
localPosition: Vec3.multiply(factor, selection[i].localPosition),
localRotation: selection[i].localRotation // Always specify localRotation otherwise rotations can drift.
});
}
@ -405,7 +407,8 @@ SelectionManager = function (side) {
entityID: selection[i].id,
properties: {
dimensions: selection[i].dimensions,
localPosition: selection[i].localPosition
localPosition: selection[i].localPosition,
localRotation: selection[i].localRotation
}
});
selection[i].dimensions = Vec3.multiply(scaleFactor, selection[i].dimensions);
@ -414,7 +417,8 @@ SelectionManager = function (side) {
entityID: selection[i].id,
properties: {
dimensions: selection[i].dimensions,
localPosition: selection[i].localPosition
localPosition: selection[i].localPosition,
localRotation: selection[i].localRotation
}
});
}
@ -476,7 +480,8 @@ SelectionManager = function (side) {
for (i = 1, length = selection.length; i < length; i++) {
Entities.editEntity(selection[i].id, {
dimensions: Vec3.multiplyVbyV(factor, selection[i].dimensions),
localPosition: Vec3.multiplyVbyV(factor, selection[i].localPosition)
localPosition: Vec3.multiplyVbyV(factor, selection[i].localPosition),
localRotation: selection[i].localRotation // Always specify localRotation otherwise rotations can drift.
});
}
@ -518,7 +523,8 @@ SelectionManager = function (side) {
entityID: selection[i].id,
properties: {
dimensions: selection[i].dimensions,
localPosition: selection[i].localPosition
localPosition: selection[i].localPosition,
localRotation: selection[i].localRotation
}
});
selection[i].dimensions = Vec3.multiplyVbyV(scaleFactor, selection[i].dimensions);
@ -527,7 +533,8 @@ SelectionManager = function (side) {
entityID: selection[i].id,
properties: {
dimensions: selection[i].dimensions,
localPosition: selection[i].localPosition
localPosition: selection[i].localPosition,
localRotation: selection[i].localRotation
}
});
}