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

fixed third eye laser

Browse source
This commit is contained in:
Dante Ruiz 2017-03-21 19:45:00 +01:00
parent 8988110c3b
commit 1811a2edc7
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/system/controllers/handControllerGrab.js
View file

@ -1018,6 +1018,16 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp) {
} }
}; };
function getControllerJointIndex(hand) {
if (HMD.isHandControllerAvailable()) {
return MyAvatar.getJointIndex(hand === RIGHT_HAND ?
"_CONTROLLER_RIGHTHAND" :
"_CONTROLLER_LEFTHAND");
}
return MyAvatar.getJointIndex("Head");
}
// global EquipHotspotBuddy instance // global EquipHotspotBuddy instance
var equipHotspotBuddy = new EquipHotspotBuddy(); var equipHotspotBuddy = new EquipHotspotBuddy();
@ -1029,9 +1039,7 @@ function MyController(hand) {
this.homeButtonTouched = false; this.homeButtonTouched = false;
this.editTriggered = false; this.editTriggered = false;
this.controllerJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? this.controllerJointIndex = getControllerJointIndex(this.hand);
"_CONTROLLER_RIGHTHAND" :
"_CONTROLLER_LEFTHAND");
// Until there is some reliable way to keep track of a "stack" of parentIDs, we'll have problems // Until there is some reliable way to keep track of a "stack" of parentIDs, we'll have problems
// when more than one avatar does parenting grabs on things. This script tries to work // when more than one avatar does parenting grabs on things. This script tries to work