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

Bugfixes?

Browse source
This commit is contained in:
Zach Fox 2017-07-26 15:02:52 -07:00
parent bd5f7b85d8
commit 17c7e38fce
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2201,6 +2201,10 @@ function MyController(hand) {
this.searchExit = function () { this.searchExit = function () {
contextualHand = -1; contextualHand = -1;
if (hoveredEntityID) {
Entities.sendHoverLeaveEntity(hoveredEntityID, pointerEvent);
}
hoveredEntityID = false;
}; };
this.search = function(deltaTime, timestamp) { this.search = function(deltaTime, timestamp) {
@ -2486,8 +2490,10 @@ function MyController(hand) {
button: "None" button: "None"
}; };
if (this.hoverEntity !== entity) {
Entities.sendHoverLeaveEntity(this.hoverEntity, pointerEvent);
this.hoverEntity = entity; this.hoverEntity = entity;
Entities.sendHoverEnterEntity(entity, pointerEvent); Entities.sendHoverEnterEntity(this.hoverEntity, pointerEvent);
} }
// send mouse events for button highlights and tooltips. // send mouse events for button highlights and tooltips.
@ -2551,8 +2557,11 @@ function MyController(hand) {
button: "None" button: "None"
}; };
this.hoverOverlay = overlay; if (this.hoverOverlay !== overlay) {
Overlays.sendHoverEnterOverlay(overlay, pointerEvent); Overlays.sendHoverLeaveOverlay(this.hoverOverlay, pointerEvent);
this.hoverOverlay = overlay;
Overlays.sendHoverEnterOverlay(this.hoverOverlay, pointerEvent);
}
// Send mouse events for button highlights and tooltips. // Send mouse events for button highlights and tooltips.
if (this.hand == mostRecentSearchingHand || if (this.hand == mostRecentSearchingHand ||
@ -3527,10 +3536,13 @@ function MyController(hand) {
var existingSearchDistance = this.searchSphereDistance; var existingSearchDistance = this.searchSphereDistance;
this.release(); this.release();
if (hoveredEntityID) {
Entities.sendHoverLeaveEntity(hoveredEntityID, pointerEvent);
hoveredEntityID = false;
}
if (entityWithContextOverlay) { if (entityWithContextOverlay) {
ContextOverlay.destroyContextOverlay(entityWithContextOverlay); ContextOverlay.destroyContextOverlay(entityWithContextOverlay);
entityWithContextOverlay = false; entityWithContextOverlay = false;
hoveredEntityID = false;
} }
if (isInEditMode()) { if (isInEditMode()) {