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

Merge branch 'ptt' into pushToTalk

Browse source
This commit is contained in:
Wayne Chen 2019-03-07 12:38:59 -08:00 committed by GitHub
commit b94b6d06a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/system/controllers/controllerModules/pushToTalk.js
View file

@ -25,12 +25,13 @@ Script.include("/~/system/libraries/controllers.js");
this.shouldTalk = function (controllerData) { this.shouldTalk = function (controllerData) {
// Set up test against controllerData here... // Set up test against controllerData here...
var gripVal = controllerData.secondaryValues[this.hand]; var gripVal = controllerData.secondaryValues[LEFT_HAND] && controllerData.secondaryValues[RIGHT_HAND];
return (gripVal) ? true : false; return (gripVal) ? true : false;
}; };
this.shouldStopTalking = function (controllerData) { this.shouldStopTalking = function (controllerData) {
var gripVal = controllerData.secondaryValues[this.hand]; var gripVal = controllerData.secondaryValues[this.hand];
var gripVal = controllerData.secondaryValues[LEFT_HAND] && controllerData.secondaryValues[RIGHT_HAND];
return (gripVal) ? false : true; return (gripVal) ? false : true;
}; };