Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix un-hover, add some comments

Browse source
This commit is contained in:
David Kelly 2017-01-09 08:42:43 -07:00
parent 5eff12af34
commit 409e785aa3
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scripts/system/pal.js
View file

@ -86,6 +86,10 @@ ExtendedOverlay.prototype.hover = function (hovering) {
this.model.editOverlay({textures: textures(this.selected, hovering)}); this.model.editOverlay({textures: textures(this.selected, hovering)});
} }
if (hovering) { if (hovering) {
// un-hover the last hovering overlay
if (lastHoveringId && lastHoveringId != this.key) {
ExtendedOverlay.get(lastHoveringId).hover(false);
}
lastHoveringId = this.key; lastHoveringId = this.key;
} }
} }
@ -116,7 +120,10 @@ ExtendedOverlay.some = function (iterator) { // Bails early as soon as iterator
} }
} }
}; };
ExtendedOverlay.applyPickRay = function (pickRay, cb, noHit) { // cb(overlay) on the one overlay intersected by pickRay, if any.
// hit(overlay) on the one overlay intersected by pickRay, if any.
// noHit() if no ExtendedOverlay was intersected (helps with hover)
ExtendedOverlay.applyPickRay = function (pickRay, hit, noHit) { // cb(overlay) on the one overlay intersected by pickRay, if any.
var pickedOverlay = Overlays.findRayIntersection(pickRay); // Depends on nearer coverOverlays to extend closer to us than farther ones. var pickedOverlay = Overlays.findRayIntersection(pickRay); // Depends on nearer coverOverlays to extend closer to us than farther ones.
if (!pickedOverlay.intersects) { if (!pickedOverlay.intersects) {
if (noHit) { if (noHit) {
@ -126,7 +133,7 @@ ExtendedOverlay.applyPickRay = function (pickRay, cb, noHit) { // cb(overlay) on
} }
ExtendedOverlay.some(function (overlay) { // See if pickedOverlay is one of ours. ExtendedOverlay.some(function (overlay) { // See if pickedOverlay is one of ours.
if ((overlay.activeOverlay) === pickedOverlay.overlayID) { if ((overlay.activeOverlay) === pickedOverlay.overlayID) {
cb(overlay); hit(overlay);
return true; return true;
} }
}); });
@ -363,7 +370,7 @@ function handleMouseMoveEvent(event) {
// find out which overlay (if any) is over the mouse position // find out which overlay (if any) is over the mouse position
// var overlayAtPoint = Overlays.getOverlayAtPoint({x: event.x, y: event.y}); // var overlayAtPoint = Overlays.getOverlayAtPoint({x: event.x, y: event.y});
var pickRay = Camera.computePickRay(event.x, event.y); var pickRay = Camera.computePickRay(event.x, event.y);
var hit = ExtendedOverlay.applyPickRay(pickRay, function (overlay) { ExtendedOverlay.applyPickRay(pickRay, function (overlay) {
overlay.hover(true); overlay.hover(true);
}, function () { }, function () {
ExtendedOverlay.some(function (overlay) { overlay.hover(false); }); ExtendedOverlay.some(function (overlay) { overlay.hover(false); });