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

Reduce near grab distance of tablet so that stylus works on tablet

Browse source
This commit is contained in:
David Rowe 2018-09-11 09:58:19 +12:00
parent 16a94f827d
commit 992b9f847c
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/system/controllers/controllerDispatcher.js
View file

@ -26,6 +26,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
(function() { (function() {
Script.include("/~/system/libraries/pointersUtils.js"); Script.include("/~/system/libraries/pointersUtils.js");
var NEAR_MAX_RADIUS = 0.1; var NEAR_MAX_RADIUS = 0.1;
var NEAR_TABLET_MAX_RADIUS = 0.05;
var TARGET_UPDATE_HZ = 60; // 50hz good enough, but we're using update var TARGET_UPDATE_HZ = 60; // 50hz good enough, but we're using update
var BASIC_TIMER_INTERVAL_MS = 1000 / TARGET_UPDATE_HZ; var BASIC_TIMER_INTERVAL_MS = 1000 / TARGET_UPDATE_HZ;
@ -211,6 +212,17 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
if (controllerLocations[h].valid) { if (controllerLocations[h].valid) {
var nearbyOverlays = var nearbyOverlays =
Overlays.findOverlays(controllerLocations[h].position, NEAR_MAX_RADIUS * sensorScaleFactor); Overlays.findOverlays(controllerLocations[h].position, NEAR_MAX_RADIUS * sensorScaleFactor);
// Tablet must be within NEAR_TABLET_MAX_RADIUS in order to be grabbed.
var tabletIndex = nearbyOverlays.indexOf(HMD.tabletID);
if (tabletIndex !== -1) {
var closebyOverlays =
Overlays.findOverlays(controllerLocations[h].position, NEAR_TABLET_MAX_RADIUS * sensorScaleFactor);
if (tabletIndex !== -1 && closebyOverlays.indexOf(HMD.tabletID) === -1) {
nearbyOverlays.splice(tabletIndex, 1);
}
}
nearbyOverlays.sort(function (a, b) { nearbyOverlays.sort(function (a, b) {
var aPosition = Overlays.getProperty(a, "position"); var aPosition = Overlays.getProperty(a, "position");
var aDistance = Vec3.distance(aPosition, controllerLocations[h].position); var aDistance = Vec3.distance(aPosition, controllerLocations[h].position);