Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 21:35:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR feedback

Browse source
This commit is contained in:
David Kelly 2017-01-10 16:12:02 -07:00
parent 5fd11ade9c
commit 4fade3a53e
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
scripts/system/pal.js
View file

@ -133,7 +133,7 @@ ExtendedOverlay.unHover = function () { // calls hover(false) on lastHoveringId
// hit(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) // 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. ExtendedOverlay.applyPickRay = function (pickRay, hit, noHit) {
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) {
@ -377,6 +377,13 @@ function handleMouseEvent(mousePressEvent) { // handleClick if we get one.
} }
handleClick(Camera.computePickRay(mousePressEvent.x, mousePressEvent.y)); handleClick(Camera.computePickRay(mousePressEvent.x, mousePressEvent.y));
} }
function handleMouseMove(pickRay) { // given the pickRay, just do the hover logic
ExtendedOverlay.applyPickRay(pickRay, function (overlay) {
overlay.hover(true);
}, function () {
ExtendedOverlay.unHover();
});
}
function handleMouseMoveEvent(event) { // find out which overlay (if any) is over the mouse position function handleMouseMoveEvent(event) { // find out which overlay (if any) is over the mouse position
if (HMD.active) { if (HMD.active) {
var hand = whichHand(); var hand = whichHand();
@ -433,14 +440,6 @@ function whichHand() {
return currentHandPressed; return currentHandPressed;
} }
function handleMouseMove(pickRay) { // given the pickRay, just do the hover logic
ExtendedOverlay.applyPickRay(pickRay, function (overlay) {
overlay.hover(true);
}, function () {
ExtendedOverlay.unHover();
});
}
// We get mouseMoveEvents from the handControllers, via handControllerPointer. // We get mouseMoveEvents from the handControllers, via handControllerPointer.
// But we don't get mousePressEvents. // But we don't get mousePressEvents.
var triggerMapping = Controller.newMapping(Script.resolvePath('') + '-click'); var triggerMapping = Controller.newMapping(Script.resolvePath('') + '-click');