History

Fix hover -> unhover overlay behavior

Zach Fox committed 9 years ago

Commit 0eafdea1 parent e3f2e702 files · +12 −6Browse files

Showing the changes to scripts/system/controllers/controllerModules (1 of 2 files). Show all

Unified · Split

scripts/system/controllers/controllerModules/overlayLaserInput.js+3−1
@@ -298,6 +298,9 @@ Script.include("/~/system/libraries/controllers.js"); · 297 unmodified lines
298 var intersection = controllerData.rayPicks[this.hand];298 var intersection = controllerData.rayPicks[this.hand];
299 var offOverlay = (intersection.type !== RayPick.INTERSECTED_OVERLAY);299 var offOverlay = (intersection.type !== RayPick.INTERSECTED_OVERLAY);
300 var triggerOff = (controllerData.triggerValues[this.hand] < TRIGGER_OFF_VALUE);300 var triggerOff = (controllerData.triggerValues[this.hand] < TRIGGER_OFF_VALUE);
301 if (triggerOff) {
302 this.deleteContextOverlay();
303 }
301 var grabbingOverlay = this.grabModuleWantsNearbyOverlay(controllerData);304 var grabbingOverlay = this.grabModuleWantsNearbyOverlay(controllerData);
302 return offOverlay || grabbingOverlay || triggerOff;305 return offOverlay || grabbingOverlay || triggerOff;
303 };306 };
@@ -308,7 +311,6 @@ Script.include("/~/system/libraries/controllers.js"); · 4 unmodified lines
308 this.laserPressExit();311 this.laserPressExit();
309 this.laserPressingTarget = false;312 this.laserPressingTarget = false;
310 }313 }
311 this.deleteContextOverlay();
312 this.relinquishTouchFocus();314 this.relinquishTouchFocus();
313 this.reset();315 this.reset();
314 this.updateLaserPointer();316 this.updateLaserPointer();

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t