Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 15:29:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modify teleport to 'superpower' spec.

Browse source
This commit is contained in:
r3tk0n 2019-01-24 14:22:01 -08:00
parent 690f67c9d9
commit 80abfbab5e
1 changed files with 51 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
scripts/system/controllers/controllerModules/teleport.js
View file

@ -129,6 +129,8 @@ Script.include("/~/system/libraries/controllers.js");
this.init = false; this.init = false;
this.hand = hand; this.hand = hand;
this.buttonValue = 0; this.buttonValue = 0;
this.standardAxisLY = 0.0;
this.standardAxisRY = 0.0;
this.disabled = false; // used by the 'Hifi-Teleport-Disabler' message handler this.disabled = false; // used by the 'Hifi-Teleport-Disabler' message handler
this.active = false; this.active = false;
this.state = TELEPORTER_STATES.IDLE; this.state = TELEPORTER_STATES.IDLE;
@ -690,6 +692,43 @@ Script.include("/~/system/libraries/controllers.js");
} }
}; };
this.getStandardLY = function (value) {
_this.standardAxisLY = value;
};
this.getStandardRY = function (value) {
_this.standardAxisRY = value;
};
// Return value for the getDominantY and getOffhandY functions has to be inverted.
this.getDominantY = function () {
return (MyAvatar.getDominantHand() === "left") ? -(_this.standardAxisLY) : -(_this.standardAxisRY);
};
this.getOffhandY = function () {
return (MyAvatar.getDominantHand() === "left") ? -(_this.standardAxisRY) : -(_this.standardAxisLY);
};
this.getDominantHand = function () {
return (MyAvatar.getDominantHand() === "left") ? LEFT_HAND : RIGHT_HAND;
}
this.getOffHand = function () {
return (MyAvatar.getDominantHand() === "left") ? RIGHT_HAND : LEFT_HAND;
}
this.showReticle = function () {
return (_this.getOffhandY() > TELEPORT_DEADZONE) ? true : false;
};
this.shouldTeleport = function () {
return (_this.getDominantY() > TELEPORT_DEADZONE && _this.getOffhandY() > TELEPORT_DEADZONE) ? true : false;
};
this.shouldCancel = function () {
return (_this.getDominantY() < -TELEPORT_DEADZONE || _this.getOffhandY() < -TELEPORT_DEADZONE) ? true : false;
};
this.parameters = makeDispatcherModuleParameters( this.parameters = makeDispatcherModuleParameters(
80, 80,
this.hand === RIGHT_HAND ? ["rightHand"] : ["leftHand"], this.hand === RIGHT_HAND ? ["rightHand"] : ["leftHand"],
@ -706,7 +745,7 @@ Script.include("/~/system/libraries/controllers.js");
} }
var otherModule = this.getOtherModule(); var otherModule = this.getOtherModule();
if (!this.disabled && this.buttonValue !== 0 && !otherModule.active) { if (!this.disabled && this.showReticle() && !otherModule.active && this.hand === this.getOffHand()) {
this.active = true; this.active = true;
this.enterTeleport(); this.enterTeleport();
return makeRunningValues(true, [], []); return makeRunningValues(true, [], []);
@ -715,6 +754,12 @@ Script.include("/~/system/libraries/controllers.js");
}; };
this.run = function(controllerData, deltaTime) { this.run = function(controllerData, deltaTime) {
// Kill condition:
if (this.shouldCancel()) {
this.disableLasers();
this.active = false;
return makeRunningValues(false, [], []);
}
// Get current hand pose information to see if the pose is valid // Get current hand pose information to see if the pose is valid
var pose = Controller.getPoseValue(handInfo[(_this.hand === RIGHT_HAND) ? 'right' : 'left'].controllerInput); var pose = Controller.getPoseValue(handInfo[(_this.hand === RIGHT_HAND) ? 'right' : 'left'].controllerInput);
@ -778,7 +823,7 @@ Script.include("/~/system/libraries/controllers.js");
this.teleport = function(newResult, target) { this.teleport = function(newResult, target) {
var result = newResult; var result = newResult;
this.teleportedPosition = newResult.intersection; this.teleportedPosition = newResult.intersection;
if (_this.buttonValue !== 0) { if (!_this.shouldTeleport()) {
return makeRunningValues(true, [], []); return makeRunningValues(true, [], []);
} }
@ -982,6 +1027,10 @@ Script.include("/~/system/libraries/controllers.js");
// Teleport actions. // Teleport actions.
teleportMapping.from(Controller.Standard.LeftPrimaryThumb).peek().to(leftTeleporter.buttonPress); teleportMapping.from(Controller.Standard.LeftPrimaryThumb).peek().to(leftTeleporter.buttonPress);
teleportMapping.from(Controller.Standard.RightPrimaryThumb).peek().to(rightTeleporter.buttonPress); teleportMapping.from(Controller.Standard.RightPrimaryThumb).peek().to(rightTeleporter.buttonPress);
teleportMapping.from(Controller.Standard.LY).peek().to(leftTeleporter.getStandardLY);
teleportMapping.from(Controller.Standard.RY).peek().to(leftTeleporter.getStandardRY);
teleportMapping.from(Controller.Standard.LY).peek().to(rightTeleporter.getStandardLY);
teleportMapping.from(Controller.Standard.RY).peek().to(rightTeleporter.getStandardRY);
} }
var leftTeleporter = new Teleporter(LEFT_HAND); var leftTeleporter = new Teleporter(LEFT_HAND);