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

Merge pull request #7225 from PhilipRosedale/hydraReticle

Browse source 
Hand controller drives mouse, does not take over if set down
This commit is contained in:
Brad Hefta-Gaub 2016-03-06 13:33:02 -08:00
commit 78b608b970
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
examples/controllers/reticleHandRotationTest.js → examples/controllers/handControllerMouse.js
View file

@ -1,5 +1,5 @@
// //
// reticleHandRotationTest.js // handControllerMouse.js
// examples/controllers // examples/controllers
// //
// Created by Brad Hefta-Gaub on 2015/12/15 // Created by Brad Hefta-Gaub on 2015/12/15
@ -10,6 +10,9 @@
// //
var DEBUGGING = false; var DEBUGGING = false;
var angularVelocityTrailingAverage = 0.0; // Global trailing average used to decide whether to move reticle at all
var lastX = 0;
var lastY = 0;
Math.clamp=function(a,b,c) { Math.clamp=function(a,b,c) {
return Math.max(b,Math.min(c,a)); return Math.max(b,Math.min(c,a));
@ -31,12 +34,17 @@ function moveReticleAbsolute(x, y) {
var MAPPING_NAME = "com.highfidelity.testing.reticleWithHandRotation"; var MAPPING_NAME = "com.highfidelity.testing.reticleWithHandRotation";
var mapping = Controller.newMapping(MAPPING_NAME); var mapping = Controller.newMapping(MAPPING_NAME);
mapping.from(Controller.Hardware.Hydra.L3).peek().to(Controller.Actions.ReticleClick); if (Controller.Hardware.Hydra !== undefined) {
mapping.from(Controller.Hardware.Hydra.R4).peek().to(Controller.Actions.ReticleClick); mapping.from(Controller.Hardware.Hydra.L3).peek().to(Controller.Actions.ReticleClick);
mapping.from(Controller.Hardware.Hydra.R4).peek().to(Controller.Actions.ReticleClick);
}
if (Controller.Hardware.Vive !== undefined) {
mapping.from(Controller.Hardware.Vive.LeftPrimaryThumb).peek().to(Controller.Actions.ReticleClick);
mapping.from(Controller.Hardware.Vive.RightPrimaryThumb).peek().to(Controller.Actions.ReticleClick);
}
mapping.enable(); mapping.enable();
function debugPrint(message) { function debugPrint(message) {
if (DEBUGGING) { if (DEBUGGING) {
print(message); print(message);
@ -76,7 +84,7 @@ Script.update.connect(function(deltaTime) {
} }
// Velocity filter the hand rotation used to position reticle so that it is easier to target small things with the hand controllers // Velocity filter the hand rotation used to position reticle so that it is easier to target small things with the hand controllers
var VELOCITY_FILTER_GAIN = 1.0; var VELOCITY_FILTER_GAIN = 0.5;
filteredRotatedLeft = Vec3.mix(filteredRotatedLeft, rotatedLeft, Math.clamp(Vec3.length(poseLeft.angularVelocity) * VELOCITY_FILTER_GAIN, 0.0, 1.0)); filteredRotatedLeft = Vec3.mix(filteredRotatedLeft, rotatedLeft, Math.clamp(Vec3.length(poseLeft.angularVelocity) * VELOCITY_FILTER_GAIN, 0.0, 1.0));
filteredRotatedRight = Vec3.mix(filteredRotatedRight, rotatedRight, Math.clamp(Vec3.length(poseRight.angularVelocity) * VELOCITY_FILTER_GAIN, 0.0, 1.0)); filteredRotatedRight = Vec3.mix(filteredRotatedRight, rotatedRight, Math.clamp(Vec3.length(poseRight.angularVelocity) * VELOCITY_FILTER_GAIN, 0.0, 1.0));
var rotated = Vec3.mix(filteredRotatedLeft, filteredRotatedRight, leftRightBias); var rotated = Vec3.mix(filteredRotatedLeft, filteredRotatedRight, leftRightBias);
@ -96,11 +104,17 @@ Script.update.connect(function(deltaTime) {
var y = screenSizeY * yRatio; var y = screenSizeY * yRatio;
// don't move the reticle with the hand controllers unless the controllers are actually being moved // don't move the reticle with the hand controllers unless the controllers are actually being moved
var MINIMUM_CONTROLLER_ANGULAR_VELOCITY = 0.0001; // take a time average of angular velocity, and don't move mouse at all if it's below threshold
var AVERAGING_INTERVAL = 0.95;
var MINIMUM_CONTROLLER_ANGULAR_VELOCITY = 0.03;
var angularVelocityMagnitude = Vec3.length(poseLeft.angularVelocity) * (1.0 - leftRightBias) + Vec3.length(poseRight.angularVelocity) * leftRightBias; var angularVelocityMagnitude = Vec3.length(poseLeft.angularVelocity) * (1.0 - leftRightBias) + Vec3.length(poseRight.angularVelocity) * leftRightBias;
angularVelocityTrailingAverage = angularVelocityTrailingAverage * AVERAGING_INTERVAL + angularVelocityMagnitude * (1.0 - AVERAGING_INTERVAL);
if (!(xRatio == 0.5 && yRatio == 0) && (angularVelocityMagnitude > MINIMUM_CONTROLLER_ANGULAR_VELOCITY)) { if (!(xRatio == 0.5 && yRatio == 0) && (angularVelocityTrailingAverage > MINIMUM_CONTROLLER_ANGULAR_VELOCITY) && ((x != lastX) || (y != lastY))) {
moveReticleAbsolute(x, y); moveReticleAbsolute(x, y);
lastX = x;
lastY = y;
} }
}); });