Skip to content

Tilde grab bugfixes #3712

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

Closed
patriboz wants to merge 3 commits into from
Closed

Tilde grab bugfixes #3712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
723c412
fix out of sync issue and collisions
patriboz Sep 15, 2022
4c3b9d3
fix pivot point
patriboz Sep 15, 2022
fb04ef0
optimizations
patriboz Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 32 additions & 24 deletions character-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,31 +1136,39 @@ class LocalPlayer extends UninterpolatedPlayer {
});
}
grab(app, hand = 'left') {
const {position, quaternion} = _getSession() ?
localPlayer[hand === 'left' ? 'leftHand' : 'rightHand']
:
camera;

app.updateMatrixWorld();
app.savedRotation = app.rotation.clone();
app.startQuaternion = quaternion.clone();

const grabAction = {
type: 'grab',
hand,
instanceId: app.instanceId,
matrix: localMatrix.copy(app.matrixWorld)
.premultiply(localMatrix2.compose(position, quaternion, localVector.set(1, 1, 1)).invert())
.toArray()
};
this.addAction(grabAction);

physicsScene.disableAppPhysics(app)
if(this instanceof LocalPlayer) {
Copy link
Contributor

@jakezira jakezira Sep 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Can player call grab when it's not local player?
  • Even though if it's the case, you can check this with different code. Please reference how it did on existing code.

let position = null, quaternion = null;

app.dispatchEvent({
type: 'grabupdate',
grab: true,
});
if(_getSession()) {
const h = this[hand === 'left' ? 'leftHand' : 'rightHand'];
position = h.position;
quaternion = h.quaternion;
} else {
position = this.position;
quaternion = camera.quaternion;
}

app.updateMatrixWorld();
app.savedRotation = app.rotation.clone();
app.startQuaternion = quaternion.clone();

const grabAction = {
type: 'grab',
hand,
instanceId: app.instanceId,
matrix: localMatrix.copy(app.matrixWorld)
.premultiply(localMatrix2.compose(position, quaternion, localVector.set(1, 1, 1)).invert())
.toArray()
};
this.addAction(grabAction);

physicsScene.disableAppPhysics(app)

app.dispatchEvent({
type: 'grabupdate',
grab: true,
});
}
}
ungrab() {
const actions = Array.from(this.getActionsState());
Expand Down
Loading