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

velocity is now set when a parenting grab ends, though not angular velocity

Browse source
This commit is contained in:
Seth Alves 2016-04-01 14:50:42 -07:00
parent 7c8050790b
commit eb22b5e4a7
1 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
examples/controllers/handControllerGrab.js
View file

@ -1496,6 +1496,10 @@ function MyController(hand) {
this.currentHandControllerTipPosition = this.currentHandControllerTipPosition =
(this.hand === RIGHT_HAND) ? MyAvatar.rightHandTipPosition : MyAvatar.leftHandTipPosition; (this.hand === RIGHT_HAND) ? MyAvatar.rightHandTipPosition : MyAvatar.leftHandTipPosition;
this.currentObjectTime = Date.now(); this.currentObjectTime = Date.now();
this.currentObjectPosition = grabbedProperties.position;
this.currentObjectRotation = grabbedProperties.rotation;
this.currentVelocity = ZERO_VEC;
}; };
this.continueNearGrabbing = function() { this.continueNearGrabbing = function() {
@ -1563,7 +1567,9 @@ function MyController(hand) {
var deltaTime = (now - this.currentObjectTime) / MSEC_PER_SEC; // convert to seconds var deltaTime = (now - this.currentObjectTime) / MSEC_PER_SEC; // convert to seconds
if (deltaTime > 0.0) { if (deltaTime > 0.0) {
this.currentVelocity = Vec3.multiply(deltaPosition, 1.0 / deltaTime); var worldDeltaPosition = Vec3.subtract(props.position, this.currentObjectPosition);
this.currentVelocity = Vec3.multiply(worldDeltaPosition, 1.0 / deltaTime);
this.currentObjectPosition = props.position;
} }
this.currentHandControllerTipPosition = handControllerPosition; this.currentHandControllerTipPosition = handControllerPosition;
@ -1894,30 +1900,47 @@ function MyController(hand) {
var parentID = props.parentID; var parentID = props.parentID;
var forceVelocity = false; var forceVelocity = false;
deactiveProps["velocity"] = props.velocity; var doSetVelocity = false;
if (parentID != NULL_UUID) { var setVelocityTo = ZERO_VEC;
if (parentID != NULL_UUID && deactiveProps.parentID == NULL_UUID) {
// TODO: EntityScriptingInterface::convertLocationToScriptSemantics should be setting up // TODO: EntityScriptingInterface::convertLocationToScriptSemantics should be setting up
// props.velocity to be a world-frame velocity and localVelocity to be vs parent. Until that // props.velocity to be a world-frame velocity and localVelocity to be vs parent. Until that
// is done, we use a measured velocity here so that things held via a bumper-grab / parenting-grab // is done, we use a measured velocity here so that things held via a bumper-grab / parenting-grab
// can be thrown. // can be thrown.
deactiveProps["velocity"] = this.currentVelocity; print("SETTING doSetVelocity");
doSetVelocity = true;
setVelocityTo = this.currentVelocity;;
} }
if (!noVelocity && if (!noVelocity &&
vec3equal(deactiveProps.velocity, ZERO_VEC) && !doSetVelocity &&
parentID == MyAvatar.sessionUUID && parentID == MyAvatar.sessionUUID &&
Vec3.length(data["gravity"]) > 0.0 && Vec3.length(data["gravity"]) > 0.0 &&
data["dynamic"] && data["dynamic"] &&
data["parentID"] == NULL_UUID && data["parentID"] == NULL_UUID &&
!data["collisionless"]) { !data["collisionless"]) {
deactiveProps["velocity"] = {x: 0.0, y: 0.1, z: 0.0}; deactiveProps["velocity"] = {x: 0.0, y: 0.1, z: 0.0};
doSetVelocity = false;
} }
if (noVelocity) { if (noVelocity) {
deactiveProps["velocity"] = {x: 0.0, y: 0.0, z: 0.0}; deactiveProps["velocity"] = {x: 0.0, y: 0.0, z: 0.0};
deactiveProps["angularVelocity"] = {x: 0.0, y: 0.0, z: 0.0}; deactiveProps["angularVelocity"] = {x: 0.0, y: 0.0, z: 0.0};
doSetVelocity = false;
} }
Entities.editEntity(entityID, deactiveProps); Entities.editEntity(entityID, deactiveProps);
print("doSetVelocity = " + doSetVelocity);
if (doSetVelocity) {
// this is a continuation of the TODO above -- we shouldn't need to set this here.
// do this after the parent has been reset. setting this at the same time as
// the parent causes it to go off in the wrong direction. This is a bug that should
// be fixed.
print("SETTING VEL TO" + vec3toStr(setVelocityTo));
Entities.editEntity(entityID, { "velocity": setVelocityTo });
}
data = null; data = null;
} else if (this.doubleParentGrab) { } else if (this.doubleParentGrab) {
// we parent-grabbed this from another parent grab. try to put it back where we found it. // we parent-grabbed this from another parent grab. try to put it back where we found it.