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

set angular velocity on parenting-grab release

Browse source
This commit is contained in:
Seth Alves 2016-04-01 15:11:01 -07:00
parent eb22b5e4a7
commit bfa2d8f405
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
examples/controllers/handControllerGrab.js
View file

@ -1500,6 +1500,7 @@ function MyController(hand) {
this.currentObjectPosition = grabbedProperties.position; this.currentObjectPosition = grabbedProperties.position;
this.currentObjectRotation = grabbedProperties.rotation; this.currentObjectRotation = grabbedProperties.rotation;
this.currentVelocity = ZERO_VEC; this.currentVelocity = ZERO_VEC;
this.currentAngularVelocity = ZERO_VEC;
}; };
this.continueNearGrabbing = function() { this.continueNearGrabbing = function() {
@ -1531,7 +1532,7 @@ function MyController(hand) {
this.heartBeat(this.grabbedEntity); this.heartBeat(this.grabbedEntity);
var props = Entities.getEntityProperties(this.grabbedEntity, ["localPosition", "parentID", "position"]); var props = Entities.getEntityProperties(this.grabbedEntity, ["localPosition", "parentID", "position", "rotation"]);
if (!props.position) { if (!props.position) {
// server may have reset, taking our equipped entity with it. move back to "off" stte // server may have reset, taking our equipped entity with it. move back to "off" stte
this.setState(STATE_RELEASE); this.setState(STATE_RELEASE);
@ -1568,8 +1569,16 @@ function MyController(hand) {
if (deltaTime > 0.0) { if (deltaTime > 0.0) {
var worldDeltaPosition = Vec3.subtract(props.position, this.currentObjectPosition); var worldDeltaPosition = Vec3.subtract(props.position, this.currentObjectPosition);
var previousEulers = Quat.safeEulerAngles(this.currentObjectRotation);
var newEulers = Quat.safeEulerAngles(props.rotation);
var worldDeltaRotation = Vec3.subtract(newEulers, previousEulers);
this.currentVelocity = Vec3.multiply(worldDeltaPosition, 1.0 / deltaTime); this.currentVelocity = Vec3.multiply(worldDeltaPosition, 1.0 / deltaTime);
this.currentAngularVelocity = Vec3.multiply(worldDeltaRotation, Math.PI / (deltaTime * 180.0));
this.currentObjectPosition = props.position; this.currentObjectPosition = props.position;
this.currentObjectRotation = props.rotation;
} }
this.currentHandControllerTipPosition = handControllerPosition; this.currentHandControllerTipPosition = handControllerPosition;
@ -1901,16 +1910,12 @@ function MyController(hand) {
var forceVelocity = false; var forceVelocity = false;
var doSetVelocity = false; var doSetVelocity = false;
var setVelocityTo = ZERO_VEC;
if (parentID != NULL_UUID && deactiveProps.parentID == NULL_UUID) { 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.
print("SETTING doSetVelocity");
doSetVelocity = true; doSetVelocity = true;
setVelocityTo = this.currentVelocity;;
} }
if (!noVelocity && if (!noVelocity &&
@ -1931,14 +1936,15 @@ function MyController(hand) {
Entities.editEntity(entityID, deactiveProps); Entities.editEntity(entityID, deactiveProps);
print("doSetVelocity = " + doSetVelocity);
if (doSetVelocity) { if (doSetVelocity) {
// this is a continuation of the TODO above -- we shouldn't need to set this here. // 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 // 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 // the parent causes it to go off in the wrong direction. This is a bug that should
// be fixed. // be fixed.
print("SETTING VEL TO" + vec3toStr(setVelocityTo)); Entities.editEntity(entityID, {
Entities.editEntity(entityID, { "velocity": setVelocityTo }); velocity: this.currentVelocity,
angularVelocity: this.currentAngularVelocity
});
} }
data = null; data = null;