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

Merge pull request #9849 from hyperlogic/feature/can-touch-this

Browse source 
More accurate and responsive stylus and finger touching.
This commit is contained in:
Anthony Thibault 2017-03-10 17:07:11 -08:00 committed by GitHub
commit d7c6531d13
8 changed files with 630 additions and 404 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.eslintrc.js
View file

@ -17,6 +17,7 @@ module.exports = {
"Clipboard": false,
"Controller": false,
"DialogsManager": false,
"DebugDraw": false,
"Entities": false,
"FaceTracker": false,
"GlobalServices": false,

2
interface/src/Application.cpp
View file

@ -609,6 +609,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
}
}
// make sure the debug draw singleton is initialized on the main thread.
DebugDraw::getInstance().removeMarker("");
_runningMarker.startRunningMarker();

7
libraries/render-utils/src/AnimDebugDraw.cpp
View file

@ -346,7 +346,9 @@ void AnimDebugDraw::update() {
numVerts += (int)markerMap.size() * VERTICES_PER_BONE;
auto myAvatarMarkerMap = DebugDraw::getInstance().getMyAvatarMarkerMap();
numVerts += (int)myAvatarMarkerMap.size() * VERTICES_PER_BONE;
numVerts += (int)DebugDraw::getInstance().getRays().size() * VERTICES_PER_RAY;
auto rays = DebugDraw::getInstance().getRays();
DebugDraw::getInstance().clearRays();
numVerts += (int)rays.size() * VERTICES_PER_RAY;
// allocate verts!
std::vector<AnimDebugDrawData::Vertex> vertices;
@ -398,10 +400,9 @@ void AnimDebugDraw::update() {
}
// draw rays from shared DebugDraw singleton
for (auto& iter : DebugDraw::getInstance().getRays()) {
for (auto& iter : rays) {
addLine(std::get<0>(iter), std::get<1>(iter), std::get<2>(iter), v);
}
DebugDraw::getInstance().clearRays();
data._vertexBuffer->resize(sizeof(AnimDebugDrawData::Vertex) * numVerts);
data._vertexBuffer->setSubData<AnimDebugDrawData::Vertex>(0, vertices);

2
scripts/defaultScripts.js
View file

@ -27,10 +27,10 @@ var DEFAULT_SCRIPTS = [
"system/tablet-users.js",
"system/selectAudioDevice.js",
"system/notifications.js",
"system/controllers/squeezeHands.js",
"system/controllers/controllerDisplayManager.js",
"system/controllers/handControllerGrab.js",
"system/controllers/handControllerPointer.js",
"system/controllers/squeezeHands.js",
"system/controllers/grab.js",
"system/controllers/teleport.js",
"system/controllers/toggleAdvancedMovementForHandControllers.js",

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

File diff suppressed because it is too large Load diff

84
scripts/system/controllers/squeezeHands.js
View file

@ -11,6 +11,7 @@
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
/* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
(function() { // BEGIN LOCAL_SCOPE
@ -25,7 +26,11 @@ var OVERLAY_RAMP_RATE = 8.0;
var animStateHandlerID;
var isBothIndexesPointing = false;
var leftIndexPointingOverride = 0;
var rightIndexPointingOverride = 0;
var leftThumbRaisedOverride = 0;
var rightThumbRaisedOverride = 0;
var HIFI_POINT_INDEX_MESSAGE_CHANNEL = "Hifi-Point-Index";
var isLeftIndexPointing = false;
@ -53,7 +58,7 @@ function init() {
"leftHandOverlayAlpha", "leftHandGraspAlpha",
"rightHandOverlayAlpha", "rightHandGraspAlpha",
"isLeftHandGrasp", "isLeftIndexPoint", "isLeftThumbRaise", "isLeftIndexPointAndThumbRaise",
"isRightHandGrasp", "isRightIndexPoint", "isRightThumbRaise", "isRightIndexPointAndThumbRaise",
"isRightHandGrasp", "isRightIndexPoint", "isRightThumbRaise", "isRightIndexPointAndThumbRaise"
]
);
Messages.subscribe(HIFI_POINT_INDEX_MESSAGE_CHANNEL);
@ -66,21 +71,23 @@ function animStateHandler(props) {
leftHandGraspAlpha: lastLeftTrigger,
rightHandOverlayAlpha: rightHandOverlayAlpha,
rightHandGraspAlpha: lastRightTrigger,
isLeftHandGrasp: !isBothIndexesPointing && !isLeftIndexPointing && !isLeftThumbRaised,
isLeftIndexPoint: (isBothIndexesPointing || isLeftIndexPointing) && !isLeftThumbRaised,
isLeftThumbRaise: !isBothIndexesPointing && !isLeftIndexPointing && isLeftThumbRaised,
isLeftIndexPointAndThumbRaise: (isBothIndexesPointing || isLeftIndexPointing) && isLeftThumbRaised,
isRightHandGrasp: !isBothIndexesPointing && !isRightIndexPointing && !isRightThumbRaised,
isRightIndexPoint: (isBothIndexesPointing || isRightIndexPointing) && !isRightThumbRaised,
isRightThumbRaise: !isBothIndexesPointing && !isRightIndexPointing && isRightThumbRaised,
isRightIndexPointAndThumbRaise: (isBothIndexesPointing || isRightIndexPointing) && isRightThumbRaised
isLeftHandGrasp: !isLeftIndexPointing && !isLeftThumbRaised,
isLeftIndexPoint: isLeftIndexPointing && !isLeftThumbRaised,
isLeftThumbRaise: !isLeftIndexPointing && isLeftThumbRaised,
isLeftIndexPointAndThumbRaise: isLeftIndexPointing && isLeftThumbRaised,
isRightHandGrasp: !isRightIndexPointing && !isRightThumbRaised,
isRightIndexPoint: isRightIndexPointing && !isRightThumbRaised,
isRightThumbRaise: !isRightIndexPointing && isRightThumbRaised,
isRightIndexPointAndThumbRaise: isRightIndexPointing && isRightThumbRaised
};
}
function update(dt) {
var leftTrigger = clamp(Controller.getValue(Controller.Standard.LT) + Controller.getValue(Controller.Standard.LeftGrip), 0, 1);
var rightTrigger = clamp(Controller.getValue(Controller.Standard.RT) + Controller.getValue(Controller.Standard.RightGrip), 0, 1);
// Average last few trigger values together for a bit of smoothing
var tau = clamp(dt / TRIGGER_SMOOTH_TIMESCALE, 0, 1);
lastLeftTrigger = lerp(leftTrigger, lastLeftTrigger, tau);
@ -103,18 +110,61 @@ function update(dt) {
}
// Pointing index fingers and raising thumbs
isLeftIndexPointing = leftHandPose.valid && Controller.getValue(Controller.Standard.LeftIndexPoint) === 1;
isRightIndexPointing = rightHandPose.valid && Controller.getValue(Controller.Standard.RightIndexPoint) === 1;
isLeftThumbRaised = leftHandPose.valid && Controller.getValue(Controller.Standard.LeftThumbUp) === 1;
isRightThumbRaised = rightHandPose.valid && Controller.getValue(Controller.Standard.RightThumbUp) === 1;
isLeftIndexPointing = (leftIndexPointingOverride > 0) || (leftHandPose.valid && Controller.getValue(Controller.Standard.LeftIndexPoint) === 1);
isRightIndexPointing = (rightIndexPointingOverride > 0) || (rightHandPose.valid && Controller.getValue(Controller.Standard.RightIndexPoint) === 1);
isLeftThumbRaised = (leftThumbRaisedOverride > 0) || (leftHandPose.valid && Controller.getValue(Controller.Standard.LeftThumbUp) === 1);
isRightThumbRaised = (rightThumbRaisedOverride > 0) || (rightHandPose.valid && Controller.getValue(Controller.Standard.RightThumbUp) === 1);
}
function handleMessages(channel, message, sender) {
if (sender === MyAvatar.sessionUUID && channel === HIFI_POINT_INDEX_MESSAGE_CHANNEL) {
var data = JSON.parse(message);
if (data.pointIndex !== undefined) {
print("pointIndex: " + data.pointIndex);
isBothIndexesPointing = data.pointIndex;
if (data.pointIndex) {
leftIndexPointingOverride++;
rightIndexPointingOverride++;
} else {
leftIndexPointingOverride--;
rightIndexPointingOverride--;
}
}
if (data.pointLeftIndex !== undefined) {
if (data.pointLeftIndex) {
leftIndexPointingOverride++;
} else {
leftIndexPointingOverride--;
}
}
if (data.pointRightIndex !== undefined) {
if (data.pointRightIndex) {
rightIndexPointingOverride++;
} else {
rightIndexPointingOverride--;
}
}
if (data.raiseThumbs !== undefined) {
if (data.raiseThumbs) {
leftThumbRaisedOverride++;
rightThumbRaisedOverride++;
} else {
leftThumbRaisedOverride--;
rightThumbRaisedOverride--;
}
}
if (data.raiseLeftThumb !== undefined) {
if (data.raiseLeftThumb) {
leftThumbRaisedOverride++;
} else {
leftThumbRaisedOverride--;
}
}
if (data.raiseRightThumb !== undefined) {
if (data.raiseRightThumb) {
rightThumbRaisedOverride++;
} else {
rightThumbRaisedOverride--;
}
}
}
}

14
scripts/system/fingerPaint.js
View file

@ -13,6 +13,7 @@
button,
BUTTON_NAME = "PAINT",
isFingerPainting = false,
shouldPointFingers = false,
leftHand = null,
rightHand = null,
leftBrush = null,
@ -308,9 +309,14 @@
Messages.sendMessage(HIFI_POINTER_DISABLE_MESSAGE_CHANNEL, JSON.stringify({
pointerEnabled: enabled
}), true);
Messages.sendMessage(HIFI_POINT_INDEX_MESSAGE_CHANNEL, JSON.stringify({
pointIndex: !enabled
}), true);
var newShouldPointFingers = !enabled;
if (newShouldPointFingers !== shouldPointFingers) {
Messages.sendMessage(HIFI_POINT_INDEX_MESSAGE_CHANNEL, JSON.stringify({
pointIndex: newShouldPointFingers
}), true);
shouldPointFingers = newShouldPointFingers;
}
}
function enableProcessing() {
@ -430,4 +436,4 @@
setUp();
Script.scriptEnding.connect(tearDown);
}());
}());

4
scripts/system/libraries/WebTablet.js
View file

@ -175,11 +175,11 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location) {
isAA: HMD.active
});
var HOME_BUTTON_Y_OFFSET = (this.height / 2) - 0.009;
var HOME_BUTTON_Y_OFFSET = (this.height / 2) - (this.height / 20);
this.homeButtonID = Overlays.addOverlay("sphere", {
name: "homeButton",
localPosition: {x: -0.001, y: -HOME_BUTTON_Y_OFFSET, z: 0.0},
localRotation: Quat.angleAxis(0, Y_AXIS),
localRotation: {x: 0, y: 1, z: 0, w: 0},
dimensions: { x: 4 * tabletScaleFactor, y: 4 * tabletScaleFactor, z: 4 * tabletScaleFactor},
alpha: 0.0,
visible: true,