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

Merge pull request #5319 from howard-stearns/sword-update-2

Browse source 
Update sword script for current controller/physics behavior.
This commit is contained in:
Seth Alves 2015-07-14 10:59:41 -07:00
commit 3394c50499
1 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
examples/example/games/sword.js
View file

@ -175,10 +175,12 @@ function positionStick(stickOrientation) {
inHand = false; inHand = false;
Entities.updateAction(stickID, actionID, { Entities.updateAction(stickID, actionID, {
relativePosition: offset, relativePosition: offset,
relativeRotation: stickOrientation relativeRotation: stickOrientation,
hand: "right"
}); });
} }
function resetToHand() { // Maybe coordinate with positionStick? function resetToHand() { // For use with controllers, puts the sword in contact with the hand.
// Maybe coordinate with positionStick?
if (inHand) { // Optimization: bail if we're already inHand. if (inHand) { // Optimization: bail if we're already inHand.
return; return;
} }
@ -191,14 +193,14 @@ function resetToHand() { // Maybe coordinate with positionStick?
}); });
inHand = true; inHand = true;
} }
function isControllerActive() {
// I don't think the hydra API provides any reliable way to know whether a particular controller is active. Ask for both.
controllerActive = (Vec3.length(Controller.getSpatialControlPosition(3)) > 0) || Vec3.length(Controller.getSpatialControlPosition(4)) > 0;
return controllerActive;
}
function mouseMoveEvent(event) { function mouseMoveEvent(event) {
if (event.deviceID) { // Not a MOUSE mouse event, but a (e.g., hydra) mouse event, with x/y that is not meaningful for us. // When a controller like the hydra gives a mouse event, the x/y is not meaningful to us, but we can detect with a truty deviceID
resetToHand(); // Can only happen when controller is uncradled, so let's drive with that, resetting our attachement. if (event.deviceID || !isFighting() || isControllerActive()) {
return;
}
controllerActive = (Vec3.length(Controller.getSpatialControlPosition(controllerID)) > 0);
//print("Mouse move with hand controller " + (controllerActive ? "active" : "inactive") + JSON.stringify(event));
if (controllerActive || !isFighting()) {
print('Attempting attachment reset'); print('Attempting attachment reset');
resetToHand(); resetToHand();
return; return;
@ -244,12 +246,20 @@ function cleanUp(leaveButtons) {
} }
function makeSword() { function makeSword() {
initControls(); initControls();
var swordPosition;
if (!isControllerActive()) { // Dont' knock yourself with sword
swordPosition = Vec3.sum(MyAvatar.position, Vec3.multiply(2, Quat.getFront(MyAvatar.orientation)));
} else if (hand === 'right') {
swordPosition = MyAvatar.getRightPalmPosition();
} else {
swordPosition = MyAvatar.getLeftPalmPosition();
}
stickID = Entities.addEntity({ stickID = Entities.addEntity({
type: "Model", type: "Model",
modelURL: swordModel, modelURL: swordModel,
compoundShapeURL: swordCollisionShape, compoundShapeURL: swordCollisionShape,
dimensions: dimensions, dimensions: dimensions,
position: (hand === 'right') ? MyAvatar.getRightPalmPosition() : MyAvatar.getLeftPalmPosition(), // initial position doesn't matter, as long as it's close position: swordPosition,
rotation: MyAvatar.orientation, rotation: MyAvatar.orientation,
damping: 0.1, damping: 0.1,
collisionSoundURL: swordCollisionSoundURL, collisionSoundURL: swordCollisionSoundURL,