Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 03:59:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

double change in hand rotation before applying it to the object

Browse source
This commit is contained in:
Seth Alves 2015-09-15 11:21:13 -07:00
parent 99b0046fc7
commit 7b5d6c20e9
1 changed files with 24 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
examples/controllers/handControllerGrab.js
View file

@ -111,7 +111,6 @@ function controller(side, triggerAction, pullAction, hand) {
controller.prototype.updateLine = function() { controller.prototype.updateLine = function() {
var handPosition = this.getHandPosition(); var handPosition = this.getHandPosition();
var direction = Quat.getUp(this.getHandRotation()); var direction = Quat.getUp(this.getHandRotation());
Quat.print("blah", this.getHandRotation());
//only check if we havent already grabbed an object //only check if we havent already grabbed an object
if (this.distanceHolding) { if (this.distanceHolding) {
@ -179,24 +178,6 @@ controller.prototype.checkForIntersections = function(origin, direction) {
} }
controller.prototype.getSuperSpinHandRotation = function(handRotation) {
// origHand * handChange = nowHand
// -1
// handChange = origHand * nowHand
var handChange = Quat.multiply(Quat.inverse(this.handOriginalRotation), handRotation);
return Quat.multiply(this.grabbedOriginalRotation, handChange);
// var superHandChange = Quat.multiply(Quat.inverse(this.handOriginalRotation),
// // Quat.slerp(this.handOriginalRotation, handRotation, 1.5)
// handRotation
// );
// return Quat.multiply(this.grabbedOriginalRotation, superHandChange);
}
controller.prototype.attemptMove = function() { controller.prototype.attemptMove = function() {
if (this.grabbedEntity || this.distanceHolding) { if (this.grabbedEntity || this.distanceHolding) {
var handPosition = Controller.getSpatialControlPosition(this.palm); var handPosition = Controller.getSpatialControlPosition(this.palm);
@ -205,27 +186,42 @@ controller.prototype.attemptMove = function() {
this.distanceHolding = true; this.distanceHolding = true;
if (this.actionID === null) { if (this.actionID === null) {
this.currentObjectPosition = Entities.getEntityProperties(this.grabbedEntity).position; this.currentObjectPosition = Entities.getEntityProperties(this.grabbedEntity).position;
this.currentObjectRotation = Entities.getEntityProperties(this.grabbedEntity).rotation;
this.handPreviousPosition = handPosition; this.handPreviousPosition = handPosition;
this.grabbedOriginalRotation = Entities.getEntityProperties(this.grabbedEntity).rotation; this.handPreviousRotation = handRotation;
this.handOriginalRotation = handRotation;
this.actionID = Entities.addAction("spring", this.grabbedEntity, { this.actionID = Entities.addAction("spring", this.grabbedEntity, {
targetPosition: this.currentObjectPosition, targetPosition: this.currentObjectPosition,
linearTimeScale: .1, linearTimeScale: .1,
targetRotation: this.getSuperSpinHandRotation(handRotation), targetRotation: this.currentObjectRotation,
angularTimeScale: .1 angularTimeScale: .1
}); });
} else { } else {
var radius = Math.max(Vec3.distance(this.currentObjectPosition, handPosition) * RADIUS_FACTOR, 1.0);
var handMoved = Vec3.subtract(handPosition, this.handPreviousPosition); var handMoved = Vec3.subtract(handPosition, this.handPreviousPosition);
this.handPreviousPosition = handPosition; this.handPreviousPosition = handPosition;
var radius = Math.max(Vec3.distance(this.currentObjectPosition, handPosition) * RADIUS_FACTOR, 1.0);
var superHandMoved = Vec3.multiply(handMoved, radius); var superHandMoved = Vec3.multiply(handMoved, radius);
this.currentObjectPosition = Vec3.sum(this.currentObjectPosition, superHandMoved); this.currentObjectPosition = Vec3.sum(this.currentObjectPosition, superHandMoved);
// ---------------- this tracks hand rotation
// var handChange = Quat.multiply(handRotation, Quat.inverse(this.handPreviousRotation));
// this.handPreviousRotation = handRotation;
// this.currentObjectRotation = Quat.multiply(handChange, this.currentObjectRotation);
// ----------------
// ---------------- this doubles hand rotation
var handChange = Quat.multiply(Quat.slerp(this.handPreviousRotation, handRotation, 2.0),
Quat.inverse(this.handPreviousRotation));
this.handPreviousRotation = handRotation;
this.currentObjectRotation = Quat.multiply(handChange, this.currentObjectRotation);
// ----------------
Entities.updateAction(this.grabbedEntity, this.actionID, { Entities.updateAction(this.grabbedEntity, this.actionID, {
targetPosition: this.currentObjectPosition, targetPosition: this.currentObjectPosition, linearTimeScale: .1,
linearTimeScale: .1, targetRotation: this.currentObjectRotation, angularTimeScale: .1
// targetRotation: this.getSuperSpinHandRotation(handRotation),
targetRotation: handRotation,
angularTimeScale: .1
}); });
} }
} }