-
Notifications
You must be signed in to change notification settings - Fork 62
Resync gizmo body on parent object move [SYNTH-334]
#1484
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.
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
Merged
+82
−16
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -68,22 +68,47 @@ class GizmoSceneObject extends SceneObject { | |
|
|
||
| postGizmoCreation?.(this) | ||
|
|
||
| if (this._parentObject) { | ||
| this._relativeTransformations = new Map<RigidNodeId, THREE.Matrix4>() | ||
| const gizmoTransformInv = this._obj.matrix.clone().invert() | ||
|
|
||
| /** Due to the limited math functionality exposed to JS for Jolt, we need everything in ThreeJS. */ | ||
| this._parentObject.mirabufInstance.parser.rigidNodes.forEach(rn => { | ||
| const jBodyId = this._parentObject!.mechanism.getBodyByNodeId(rn.id) | ||
| if (!jBodyId) return | ||
|
|
||
| const worldTransform = convertJoltMat44ToThreeMatrix4( | ||
| World.physicsSystem.getBody(jBodyId)!.GetWorldTransform() | ||
| ) | ||
| const relativeTransform = worldTransform.premultiply(gizmoTransformInv) | ||
| this._relativeTransformations!.set(rn.id, relativeTransform) | ||
| }) | ||
| } | ||
| if (this._parentObject) this.bakeRelativeTransformations() | ||
| } | ||
|
|
||
| /** | ||
| * Records where every body of the parent sits relative to the gizmo, which is what dragging then | ||
| * moves them by. | ||
| * | ||
| * Re-baked rather than updated in place: the offsets only stay valid for as long as the parent moves | ||
| * rigidly, so anything that repositions bodies on their own (a snap, a reconcile, a joint moving) | ||
| * has to be captured fresh. | ||
| */ | ||
| private bakeRelativeTransformations() { | ||
| if (!this._parentObject) return | ||
|
|
||
| this._relativeTransformations = new Map<RigidNodeId, THREE.Matrix4>() | ||
| const gizmoTransformInv = this._obj.matrix.clone().invert() | ||
|
|
||
| this._parentObject.mirabufInstance.parser.rigidNodes.forEach(rn => { | ||
| const jBodyId = this._parentObject!.mechanism.getBodyByNodeId(rn.id) | ||
| if (!jBodyId) return | ||
|
|
||
| const worldTransform = convertJoltMat44ToThreeMatrix4( | ||
| World.physicsSystem.getBody(jBodyId)!.GetWorldTransform() | ||
| ) | ||
| const relativeTransform = worldTransform.premultiply(gizmoTransformInv) | ||
| this._relativeTransformations!.set(rn.id, relativeTransform) | ||
| }) | ||
| } | ||
|
|
||
| /** | ||
| * Re-seats the gizmo on its parent after something other than this gizmo moved the parent. | ||
| */ | ||
| public syncToParent() { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Might want to mark this as unused so people know not to remove it. |
||
| if (!this._parentObject || this.isDragging) return | ||
|
|
||
| this._parentObject.postGizmoCreation(this) | ||
| // postGizmoCreation seats the gizmo via setTransform, which asks to drive the parent. Nothing | ||
| // needs driving here, the parent is already where it wants to be. | ||
| this._forceUpdate = false | ||
|
|
||
| this.bakeRelativeTransformations() | ||
| } | ||
|
|
||
| public setup(): void { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.