Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix parent transformations being applied to position/rotation deltas … #14708

Merged
merged 1 commit into from
Jan 15, 2024
Merged

Fix parent transformations being applied to position/rotation deltas … #14708

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 14 additions & 20 deletions packages/dev/core/src/Behaviors/Meshes/sixDofDragBehavior.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,10 @@ export class SixDofDragBehavior extends BaseSixDofDragBehavior {
// If the node has a parent, transform the delta to local space, so it can be added to the
// position in local space
if (ownerNode.parent) {
const parentWorld = ownerNode.parent.getWorldMatrix();
Vector3.TransformNormalToRef(deltaToAdd, parentWorld, deltaToAddTransformed);
const parentRotationMatrixInverse = TmpVectors.Matrix[0];
(ownerNode.parent as TransformNode).absoluteRotationQuaternion.toRotationMatrix(parentRotationMatrixInverse);
parentRotationMatrixInverse.invert();
Vector3.TransformNormalToRef(deltaToAdd, parentRotationMatrixInverse, deltaToAddTransformed);
}
ownerNode.position.addInPlace(deltaToAddTransformed);

Expand All @@ -99,15 +101,11 @@ export class SixDofDragBehavior extends BaseSixDofDragBehavior {
if (!ownerNode.parent || ((ownerNode.parent as TransformNode).scaling && !(ownerNode.parent as TransformNode).scaling.isNonUniformWithinEpsilon(0.001))) {
const rotationToApply = TmpVectors.Quaternion[0];
rotationToApply.copyFrom(this._targetOrientation);
// If the node has a parent, transform the rotation to local space so it can be applied
// to the node's own rotation
if (ownerNode.parent) {
const parentWorld = ownerNode.parent?.getWorldMatrix();
const rotation = TmpVectors.Matrix[0];
this._targetOrientation.toRotationMatrix(rotation);
const rotationTransformed = TmpVectors.Matrix[1];
parentWorld?.multiplyToRef(rotation, rotationTransformed);
Quaternion.FromRotationMatrixToRef(rotationTransformed, rotationToApply);
const parentRotationInverse = TmpVectors.Quaternion[0];
parentRotationInverse.copyFrom((ownerNode.parent as TransformNode).absoluteRotationQuaternion);
parentRotationInverse.invertInPlace();
parentRotationInverse.multiplyToRef(this._targetOrientation, rotationToApply);
}
Quaternion.SlerpToRef(ownerNode.rotationQuaternion!, rotationToApply, this.dragDeltaRatio, ownerNode.rotationQuaternion!);
}
Expand Down Expand Up @@ -193,18 +191,16 @@ export class SixDofDragBehavior extends BaseSixDofDragBehavior {

protected _targetDragStart() {
const pointerCount = this.currentDraggingPointerIds.length;
const oldParent = this._ownerNode.parent;

if (!this._ownerNode.rotationQuaternion) {
this._ownerNode.rotationQuaternion = Quaternion.RotationYawPitchRoll(this._ownerNode.rotation.y, this._ownerNode.rotation.x, this._ownerNode.rotation.z);
}
const worldPivot = this._ownerNode.getAbsolutePivotPoint();
this._ownerNode.setParent(null);

if (pointerCount === 1) {
this._targetPosition.copyFrom(this._ownerNode.position);
this._targetOrientation.copyFrom(this._ownerNode.rotationQuaternion);
this._targetScaling.copyFrom(this._ownerNode.scaling);
this._targetPosition.copyFrom(this._ownerNode.absolutePosition);
this._targetOrientation.copyFrom(this._ownerNode.absoluteRotationQuaternion);
this._targetScaling.copyFrom(this._ownerNode.absoluteScaling);

if (this.faceCameraOnDragStart && this._scene.activeCamera) {
const toCamera = TmpVectors.Vector3[0];
Expand All @@ -225,14 +221,12 @@ export class SixDofDragBehavior extends BaseSixDofDragBehavior {
this._startingScaling.copyFrom(this._targetScaling);
} else if (pointerCount === 2) {
this._virtualTransformNode.setPivotPoint(new Vector3(0, 0, 0), Space.LOCAL);
this._virtualTransformNode.position.copyFrom(this._ownerNode.position);
this._virtualTransformNode.scaling.copyFrom(this._ownerNode.scaling);
this._virtualTransformNode.rotationQuaternion!.copyFrom(this._ownerNode.rotationQuaternion);
this._virtualTransformNode.position.copyFrom(this._ownerNode.absolutePosition);
this._virtualTransformNode.scaling.copyFrom(this._ownerNode.absoluteScaling);
this._virtualTransformNode.rotationQuaternion!.copyFrom(this._ownerNode.absoluteRotationQuaternion);
this._virtualTransformNode.setPivotPoint(worldPivot, Space.WORLD);
this._resetVirtualMeshesPosition();
}

this._ownerNode.setParent(oldParent);
}

protected _targetDrag(worldDeltaPosition: Vector3, worldDeltaRotation: Quaternion) {
Expand Down