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

oops

Browse source
This commit is contained in:
Seth Alves 2015-10-20 18:29:27 -07:00
parent 311254c395
commit f85ef9267b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/controllers/handControllerGrab.js
View file

@ -393,7 +393,7 @@ function MyController(hand, triggerAction) {
return; return;
} else if (props.locked === 0 && props.collisionsWillMove === 1) { } else if (props.locked === 0 && props.collisionsWillMove === 1) {
this.setState(STATE_NEAR_GRABBING); this.setState(STATE_NEAR_GRABBING);
} else if (props.collisionsWillMove === 0 & grabbableData.wantsTrigger) { } else if (props.collisionsWillMove === 0 && grabbableData.wantsTrigger) {
// We have grabbed a non-physical object, so we want to trigger a non-colliding event as opposed to a grab event // We have grabbed a non-physical object, so we want to trigger a non-colliding event as opposed to a grab event
this.setState(STATE_NEAR_GRABBING_NON_COLLIDING); this.setState(STATE_NEAR_GRABBING_NON_COLLIDING);
} }