Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

if something dynamic is release and it's not moving, give it a little velocity so that it doesn't end up non-active in bullet

Browse source
This commit is contained in:
Seth Alves 2017-01-12 13:45:03 -08:00
parent 0746d38cae
commit 611a926894
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
scripts/system/controllers/handControllerGrab.js
View file

@ -806,7 +806,8 @@ function MyController(hand) {
this.updateSmoothedTrigger(); this.updateSmoothedTrigger();
// If both trigger and grip buttons squeezed and nothing is held, rescale my avatar! // If both trigger and grip buttons squeezed and nothing is held, rescale my avatar!
if (this.hand === RIGHT_HAND && this.state === STATE_SEARCHING && this.getOtherHandController().state === STATE_SEARCHING) { if (this.hand === RIGHT_HAND && this.state === STATE_SEARCHING &&
this.getOtherHandController().state === STATE_SEARCHING) {
this.maybeScaleMyAvatar(); this.maybeScaleMyAvatar();
} }
@ -2005,19 +2006,24 @@ function MyController(hand) {
this.previousRoomControllerPosition = roomControllerPosition; this.previousRoomControllerPosition = roomControllerPosition;
}; };
this.distanceHolding = function(deltaTime, timestamp) { this.ensureDynamic = function() {
// if we distance hold something and keep it very still before releasing it, it ends up
if (!this.triggerClicked) { // non-dynamic in bullet. If it's too still, give it a little bounce so it will fall.
this.callEntityMethodOnGrabbed("releaseGrab"); var props = Entities.getEntityProperties(this.grabbedEntity, ["velocity", "dynamic"]);
if (props.dynamic) {
// if we distance hold something and keep it very still before releasing it, it ends up var velocity = props.velocity;
// non-dynamic in bullet. If it's too still, give it a little bounce so it will fall.
var velocity = Entities.getEntityProperties(this.grabbedEntity, ["velocity"]).velocity;
if (Vec3.length(velocity) < 0.05) { // see EntityMotionState.cpp DYNAMIC_LINEAR_VELOCITY_THRESHOLD if (Vec3.length(velocity) < 0.05) { // see EntityMotionState.cpp DYNAMIC_LINEAR_VELOCITY_THRESHOLD
velocity = { x: 0.0, y: 0.2, z:0.0 }; velocity = { x: 0.0, y: 0.2, z:0.0 };
Entities.editEntity(this.grabbedEntity, { velocity: velocity }); Entities.editEntity(this.grabbedEntity, { velocity: velocity });
} }
}
}
this.distanceHolding = function(deltaTime, timestamp) {
if (!this.triggerClicked) {
this.callEntityMethodOnGrabbed("releaseGrab");
this.ensureDynamic();
this.release(); this.release();
this.setState(STATE_OFF, "trigger released"); this.setState(STATE_OFF, "trigger released");
return; return;
@ -2867,17 +2873,19 @@ function MyController(hand) {
this.callEntityMethodOnGrabbed("releaseEquip"); this.callEntityMethodOnGrabbed("releaseEquip");
} }
// Make a small release haptic pulse if we really were holding something // Make a small release haptic pulse if we really were holding something
Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand); Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand);
if (this.actionID !== null) { if (this.actionID !== null) {
Entities.deleteAction(this.grabbedEntity, this.actionID); Entities.deleteAction(this.grabbedEntity, this.actionID);
} else { } else {
// no action, so it's a parenting grab // no action, so it's a parenting grab
if (this.previousParentID === NULL_UUID) { if (this.previousParentID === NULL_UUID) {
var velocity = Entities.getEntityProperties(this.grabbedEntity, ["velocity"]).velocity;
Entities.editEntity(this.grabbedEntity, { Entities.editEntity(this.grabbedEntity, {
parentID: this.previousParentID, parentID: this.previousParentID,
parentJointIndex: this.previousParentJointIndex parentJointIndex: this.previousParentJointIndex
}); });
this.ensureDynamic();
} else { } else {
// we're putting this back as a child of some other parent, so zero its velocity // we're putting this back as a child of some other parent, so zero its velocity
Entities.editEntity(this.grabbedEntity, { Entities.editEntity(this.grabbedEntity, {