Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 10:03:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Process the tablet stylus even when reticle is over 2d HUD overlay.

Browse source
This commit is contained in:
Anthony J. Thibault 2017-01-18 15:30:38 -08:00
parent bcd94203e6
commit 56c897cc2f
1 changed files with 37 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -828,6 +828,12 @@ function MyController(hand) {
} }
if (this.ignoreInput()) { if (this.ignoreInput()) {
// Most hand input is disabled, because we are interacting with the 2d hud.
// However, we still should check for collisions of the stylus with the web overlay.
var controllerLocation = getControllerWorldLocation(this.handToController(), true);
this.processStylus(controllerLocation.position);
this.turnOffVisualizations(); this.turnOffVisualizations();
return; return;
} }
@ -1155,6 +1161,36 @@ function MyController(hand) {
return _this.rawThumbValue < THUMB_ON_VALUE; return _this.rawThumbValue < THUMB_ON_VALUE;
}; };
this.processStylus = function(worldHandPosition) {
// see if the hand is near a tablet or web-entity
var candidateEntities = Entities.findEntities(worldHandPosition, WEB_DISPLAY_STYLUS_DISTANCE);
entityPropertiesCache.addEntities(candidateEntities);
var nearWeb = false;
for (var i = 0; i < candidateEntities.length; i++) {
var props = entityPropertiesCache.getProps(candidateEntities[i]);
if (props && (props.type == "Web" || this.isTablet(props))) {
nearWeb = true;
break;
}
}
if (nearWeb) {
this.showStylus();
var rayPickInfo = this.calcRayPickInfo(this.hand);
if (rayPickInfo.distance < WEB_STYLUS_LENGTH / 2.0 + WEB_TOUCH_Y_OFFSET) {
if (this.handleStylusOnWebEntity(rayPickInfo)) {
return;
}
if (this.handleStylusOnWebOverlay(rayPickInfo)) {
return;
}
this.handleStylusOnHomeButton(rayPickInfo);
}
} else {
this.hideStylus();
}
};
this.off = function(deltaTime, timestamp) { this.off = function(deltaTime, timestamp) {
this.checkForUnexpectedChildren(); this.checkForUnexpectedChildren();
@ -1202,32 +1238,7 @@ function MyController(hand) {
this.grabPointSphereOff(); this.grabPointSphereOff();
} }
// see if the hand is near a tablet or web-entity this.processStylus(worldHandPosition);
candidateEntities = Entities.findEntities(worldHandPosition, WEB_DISPLAY_STYLUS_DISTANCE);
var nearWeb = false;
for (var i = 0; i < candidateEntities.length; i++) {
var props = entityPropertiesCache.getProps(candidateEntities[i]);
if (props && (props.type == "Web" || this.isTablet(props))) {
nearWeb = true;
break;
}
}
if (nearWeb) {
this.showStylus();
var rayPickInfo = this.calcRayPickInfo(this.hand);
if (rayPickInfo.distance < WEB_STYLUS_LENGTH / 2.0 + WEB_TOUCH_Y_OFFSET) {
if (this.handleStylusOnWebEntity(rayPickInfo)) {
return;
}
if (this.handleStylusOnWebOverlay(rayPickInfo)) {
return;
}
this.handleStylusOnHomeButton(rayPickInfo);
}
} else {
this.hideStylus();
}
}; };
this.handleStylusOnHomeButton = function(rayPickInfo) { this.handleStylusOnHomeButton = function(rayPickInfo) {