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

Merge pull request #14341 from sethalves/fix-mouse-equip

Browse source 
only equip an entity to a hand-controller joint if the hand-controllers are in use, else use avatar hand
This commit is contained in:
Jeff Clinton 2018-11-09 12:54:36 -08:00 committed by GitHub
commit ee9154a801
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/system/controllers/controllerModules/equipEntity.js
View file

@ -485,7 +485,7 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
} }
var handJointIndex; var handJointIndex;
if (grabData.grabFollowsController) { if (HMD.mounted && HMD.isHandControllerAvailable() && grabData.grabFollowsController) {
handJointIndex = this.controllerJointIndex; handJointIndex = this.controllerJointIndex;
} else { } else {
handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"); handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand");