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

Merge pull request #6149 from ZappoMan/exposeMyAvatarHandsToJS

Browse source 
make handControllerGrab.js work with new API
This commit is contained in:
Brad Davis 2015-10-22 11:40:48 -07:00
commit 7ed9ed8500
2 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
examples/controllers/handControllerGrab.js
View file

@ -245,7 +245,7 @@ function MyController(hand, triggerAction) {
}; };
this.updateSmoothedTrigger = function() { this.updateSmoothedTrigger = function() {
var triggerValue = Controller.getActionValue(this.triggerAction); var triggerValue = Controller.getValue(this.triggerAction);
// smooth out trigger value // smooth out trigger value
this.triggerValue = (this.triggerValue * TRIGGER_SMOOTH_RATIO) + this.triggerValue = (this.triggerValue * TRIGGER_SMOOTH_RATIO) +
(triggerValue * (1.0 - TRIGGER_SMOOTH_RATIO)); (triggerValue * (1.0 - TRIGGER_SMOOTH_RATIO));
@ -260,7 +260,7 @@ function MyController(hand, triggerAction) {
}; };
this.triggerSqueezed = function() { this.triggerSqueezed = function() {
var triggerValue = Controller.getActionValue(this.triggerAction); var triggerValue = Controller.getValue(this.triggerAction);
return triggerValue > TRIGGER_ON_VALUE; return triggerValue > TRIGGER_ON_VALUE;
}; };
@ -402,8 +402,9 @@ function MyController(hand, triggerAction) {
this.distanceHolding = function() { this.distanceHolding = function() {
var handControllerPosition = Controller.getSpatialControlPosition(this.palm); var handControllerPosition = (this.hand === RIGHT_HAND) ? MyAvatar.rightHandPosition : MyAvatar.leftHandPosition;
var handRotation = Quat.multiply(MyAvatar.orientation, Controller.getSpatialControlRawRotation(this.palm)); var controllerHandInput = (this.hand === RIGHT_HAND) ? Controller.Standard.RightHand : Controller.Standard.LeftHand;
var handRotation = Quat.multiply(MyAvatar.orientation, Controller.getPoseValue(controllerHandInput).rotation);
var grabbedProperties = Entities.getEntityProperties(this.grabbedEntity, ["position", "rotation", var grabbedProperties = Entities.getEntityProperties(this.grabbedEntity, ["position", "rotation",
"gravity", "ignoreForCollisions"]); "gravity", "ignoreForCollisions"]);
var now = Date.now(); var now = Date.now();
@ -452,8 +453,9 @@ function MyController(hand, triggerAction) {
} }
var handPosition = this.getHandPosition(); var handPosition = this.getHandPosition();
var handControllerPosition = Controller.getSpatialControlPosition(this.palm); var handControllerPosition = (this.hand === RIGHT_HAND) ? MyAvatar.rightHandPosition : MyAvatar.leftHandPosition;
var handRotation = Quat.multiply(MyAvatar.orientation, Controller.getSpatialControlRawRotation(this.palm)); var controllerHandInput = (this.hand === RIGHT_HAND) ? Controller.Standard.RightHand : Controller.Standard.LeftHand;
var handRotation = Quat.multiply(MyAvatar.orientation, Controller.getPoseValue(controllerHandInput).rotation);
var grabbedProperties = Entities.getEntityProperties(this.grabbedEntity, ["position", "rotation"]); var grabbedProperties = Entities.getEntityProperties(this.grabbedEntity, ["position", "rotation"]);
this.lineOn(handPosition, Vec3.subtract(grabbedProperties.position, handPosition), INTERSECT_COLOR); this.lineOn(handPosition, Vec3.subtract(grabbedProperties.position, handPosition), INTERSECT_COLOR);
@ -595,7 +597,7 @@ function MyController(hand, triggerAction) {
} }
this.currentHandControllerTipPosition = Controller.getSpatialControlPosition(this.tip); this.currentHandControllerTipPosition = (this.hand === RIGHT_HAND) ? MyAvatar.rightHandTipPosition : MyAvatar.leftHandTipPosition;;
this.currentObjectTime = Date.now(); this.currentObjectTime = Date.now();
}; };
@ -613,7 +615,7 @@ function MyController(hand, triggerAction) {
// of it's actual offset, let's try imparting a velocity which is at a fixed radius // of it's actual offset, let's try imparting a velocity which is at a fixed radius
// from the palm. // from the palm.
var handControllerPosition = Controller.getSpatialControlPosition(this.tip); var handControllerPosition = (this.hand === RIGHT_HAND) ? MyAvatar.rightHandPosition : MyAvatar.leftHandPosition;
var now = Date.now(); var now = Date.now();
var deltaPosition = Vec3.subtract(handControllerPosition, this.currentHandControllerTipPosition); // meters var deltaPosition = Vec3.subtract(handControllerPosition, this.currentHandControllerTipPosition); // meters
@ -856,8 +858,8 @@ function MyController(hand, triggerAction) {
}; };
} }
var rightController = new MyController(RIGHT_HAND, Controller.findAction("RIGHT_HAND_CLICK")); var rightController = new MyController(RIGHT_HAND, Controller.Standard.RT);
var leftController = new MyController(LEFT_HAND, Controller.findAction("LEFT_HAND_CLICK")); var leftController = new MyController(LEFT_HAND, Controller.Standard.LT);
function update() { function update() {
rightController.update(); rightController.update();

17
interface/resources/controllers/standard.json
View file

@ -12,19 +12,10 @@
{ "from": [ "Standard.A", "Standard.B", "Standard.X", "Standard.Y" ], "to": "Standard.RightPrimaryThumb" }, { "from": [ "Standard.A", "Standard.B", "Standard.X", "Standard.Y" ], "to": "Standard.RightPrimaryThumb" },
{ "from": "Standard.Start", "to": "Standard.RightSecondaryThumb" }, { "from": "Standard.Start", "to": "Standard.RightSecondaryThumb" },
{ { "from": "Standard.LT", "to": "Actions.LeftHandClick" },
"from": "Standard.RT", { "from": "Standard.RT", "to": "Actions.RightHandClick" },
"to": "Actions.BOOM_IN",
"filters": [ { "type": "scale", "scale": 0.1 } ]
},
{ { "from": "Standard.LeftHand", "to": "Actions.LeftHand" },
"from": "Standard.LT", { "from": "Standard.RightHand", "to": "Actions.RightHand" }
"to": "Actions.BOOM_OUT",
"filters": [ { "type": "scale", "scale": 0.1 } ]
},
{ "from": "Standard.LeftHand", "to": "Actions.LEFT_HAND" },
{ "from": "Standard.RightHand", "to": "Actions.RIGHT_HAND" }
] ]
} }