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

Merge pull request #9729 from sethalves/tablet-ui-no-haptics-for-tablet

Browse source 
don't do a haptic pulse when av's hand goes near grabbable tablet
This commit is contained in:
Anthony Thibault 2017-02-22 15:55:01 -08:00 committed by GitHub
commit 44136e550c
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1233,7 +1233,13 @@ function MyController(hand) {
});
if (grabbableEntities.length > 0) {
if (!this.grabPointIntersectsEntity) {
Controller.triggerHapticPulse(1, 20, this.hand);
// don't do haptic pulse for tablet
var nonTabletEntities = grabbableEntities.filter(function(entityID) {
return entityID != HMD.tabletID && entityID != HMD.homeButtonID;
});
if (nonTabletEntities.length > 0) {
Controller.triggerHapticPulse(1, 20, this.hand);
}
this.grabPointIntersectsEntity = true;
this.grabPointSphereOn();
}