From 585691f71ca974b17ce455b62e6a3908aea58289 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 17 Feb 2017 19:29:11 +1300 Subject: [PATCH 01/15] Add finger painting button to tablet --- .../icons/tablet-icons/finger-paint-a.svg | 96 +++++++++++++++++++ .../icons/tablet-icons/finger-paint-i.svg | 46 +++++++++ scripts/system/fingerPaint.js | 44 +++++++++ 3 files changed, 186 insertions(+) create mode 100644 interface/resources/icons/tablet-icons/finger-paint-a.svg create mode 100644 interface/resources/icons/tablet-icons/finger-paint-i.svg create mode 100644 scripts/system/fingerPaint.js diff --git a/interface/resources/icons/tablet-icons/finger-paint-a.svg b/interface/resources/icons/tablet-icons/finger-paint-a.svg new file mode 100644 index 0000000000..553636bfbb --- /dev/null +++ b/interface/resources/icons/tablet-icons/finger-paint-a.svg @@ -0,0 +1,96 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/interface/resources/icons/tablet-icons/finger-paint-i.svg b/interface/resources/icons/tablet-icons/finger-paint-i.svg new file mode 100644 index 0000000000..d7c8948e01 --- /dev/null +++ b/interface/resources/icons/tablet-icons/finger-paint-i.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js new file mode 100644 index 0000000000..c154f2d81d --- /dev/null +++ b/scripts/system/fingerPaint.js @@ -0,0 +1,44 @@ +// +// fingerPaint.js +// +// Created by David Rowe on 15 Feb 2017 +// Copyright 2017 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +(function () { + var tablet, + button, + BUTTON_NAME = "PAINT", + isFingerPainting = false; + + function onButtonClicked() { + isFingerPainting = !isFingerPainting; + button.editProperties({ isActive: isFingerPainting }); + } + + function setUp() { + tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); + if (tablet) { + button = tablet.addButton({ + icon: "icons/tablet-icons/bubble-i.svg", + activeIcon: "icons/tablet-icons/bubble-a.svg", + text: BUTTON_NAME, + isActive: isFingerPainting + }); + button.clicked.connect(onButtonClicked); + } + } + + function tearDown() { + if (tablet) { + button.clicked.disconnect(onButtonClicked); + tablet.removeButton(button); + } + } + + setUp(); + Script.scriptEnding.connect(tearDown); +}()); \ No newline at end of file From bad57fa03f4f6e792ca9f2bbde9f0d6155a08a27 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 17 Feb 2017 08:50:55 +1300 Subject: [PATCH 02/15] Controller and painting code framework --- scripts/system/fingerPaint.js | 153 +++++++++++++++++++++++++++++++--- 1 file changed, 141 insertions(+), 12 deletions(-) diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js index c154f2d81d..7f1f90c640 100644 --- a/scripts/system/fingerPaint.js +++ b/scripts/system/fingerPaint.js @@ -12,31 +12,160 @@ var tablet, button, BUTTON_NAME = "PAINT", - isFingerPainting = false; + isFingerPainting = false, + leftHand, + rightHand, + leftBrush, + rightBrush, + CONTROLLER_MAPPING_NAME = "com.highfidelity.fingerPaint"; + + function paintBrush(name) { + // Paints in 3D. + + var brushName = name, + BRUSH_COLOR = { red: 250, green: 0, blue: 0 }, + ERASE_SEARCH_DISTANCE = 0.1; // m + + function startLine(position, width) { + } + + function drawLine(position, width) { + } + + function finishLine(position, width) { + } + + function cancelLine() { + } + + function eraseClosestLine(position) { + } + + function tearDown() { + } + + return { + startLine: startLine, + drawLine: drawLine, + finishLine: finishLine, + cancelLine: cancelLine, + eraseClosestLine: eraseClosestLine, + tearDown: tearDown + }; + } + + function handController(name) { + // Translates controller data into application events. + var handName = name, + triggerPressed, // Callback. + triggerPressing, // "" + triggerReleased, // "" + gripPressed, // "" + isEnabled = false; + + function setEnabled(enabled) { + isEnabled = enabled; + } + + function onTriggerPress(value) { + if (!isEnabled) { + return; + } + } + + function onGripPress(value) { + if (!isEnabled) { + return; + } + } + + function tearDown() { + } + + return { + setEnabled: setEnabled, + onTriggerPress: onTriggerPress, + onGripPress: onGripPress, + triggerPressed: triggerPressed, + triggerPressing: triggerPressing, + triggerReleased: triggerReleased, + gripPressed: gripPressed, + tearDown: tearDown + }; + } function onButtonClicked() { + var wasFingerPainting = isFingerPainting; + isFingerPainting = !isFingerPainting; button.editProperties({ isActive: isFingerPainting }); + + leftHand.setEnabled(isFingerPainting); + rightHand.setEnabled(isFingerPainting); + + if (wasFingerPainting) { + leftBrush.cancelLine(); + rightBrush.cancelLine(); + } } function setUp() { tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); - if (tablet) { - button = tablet.addButton({ - icon: "icons/tablet-icons/bubble-i.svg", - activeIcon: "icons/tablet-icons/bubble-a.svg", - text: BUTTON_NAME, - isActive: isFingerPainting - }); - button.clicked.connect(onButtonClicked); + if (!tablet) { + return; } + + // Tablet button. + button = tablet.addButton({ + icon: "icons/tablet-icons/bubble-i.svg", + activeIcon: "icons/tablet-icons/bubble-a.svg", + text: BUTTON_NAME, + isActive: isFingerPainting + }); + button.clicked.connect(onButtonClicked); + + // Connect controller API to handController objects. + leftHand = handController("left"); + rightHand = handController("right"); + var controllerMapping = Controller.newMapping(CONTROLLER_MAPPING_NAME); + controllerMapping.from(Controller.Standard.LT).to(leftHand.onTriggerPress); + controllerMapping.from(Controller.Standard.LeftGrip).to(leftHand.onGripPress); + controllerMapping.from(Controller.Standard.RT).to(rightHand.onTriggerPress); + controllerMapping.from(Controller.Standard.RightGrip).to(rightHand.onGripPress); + Controller.enableMapping(CONTROLLER_MAPPING_NAME); + + // Connect handController outputs to paintBrush objects. + leftBrush = paintBrush("left"); + leftHand.triggerPressed = leftBrush.startLine; + leftHand.triggerPressing = leftBrush.drawLine; + leftHand.trigerRelease = leftBrush.finishLine; + leftHand.gripPressed = leftBrush.eraseLine; + rightBrush = paintBrush("right"); + rightHand.triggerPressed = rightBrush.startLine; + rightHand.triggerPressing = rightBrush.drawLine; + rightHand.trigerRelease = rightBrush.finishLine; + rightHand.gripPressed = rightBrush.eraseLine; } function tearDown() { - if (tablet) { - button.clicked.disconnect(onButtonClicked); - tablet.removeButton(button); + if (!tablet) { + return; } + + button.clicked.disconnect(onButtonClicked); + tablet.removeButton(button); + + Controller.disableMapping(CONTROLLER_MAPPING_NAME); + + leftBrush.tearDown(); + leftBrush = null; + leftHand.tearDown(); + leftHand = null; + + rightBrush.tearDown(); + rightBrush = null; + rightHand.tearDown(); + rightHand = null; } setUp(); From 867e24762b713182be2515b86a8a09922461a83e Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 17 Feb 2017 09:23:07 +1300 Subject: [PATCH 03/15] Disable lasers and grabbing while painting if tablet not displayed --- scripts/system/fingerPaint.js | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js index 7f1f90c640..d35e053d6b 100644 --- a/scripts/system/fingerPaint.js +++ b/scripts/system/fingerPaint.js @@ -17,7 +17,9 @@ rightHand, leftBrush, rightBrush, - CONTROLLER_MAPPING_NAME = "com.highfidelity.fingerPaint"; + CONTROLLER_MAPPING_NAME = "com.highfidelity.fingerPaint", + isTabletDisplayed = false, + HIFI_GRAB_DISABLE_MESSAGE_CHANNEL = "Hifi-Grab-Disable"; function paintBrush(name) { // Paints in 3D. @@ -94,6 +96,17 @@ }; } + function updateHandControllerGrab() { + // Send message to handControllerGrab.js to handle. + var enabled = !isFingerPainting || isTabletDisplayed; + + Messages.sendMessage(HIFI_GRAB_DISABLE_MESSAGE_CHANNEL, JSON.stringify({ + holdEnabled: enabled, + nearGrabEnabled: enabled, + farGrabEnabled: enabled + })); + } + function onButtonClicked() { var wasFingerPainting = isFingerPainting; @@ -107,6 +120,15 @@ leftBrush.cancelLine(); rightBrush.cancelLine(); } + + updateHandControllerGrab(); + } + + function onTabletScreenChanged(type, url) { + var TABLET_SCREEN_CLOSED = "Closed"; + + isTabletDisplayed = type !== TABLET_SCREEN_CLOSED; + updateHandControllerGrab(); } function setUp() { @@ -124,6 +146,9 @@ }); button.clicked.connect(onButtonClicked); + // Track whether tablet is displayed or not. + tablet.screenChanged.connect(onTabletScreenChanged); + // Connect controller API to handController objects. leftHand = handController("left"); rightHand = handController("right"); @@ -145,6 +170,9 @@ rightHand.triggerPressing = rightBrush.drawLine; rightHand.trigerRelease = rightBrush.finishLine; rightHand.gripPressed = rightBrush.eraseLine; + + // Messages channel for disabling/enabling laser pointers and grabbing. + Messages.subscribe(HIFI_GRAB_DISABLE_MESSAGE_CHANNEL); } function tearDown() { @@ -155,6 +183,8 @@ button.clicked.disconnect(onButtonClicked); tablet.removeButton(button); + tablet.screenChanged.disconnect(onTabletScreenChanged); + Controller.disableMapping(CONTROLLER_MAPPING_NAME); leftBrush.tearDown(); @@ -166,6 +196,8 @@ rightBrush = null; rightHand.tearDown(); rightHand = null; + + Messages.unsubscribe(HIFI_GRAB_DISABLE_MESSAGE_CHANNEL); } setUp(); From 7b36669d8026ebbd9befb52c8ad2194a0171102a Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 17 Feb 2017 10:20:13 +1300 Subject: [PATCH 04/15] Point index finger while painting if tablet not displayed --- scripts/system/controllers/squeezeHands.js | 33 ++++++++++++++++++++++ scripts/system/fingerPaint.js | 16 +++++++---- 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/scripts/system/controllers/squeezeHands.js b/scripts/system/controllers/squeezeHands.js index 1e94c29521..3f1d21b46c 100644 --- a/scripts/system/controllers/squeezeHands.js +++ b/scripts/system/controllers/squeezeHands.js @@ -25,6 +25,11 @@ var OVERLAY_RAMP_RATE = 8.0; var animStateHandlerID; +var isPointingIndex = false; +var HIFI_POINT_INDEX_MESSAGE_CHANNEL = "Hifi-Point-Index"; + +var indexfingerJointNames = ["LeftHandIndex1", "LeftHandIndex2", "LeftHandIndex3", "RightHandIndex1", "RightHandIndex2", "RightHandIndex3"]; + function clamp(val, min, max) { return Math.min(Math.max(val, min), max); } @@ -43,6 +48,8 @@ function init() { animStateHandler, ["leftHandOverlayAlpha", "rightHandOverlayAlpha", "leftHandGraspAlpha", "rightHandGraspAlpha"] ); + Messages.subscribe(HIFI_POINT_INDEX_MESSAGE_CHANNEL); + Messages.messageReceived.connect(handleMessages); } function animStateHandler(props) { @@ -76,11 +83,37 @@ function update(dt) { } else { rightHandOverlayAlpha = clamp(rightHandOverlayAlpha - OVERLAY_RAMP_RATE * dt, 0, 1); } + + // Point index finger. + if (isPointingIndex) { + var zeroRotation = { x: 0, y: 0, z: 0, w: 1 }; + for (var i = 0; i < indexfingerJointNames.length; i++) { + MyAvatar.setJointRotation(indexfingerJointNames[i], zeroRotation); + } + } +} + +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); + isPointingIndex = data.pointIndex; + + if (!isPointingIndex) { + for (var i = 0; i < indexfingerJointNames.length; i++) { + MyAvatar.clearJointData(indexfingerJointNames[i]); + } + } + } + } } function shutdown() { Script.update.disconnect(update); MyAvatar.removeAnimationStateHandler(animStateHandlerID); + Messages.unsubscribe(HIFI_POINT_INDEX_MESSAGE_CHANNEL); + Messages.messageReceived.disconnect(handleMessages); } Script.scriptEnding.connect(shutdown); diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js index d35e053d6b..7dbcc4c370 100644 --- a/scripts/system/fingerPaint.js +++ b/scripts/system/fingerPaint.js @@ -19,6 +19,7 @@ rightBrush, CONTROLLER_MAPPING_NAME = "com.highfidelity.fingerPaint", isTabletDisplayed = false, + HIFI_POINT_INDEX_MESSAGE_CHANNEL = "Hifi-Point-Index", HIFI_GRAB_DISABLE_MESSAGE_CHANNEL = "Hifi-Grab-Disable"; function paintBrush(name) { @@ -96,8 +97,8 @@ }; } - function updateHandControllerGrab() { - // Send message to handControllerGrab.js to handle. + function updateHandFunctions() { + // Update other scripts' hand functions. var enabled = !isFingerPainting || isTabletDisplayed; Messages.sendMessage(HIFI_GRAB_DISABLE_MESSAGE_CHANNEL, JSON.stringify({ @@ -105,6 +106,9 @@ nearGrabEnabled: enabled, farGrabEnabled: enabled })); + Messages.sendMessage(HIFI_POINT_INDEX_MESSAGE_CHANNEL, JSON.stringify({ + pointIndex: !enabled + })); } function onButtonClicked() { @@ -121,14 +125,14 @@ rightBrush.cancelLine(); } - updateHandControllerGrab(); + updateHandFunctions(); } function onTabletScreenChanged(type, url) { var TABLET_SCREEN_CLOSED = "Closed"; isTabletDisplayed = type !== TABLET_SCREEN_CLOSED; - updateHandControllerGrab(); + updateHandFunctions(); } function setUp() { @@ -171,7 +175,8 @@ rightHand.trigerRelease = rightBrush.finishLine; rightHand.gripPressed = rightBrush.eraseLine; - // Messages channel for disabling/enabling laser pointers and grabbing. + // Messages channels for enabling/disabling other scripts' functions. + Messages.subscribe(HIFI_POINT_INDEX_MESSAGE_CHANNEL); Messages.subscribe(HIFI_GRAB_DISABLE_MESSAGE_CHANNEL); } @@ -197,6 +202,7 @@ rightHand.tearDown(); rightHand = null; + Messages.unsubscribe(HIFI_POINT_INDEX_MESSAGE_CHANNEL); Messages.unsubscribe(HIFI_GRAB_DISABLE_MESSAGE_CHANNEL); } From 5236f123c1d349dfeb713288aaa3ac05fb0c7bea Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 17 Feb 2017 12:42:10 +1300 Subject: [PATCH 05/15] Interpret trigger and grip values --- scripts/system/fingerPaint.js | 97 +++++++++++++++++++++++++++++------ 1 file changed, 80 insertions(+), 17 deletions(-) diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js index 7dbcc4c370..4f21419a87 100644 --- a/scripts/system/fingerPaint.js +++ b/scripts/system/fingerPaint.js @@ -60,39 +60,108 @@ function handController(name) { // Translates controller data into application events. var handName = name, - triggerPressed, // Callback. - triggerPressing, // "" - triggerReleased, // "" - gripPressed, // "" - isEnabled = false; + isEnabled = false, + + triggerPressedCallback, + triggerPressingCallback, + triggerReleasedCallback, + gripPressedCallback, + + triggerValue = 0.0, + isTriggerPressed = false, + TRIGGER_SMOOTH_RATIO = 0.1, + TRIGGER_OFF = 0.05, + TRIGGER_ON = 0.1, + TRIGGER_START_WIDTH = 0.15, + TRIGGER_FINISH_WIDTH = 1.0, + TRIGGER_RANGE_WIDTH = TRIGGER_FINISH_WIDTH - TRIGGER_START_WIDTH, + START_LINE_WIDTH = 0.005, + FINISH_LINE_WIDTH = 0.010, + RANGE_LINE_WIDTH = FINISH_LINE_WIDTH - START_LINE_WIDTH, + + gripValue = 0.0, + isGripPressed = false, + GRIP_SMOOTH_RATIO = 0.1, + GRIP_OFF = 0.05, + GRIP_ON = 0.1; function setEnabled(enabled) { isEnabled = enabled; } function onTriggerPress(value) { + var wasTriggerPressed, + fingerTipPosition, + lineWidth; + if (!isEnabled) { return; } + + triggerValue = triggerValue * TRIGGER_SMOOTH_RATIO + value * (1.0 - TRIGGER_SMOOTH_RATIO); + + wasTriggerPressed = isTriggerPressed; + if (isTriggerPressed) { + isTriggerPressed = triggerValue > TRIGGER_OFF; + } else { + isTriggerPressed = triggerValue > TRIGGER_ON; + } + + if (wasTriggerPressed || isTriggerPressed) { + fingerTipPosition = MyAvatar.getJointPosition(handName === "left" ? "LeftHandIndex3" : "RightHandIndex3"); + if (triggerValue < TRIGGER_START_WIDTH) { + lineWidth = START_LINE_WIDTH; + } else { + lineWidth = START_LINE_WIDTH + + (triggerValue - TRIGGER_START_WIDTH) / TRIGGER_RANGE_WIDTH * RANGE_LINE_WIDTH; + } + + if (!wasTriggerPressed && isTriggerPressed) { + triggerPressedCallback(fingerTipPosition, lineWidth); + } else if (wasTriggerPressed && isTriggerPressed) { + triggerPressingCallback(fingerTipPosition, lineWidth); + } else { + triggerReleasedCallback(fingerTipPosition, lineWidth); + } + } } function onGripPress(value) { + var fingerTipPosition; + if (!isEnabled) { return; } + + gripValue = gripValue * GRIP_SMOOTH_RATIO + value * (1.0 - GRIP_SMOOTH_RATIO); + + if (isGripPressed) { + isGripPressed = gripValue > GRIP_OFF; + } else { + isGripPressed = gripValue > GRIP_ON; + if (isGripPressed) { + fingerTipPosition = MyAvatar.getJointPosition(handName === "left" ? "LeftHandIndex3" : "RightHandIndex3"); + gripPressedCallback(fingerTipPosition); + } + } + } + + function setUp(onTriggerPressed, onTriggerPressing, onTriggerReleased, onGripPressed) { + triggerPressedCallback = onTriggerPressed; + triggerPressingCallback = onTriggerPressing; + triggerReleasedCallback = onTriggerReleased; + gripPressedCallback = onGripPressed; } function tearDown() { + // Nothing to do. } return { setEnabled: setEnabled, onTriggerPress: onTriggerPress, onGripPress: onGripPress, - triggerPressed: triggerPressed, - triggerPressing: triggerPressing, - triggerReleased: triggerReleased, - gripPressed: gripPressed, + setUp: setUp, tearDown: tearDown }; } @@ -165,15 +234,9 @@ // Connect handController outputs to paintBrush objects. leftBrush = paintBrush("left"); - leftHand.triggerPressed = leftBrush.startLine; - leftHand.triggerPressing = leftBrush.drawLine; - leftHand.trigerRelease = leftBrush.finishLine; - leftHand.gripPressed = leftBrush.eraseLine; + leftHand.setUp(leftBrush.startLine, leftBrush.drawLine, leftBrush.finishLine, leftBrush.eraseClosestLine); rightBrush = paintBrush("right"); - rightHand.triggerPressed = rightBrush.startLine; - rightHand.triggerPressing = rightBrush.drawLine; - rightHand.trigerRelease = rightBrush.finishLine; - rightHand.gripPressed = rightBrush.eraseLine; + rightHand.setUp(rightBrush.startLine, rightBrush.drawLine, rightBrush.finishLine, rightBrush.eraseClosestLine); // Messages channels for enabling/disabling other scripts' functions. Messages.subscribe(HIFI_POINT_INDEX_MESSAGE_CHANNEL); From 9c1bb37a349f073f078379aa01ef295b4deddbea Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 17 Feb 2017 14:45:44 +1300 Subject: [PATCH 06/15] Paint lines --- scripts/system/fingerPaint.js | 87 +++++++++++++++++++++++++++++++++-- 1 file changed, 82 insertions(+), 5 deletions(-) diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js index 4f21419a87..10b84b66fa 100644 --- a/scripts/system/fingerPaint.js +++ b/scripts/system/fingerPaint.js @@ -24,27 +24,104 @@ function paintBrush(name) { // Paints in 3D. - var brushName = name, - BRUSH_COLOR = { red: 250, green: 0, blue: 0 }, - ERASE_SEARCH_DISTANCE = 0.1; // m + STROKE_COLOR = { red: 250, green: 0, blue: 0 }, + ERASE_SEARCH_DISTANCE = 0.1, // m + isDrawingLine = false, + entityID, + basePosition, + strokePoints, + strokeNormals, + strokeWidths, + MIN_STROKE_LENGTH = 0.02, + MAX_POINTS_PER_LINE = 100; + + function strokeNormal() { + return Vec3.multiplyQbyV(Camera.getOrientation(), Vec3.UNIT_NEG_Z); + } function startLine(position, width) { + // Start drawing a polyline. + + if (isDrawingLine) { + print("ERROR: startLine() called when already drawing line"); + // Nevertheless, continue on and start a new line. + } + + basePosition = position; + + strokePoints = [Vec3.ZERO]; + strokeNormals = [strokeNormal()]; + strokeWidths = [width]; + + entityID = Entities.addEntity({ + type: "PolyLine", + name: "fingerPainting", + color: STROKE_COLOR, + position: position, + linePoints: strokePoints, + normals: strokeNormals, + strokeWidths: strokeWidths, + dimensions: { x: 10, y: 10, z: 10 } + }); + + isDrawingLine = true; } function drawLine(position, width) { + // Add a stroke to the polyline if stroke is a sufficient length. + var localPosition; + + if (!isDrawingLine) { + print("ERROR: drawLine() called when not drawing line"); + return; + } + + localPosition = Vec3.subtract(position, basePosition); + + if (Vec3.distance(localPosition, strokePoints[strokePoints.length - 1]) >= MIN_STROKE_LENGTH + && strokePoints.length < MAX_POINTS_PER_LINE) { + strokePoints.push(localPosition); + strokeNormals.push(strokeNormal()); + strokeWidths.push(width); + + Entities.editEntity(entityID, { + linePoints: strokePoints, + normals: strokeNormals, + strokeWidths: strokeWidths + }); + } } function finishLine(position, width) { + // Finish drawing polyline; delete if it has only 1 point. + + if (!isDrawingLine) { + print("ERROR: finishLine() called when not drawing line"); + return; + } + + if (strokePoints.length === 1) { + // Delete "empty" line. + Entities.deleteEntity(entityID); + } + + isDrawingLine = false; } function cancelLine() { + // Cancel any line being drawn. + if (isDrawingLine) { + Entities.deleteEntity(entityID); + isDrawingLine = false; + } } function eraseClosestLine(position) { } function tearDown() { + cancelLine(); } return { @@ -108,7 +185,7 @@ } if (wasTriggerPressed || isTriggerPressed) { - fingerTipPosition = MyAvatar.getJointPosition(handName === "left" ? "LeftHandIndex3" : "RightHandIndex3"); + fingerTipPosition = MyAvatar.getJointPosition(handName === "left" ? "LeftHandIndex4" : "RightHandIndex4"); if (triggerValue < TRIGGER_START_WIDTH) { lineWidth = START_LINE_WIDTH; } else { @@ -140,7 +217,7 @@ } else { isGripPressed = gripValue > GRIP_ON; if (isGripPressed) { - fingerTipPosition = MyAvatar.getJointPosition(handName === "left" ? "LeftHandIndex3" : "RightHandIndex3"); + fingerTipPosition = MyAvatar.getJointPosition(handName === "left" ? "LeftHandIndex4" : "RightHandIndex4"); gripPressedCallback(fingerTipPosition); } } From 25761adf6c58065f36ef8705f2c926ef1b33ab43 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 17 Feb 2017 15:21:59 +1300 Subject: [PATCH 07/15] Erase closest line --- scripts/system/fingerPaint.js | 39 ++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js index 10b84b66fa..ce9428b246 100644 --- a/scripts/system/fingerPaint.js +++ b/scripts/system/fingerPaint.js @@ -26,7 +26,7 @@ // Paints in 3D. var brushName = name, STROKE_COLOR = { red: 250, green: 0, blue: 0 }, - ERASE_SEARCH_DISTANCE = 0.1, // m + ERASE_SEARCH_RADIUS = 0.1, // m isDrawingLine = false, entityID, basePosition, @@ -118,6 +118,43 @@ } function eraseClosestLine(position) { + // Erase closest line that is within search radius of finger tip. + var entities, + entitiesLength, + properties, + entityID, + entityDistance, + i, + pointsLength, + j, + distance, + found = false, + foundID, + foundDistance = ERASE_SEARCH_RADIUS; + + // Find entities with bounding box within search radius. + entities = Entities.findEntities(position, ERASE_SEARCH_RADIUS); + + // Fine polyline entity with closest point within search radius. + for (i = 0, entitiesLength = entities.length; i < entitiesLength; i += 1) { + properties = Entities.getEntityProperties(entities[i], ["type", "position", "linePoints"]); + if (properties.type === "PolyLine") { + basePosition = properties.position; + for (j = 0, pointsLength = properties.linePoints.length; j < pointsLength; j += 1) { + distance = Vec3.distance(position, Vec3.sum(basePosition, properties.linePoints[j])); + if (distance <= foundDistance) { + found = true; + foundID = entities[i]; + foundDistance = distance; + } + } + } + } + + // Delete found entity. + if (found) { + Entities.deleteEntity(foundID); + } } function tearDown() { From bdfc9fd418b5db5d82564bf52c975d89f53635e6 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 17 Feb 2017 16:39:10 +1300 Subject: [PATCH 08/15] Tidying --- scripts/system/fingerPaint.js | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js index ce9428b246..4742e20410 100644 --- a/scripts/system/fingerPaint.js +++ b/scripts/system/fingerPaint.js @@ -122,8 +122,6 @@ var entities, entitiesLength, properties, - entityID, - entityDistance, i, pointsLength, j, @@ -186,12 +184,12 @@ TRIGGER_SMOOTH_RATIO = 0.1, TRIGGER_OFF = 0.05, TRIGGER_ON = 0.1, - TRIGGER_START_WIDTH = 0.15, - TRIGGER_FINISH_WIDTH = 1.0, - TRIGGER_RANGE_WIDTH = TRIGGER_FINISH_WIDTH - TRIGGER_START_WIDTH, - START_LINE_WIDTH = 0.005, - FINISH_LINE_WIDTH = 0.010, - RANGE_LINE_WIDTH = FINISH_LINE_WIDTH - START_LINE_WIDTH, + TRIGGER_START_WIDTH_RAMP = 0.15, + TRIGGER_FINISH_WIDTH_RAMP = 1.0, + TRIGGER_RAMP_WIDTH = TRIGGER_FINISH_WIDTH_RAMP - TRIGGER_START_WIDTH_RAMP, + MIN_LINE_WIDTH = 0.005, + MAX_LINE_WIDTH = 0.03, + RAMP_LINE_WIDTH = MAX_LINE_WIDTH - MIN_LINE_WIDTH, gripValue = 0.0, isGripPressed = false, @@ -223,11 +221,11 @@ if (wasTriggerPressed || isTriggerPressed) { fingerTipPosition = MyAvatar.getJointPosition(handName === "left" ? "LeftHandIndex4" : "RightHandIndex4"); - if (triggerValue < TRIGGER_START_WIDTH) { - lineWidth = START_LINE_WIDTH; + if (triggerValue < TRIGGER_START_WIDTH_RAMP) { + lineWidth = MIN_LINE_WIDTH; } else { - lineWidth = START_LINE_WIDTH - + (triggerValue - TRIGGER_START_WIDTH) / TRIGGER_RANGE_WIDTH * RANGE_LINE_WIDTH; + lineWidth = MIN_LINE_WIDTH + + (triggerValue - TRIGGER_START_WIDTH_RAMP) / TRIGGER_RAMP_WIDTH * RAMP_LINE_WIDTH; } if (!wasTriggerPressed && isTriggerPressed) { @@ -362,6 +360,9 @@ return; } + isFingerPainting = false; + updateHandFunctions(); + button.clicked.disconnect(onButtonClicked); tablet.removeButton(button); From 3712aea8613435fa1a04483d1f3c77836f93a249 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 17 Feb 2017 19:21:20 +1300 Subject: [PATCH 09/15] Handle trigger values of 1.0 not repeating --- scripts/system/fingerPaint.js | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js index 4742e20410..1c4527b6ad 100644 --- a/scripts/system/fingerPaint.js +++ b/scripts/system/fingerPaint.js @@ -179,6 +179,7 @@ triggerReleasedCallback, gripPressedCallback, + rawTriggerValue = 0.0, triggerValue = 0.0, isTriggerPressed = false, TRIGGER_SMOOTH_RATIO = 0.1, @@ -191,6 +192,7 @@ MAX_LINE_WIDTH = 0.03, RAMP_LINE_WIDTH = MAX_LINE_WIDTH - MIN_LINE_WIDTH, + rawGripValue = 0.0, gripValue = 0.0, isGripPressed = false, GRIP_SMOOTH_RATIO = 0.1, @@ -202,6 +204,11 @@ } function onTriggerPress(value) { + // Controller values are only updated when they change so store latest for use in update. + rawTriggerValue = value; + } + + function updateTriggerPress(value) { var wasTriggerPressed, fingerTipPosition, lineWidth; @@ -210,7 +217,7 @@ return; } - triggerValue = triggerValue * TRIGGER_SMOOTH_RATIO + value * (1.0 - TRIGGER_SMOOTH_RATIO); + triggerValue = triggerValue * TRIGGER_SMOOTH_RATIO + rawTriggerValue * (1.0 - TRIGGER_SMOOTH_RATIO); wasTriggerPressed = isTriggerPressed; if (isTriggerPressed) { @@ -239,13 +246,18 @@ } function onGripPress(value) { + // Controller values are only updated when they change so store latest for use in update. + rawGripValue = value; + } + + function updateGripPress() { var fingerTipPosition; if (!isEnabled) { return; } - gripValue = gripValue * GRIP_SMOOTH_RATIO + value * (1.0 - GRIP_SMOOTH_RATIO); + gripValue = gripValue * GRIP_SMOOTH_RATIO + rawGripValue * (1.0 - GRIP_SMOOTH_RATIO); if (isGripPressed) { isGripPressed = gripValue > GRIP_OFF; @@ -258,6 +270,11 @@ } } + function onUpdate() { + updateTriggerPress(); + updateGripPress(); + } + function setUp(onTriggerPressed, onTriggerPressing, onTriggerReleased, onGripPressed) { triggerPressedCallback = onTriggerPressed; triggerPressingCallback = onTriggerPressing; @@ -273,6 +290,7 @@ setEnabled: setEnabled, onTriggerPress: onTriggerPress, onGripPress: onGripPress, + onUpdate: onUpdate, setUp: setUp, tearDown: tearDown }; @@ -343,6 +361,8 @@ controllerMapping.from(Controller.Standard.RT).to(rightHand.onTriggerPress); controllerMapping.from(Controller.Standard.RightGrip).to(rightHand.onGripPress); Controller.enableMapping(CONTROLLER_MAPPING_NAME); + Script.update.connect(leftHand.onUpdate); + Script.update.connect(rightHand.onUpdate); // Connect handController outputs to paintBrush objects. leftBrush = paintBrush("left"); @@ -360,6 +380,9 @@ return; } + Script.update.disconnect(leftHand.onUpdate); + Script.update.disconnect(rightHand.onUpdate); + isFingerPainting = false; updateHandFunctions(); From 777a0b51c11775615dd7fbdc6ac9a201679650e8 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 18 Feb 2017 13:35:16 +1300 Subject: [PATCH 10/15] Ignore spurious finger tip position values --- scripts/system/fingerPaint.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js index 1c4527b6ad..416b0dede1 100644 --- a/scripts/system/fingerPaint.js +++ b/scripts/system/fingerPaint.js @@ -70,7 +70,9 @@ function drawLine(position, width) { // Add a stroke to the polyline if stroke is a sufficient length. - var localPosition; + var localPosition, + distanceToPrevious, + MAX_DISTANCE_TO_PREVIOUS = 1.0; if (!isDrawingLine) { print("ERROR: drawLine() called when not drawing line"); @@ -78,8 +80,14 @@ } localPosition = Vec3.subtract(position, basePosition); + distanceToPrevious = Vec3.distance(localPosition, strokePoints[strokePoints.length - 1]); - if (Vec3.distance(localPosition, strokePoints[strokePoints.length - 1]) >= MIN_STROKE_LENGTH + if (distanceToPrevious > MAX_DISTANCE_TO_PREVIOUS) { + // Ignore occasional spurious finger tip positions. + return; + } + + if (distanceToPrevious >= MIN_STROKE_LENGTH && strokePoints.length < MAX_POINTS_PER_LINE) { strokePoints.push(localPosition); strokeNormals.push(strokeNormal()); From 0689557ba57d64516522dc8f4a1c2464c005d6aa Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 18 Feb 2017 13:39:59 +1300 Subject: [PATCH 11/15] Draw smoother lines --- scripts/system/fingerPaint.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js index 416b0dede1..ebcdca44b5 100644 --- a/scripts/system/fingerPaint.js +++ b/scripts/system/fingerPaint.js @@ -33,8 +33,10 @@ strokePoints, strokeNormals, strokeWidths, - MIN_STROKE_LENGTH = 0.02, - MAX_POINTS_PER_LINE = 100; + timeOfLastPoint, + MIN_STROKE_LENGTH = 0.005, // m + MIN_STROKE_INTERVAL = 66, // ms + MAX_POINTS_PER_LINE = 70; // Hard-coded limit in PolyLineEntityItem.h. function strokeNormal() { return Vec3.multiplyQbyV(Camera.getOrientation(), Vec3.UNIT_NEG_Z); @@ -53,6 +55,7 @@ strokePoints = [Vec3.ZERO]; strokeNormals = [strokeNormal()]; strokeWidths = [width]; + timeOfLastPoint = Date.now(); entityID = Entities.addEntity({ type: "PolyLine", @@ -88,10 +91,12 @@ } if (distanceToPrevious >= MIN_STROKE_LENGTH + && (Date.now() - timeOfLastPoint) >= MIN_STROKE_INTERVAL && strokePoints.length < MAX_POINTS_PER_LINE) { strokePoints.push(localPosition); strokeNormals.push(strokeNormal()); strokeWidths.push(width); + timeOfLastPoint = Date.now(); Entities.editEntity(entityID, { linePoints: strokePoints, From 2c02b42c967354be7dd559c67e8a0a05768a7d5b Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 18 Feb 2017 14:21:54 +1300 Subject: [PATCH 12/15] Finger paint button icon files --- .../icons/tablet-icons/finger-paint-a.svg | 94 +++++++------------ .../icons/tablet-icons/finger-paint-i.svg | 56 ++++------- scripts/system/fingerPaint.js | 4 +- 3 files changed, 54 insertions(+), 100 deletions(-) diff --git a/interface/resources/icons/tablet-icons/finger-paint-a.svg b/interface/resources/icons/tablet-icons/finger-paint-a.svg index 553636bfbb..acc93608d9 100644 --- a/interface/resources/icons/tablet-icons/finger-paint-a.svg +++ b/interface/resources/icons/tablet-icons/finger-paint-a.svg @@ -10,19 +10,19 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" + id="Layer_1" x="0px" y="0px" viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve" - id="svg2" - inkscape:version="0.91 r13725" - sodipodi:docname="bubble-a.svg">image/svg+xml \ No newline at end of file + d="M18.3,19.6c0.7,0.1,1.2,0.5,1.4,1.1c0.4,1.3,2,5.6,2.4,6.9c2.2,0,7.9,0.1,9.9,0.1c0.2,0,0.6,0,0.8,0.1 c0.5,0.1,0.8,0.4,1.1,0.9c0.1,0.2,0.2,0.4,0.2,0.6c0.8,2.9,0.7,2,1.5,4.9c0.8,3,0.1,5.7-2.3,7.7c-1.9,1.6-3.6,2.3-5.7,1.9 c-0.6-0.1-1.2-0.3-1.8-0.5c-3.6-1.5-7.3-2.9-10.9-4.3c-0.9-0.4-1.4-1.2-1.3-2c0.1-0.9,0.9-1.5,1.8-1.6c0.1,0,0.3,0,0.4,0 c0.2,0,0.4,0.1,0.7,0.2c1.6,0.6,2.6,1.4,4.2,2c0,0,0,0,0,0c0,0,0.1,0,0.2,0c-0.1-0.2-0.1-0.4-0.2-0.6c-1.4-4.9-2.9-9.8-4.3-14.7 c-0.2-0.7-0.3-1.4,0.2-2c0.4-0.6,1-0.8,1.7-0.8C18.2,19.5,18.2,19.5,18.3,19.6 M18.9,16.3c-0.1,0-0.3,0-0.4-0.1 c-1.9-0.2-3.6,0.6-4.7,2.1c-1.5,2-0.9,4.1-0.7,4.8c0.9,3,1.8,6,2.6,9c-0.1,0-0.3,0-0.4,0c-2.5,0-4.6,1.9-5,4.3 c-0.2,1.2,0.1,2.4,0.7,3.4c0.6,1,1.5,1.7,2.7,2.2c1.2,0.5,2.4,0.9,3.6,1.4c2.4,0.9,4.9,1.9,7.3,2.9c0.9,0.4,1.7,0.6,2.5,0.7 c3.9,0.7,6.7-1.2,8.5-2.7c3.4-2.8,4.6-6.7,3.4-11.1c-0.5-1.7-0.6-2.1-0.8-2.7c-0.1-0.4-0.3-1-0.7-2.2c-0.1-0.4-0.2-0.7-0.4-1.1 c-0.7-1.5-1.8-2.5-3.4-2.7c-0.6-0.1-1.2-0.1-1.8-0.1c-1.2,0-3.4,0-5.4,0c-0.6,0-1.3-0.1-1.9-0.1c-0.2-0.6-0.5-1.3-0.7-2 c-0.4-1.1-0.7-2.1-0.9-2.6C22.3,17.9,20.8,16.7,18.9,16.3L18.9,16.3z" + id="path13" + style="fill:#000000;fill-opacity:1" /> \ No newline at end of file diff --git a/interface/resources/icons/tablet-icons/finger-paint-i.svg b/interface/resources/icons/tablet-icons/finger-paint-i.svg index d7c8948e01..b295727d8a 100644 --- a/interface/resources/icons/tablet-icons/finger-paint-i.svg +++ b/interface/resources/icons/tablet-icons/finger-paint-i.svg @@ -1,46 +1,30 @@ - - - - - - - - - - - - - - - + + + + + diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js index ebcdca44b5..725c04f876 100644 --- a/scripts/system/fingerPaint.js +++ b/scripts/system/fingerPaint.js @@ -355,8 +355,8 @@ // Tablet button. button = tablet.addButton({ - icon: "icons/tablet-icons/bubble-i.svg", - activeIcon: "icons/tablet-icons/bubble-a.svg", + icon: "icons/tablet-icons/finger-paint-i.svg", + activeIcon: "icons/tablet-icons/finger-paint-a.svg", text: BUTTON_NAME, isActive: isFingerPainting }); From 692fa52acaa3a8d1debeefa6932bd86907675613 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 18 Feb 2017 15:21:48 +1300 Subject: [PATCH 13/15] Disable drawing pointer lasers while painting --- .../controllers/handControllerPointer.js | 23 +++++++++++++++++-- scripts/system/fingerPaint.js | 8 ++++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/scripts/system/controllers/handControllerPointer.js b/scripts/system/controllers/handControllerPointer.js index 6bebbf0498..f8a336a017 100644 --- a/scripts/system/controllers/handControllerPointer.js +++ b/scripts/system/controllers/handControllerPointer.js @@ -480,6 +480,10 @@ var LASER_SEARCH_COLOR_XYZW = {x: 10 / 255, y: 10 / 255, z: 255 / 255, w: LASER_ var LASER_TRIGGER_COLOR_XYZW = {x: 250 / 255, y: 10 / 255, z: 10 / 255, w: LASER_ALPHA}; var SYSTEM_LASER_DIRECTION = {x: 0, y: 0, z: -1}; var systemLaserOn = false; + +var HIFI_POINTER_DISABLE_MESSAGE_CHANNEL = "Hifi-Pointer-Disable"; +var isPointerEnabled = true; + function clearSystemLaser() { if (!systemLaserOn) { return; @@ -542,9 +546,8 @@ function update() { return off(); } - // If there's a HUD element at the (newly moved) reticle, just make it visible and bail. - if (isPointingAtOverlay(hudPoint2d)) { + if (isPointingAtOverlay(hudPoint2d) && isPointerEnabled) { if (HMD.active) { Reticle.depth = hudReticleDistance(); @@ -579,9 +582,25 @@ function checkSettings() { } checkSettings(); +// Enable/disable pointer. +function handleMessages(channel, message, sender) { + if (sender === MyAvatar.sessionUUID && channel === HIFI_POINTER_DISABLE_MESSAGE_CHANNEL) { + var data = JSON.parse(message); + if (data.pointerEnabled !== undefined) { + print("pointerEnabled: " + data.pointerEnabled); + isPointerEnabled = data.pointerEnabled; + } + } +} + +Messages.subscribe(HIFI_POINTER_DISABLE_MESSAGE_CHANNEL); +Messages.messageReceived.connect(handleMessages); + var settingsChecker = Script.setInterval(checkSettings, SETTINGS_CHANGE_RECHECK_INTERVAL); Script.update.connect(update); Script.scriptEnding.connect(function () { + Messages.unsubscribe(HIFI_POINTER_DISABLE_MESSAGE_CHANNEL); + Messages.messageReceived.disconnect(handleMessages); Script.clearInterval(settingsChecker); Script.update.disconnect(update); OffscreenFlags.navigationFocusDisabled = false; diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js index 725c04f876..4824f777aa 100644 --- a/scripts/system/fingerPaint.js +++ b/scripts/system/fingerPaint.js @@ -20,7 +20,8 @@ CONTROLLER_MAPPING_NAME = "com.highfidelity.fingerPaint", isTabletDisplayed = false, HIFI_POINT_INDEX_MESSAGE_CHANNEL = "Hifi-Point-Index", - HIFI_GRAB_DISABLE_MESSAGE_CHANNEL = "Hifi-Grab-Disable"; + HIFI_GRAB_DISABLE_MESSAGE_CHANNEL = "Hifi-Grab-Disable", + HIFI_POINTER_DISABLE_MESSAGE_CHANNEL = "Hifi-Pointer-Disable"; function paintBrush(name) { // Paints in 3D. @@ -318,6 +319,9 @@ nearGrabEnabled: enabled, farGrabEnabled: enabled })); + Messages.sendMessage(HIFI_POINTER_DISABLE_MESSAGE_CHANNEL, JSON.stringify({ + pointerEnabled: enabled + })); Messages.sendMessage(HIFI_POINT_INDEX_MESSAGE_CHANNEL, JSON.stringify({ pointIndex: !enabled })); @@ -386,6 +390,7 @@ // Messages channels for enabling/disabling other scripts' functions. Messages.subscribe(HIFI_POINT_INDEX_MESSAGE_CHANNEL); Messages.subscribe(HIFI_GRAB_DISABLE_MESSAGE_CHANNEL); + Messages.subscribe(HIFI_POINTER_DISABLE_MESSAGE_CHANNEL); } function tearDown() { @@ -418,6 +423,7 @@ Messages.unsubscribe(HIFI_POINT_INDEX_MESSAGE_CHANNEL); Messages.unsubscribe(HIFI_GRAB_DISABLE_MESSAGE_CHANNEL); + Messages.unssubscribe(HIFI_POINTER_DISABLE_MESSAGE_CHANNEL); } setUp(); From 05c63e16cacd8d601bcb30b038550ee118e81dea Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 18 Feb 2017 20:40:27 +1300 Subject: [PATCH 14/15] Send messages local only --- scripts/system/fingerPaint.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js index 4824f777aa..c5547b40ee 100644 --- a/scripts/system/fingerPaint.js +++ b/scripts/system/fingerPaint.js @@ -318,13 +318,13 @@ holdEnabled: enabled, nearGrabEnabled: enabled, farGrabEnabled: enabled - })); + }), true); Messages.sendMessage(HIFI_POINTER_DISABLE_MESSAGE_CHANNEL, JSON.stringify({ pointerEnabled: enabled - })); + }), true); Messages.sendMessage(HIFI_POINT_INDEX_MESSAGE_CHANNEL, JSON.stringify({ pointIndex: !enabled - })); + }), true); } function onButtonClicked() { From 71ba38afb05c3712b3fc34a52b7851b41ec21fbc Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 18 Feb 2017 21:28:30 +1300 Subject: [PATCH 15/15] Process controller and script updates only when finger painting is on --- scripts/system/fingerPaint.js | 134 +++++++++++++++++----------------- 1 file changed, 68 insertions(+), 66 deletions(-) diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js index c5547b40ee..959f594212 100644 --- a/scripts/system/fingerPaint.js +++ b/scripts/system/fingerPaint.js @@ -13,10 +13,10 @@ button, BUTTON_NAME = "PAINT", isFingerPainting = false, - leftHand, - rightHand, - leftBrush, - rightBrush, + leftHand = null, + rightHand = null, + leftBrush = null, + rightBrush = null, CONTROLLER_MAPPING_NAME = "com.highfidelity.fingerPaint", isTabletDisplayed = false, HIFI_POINT_INDEX_MESSAGE_CHANNEL = "Hifi-Point-Index", @@ -186,7 +186,6 @@ function handController(name) { // Translates controller data into application events. var handName = name, - isEnabled = false, triggerPressedCallback, triggerPressingCallback, @@ -213,10 +212,6 @@ GRIP_OFF = 0.05, GRIP_ON = 0.1; - function setEnabled(enabled) { - isEnabled = enabled; - } - function onTriggerPress(value) { // Controller values are only updated when they change so store latest for use in update. rawTriggerValue = value; @@ -227,10 +222,6 @@ fingerTipPosition, lineWidth; - if (!isEnabled) { - return; - } - triggerValue = triggerValue * TRIGGER_SMOOTH_RATIO + rawTriggerValue * (1.0 - TRIGGER_SMOOTH_RATIO); wasTriggerPressed = isTriggerPressed; @@ -267,10 +258,6 @@ function updateGripPress() { var fingerTipPosition; - if (!isEnabled) { - return; - } - gripValue = gripValue * GRIP_SMOOTH_RATIO + rawGripValue * (1.0 - GRIP_SMOOTH_RATIO); if (isGripPressed) { @@ -301,7 +288,6 @@ } return { - setEnabled: setEnabled, onTriggerPress: onTriggerPress, onGripPress: onGripPress, onUpdate: onUpdate, @@ -327,21 +313,76 @@ }), true); } + function enableProcessing() { + // Connect controller API to handController objects. + leftHand = handController("left"); + rightHand = handController("right"); + var controllerMapping = Controller.newMapping(CONTROLLER_MAPPING_NAME); + controllerMapping.from(Controller.Standard.LT).to(leftHand.onTriggerPress); + controllerMapping.from(Controller.Standard.LeftGrip).to(leftHand.onGripPress); + controllerMapping.from(Controller.Standard.RT).to(rightHand.onTriggerPress); + controllerMapping.from(Controller.Standard.RightGrip).to(rightHand.onGripPress); + Controller.enableMapping(CONTROLLER_MAPPING_NAME); + + // Connect handController outputs to paintBrush objects. + leftBrush = paintBrush("left"); + leftHand.setUp(leftBrush.startLine, leftBrush.drawLine, leftBrush.finishLine, leftBrush.eraseClosestLine); + rightBrush = paintBrush("right"); + rightHand.setUp(rightBrush.startLine, rightBrush.drawLine, rightBrush.finishLine, rightBrush.eraseClosestLine); + + // Messages channels for enabling/disabling other scripts' functions. + Messages.subscribe(HIFI_POINT_INDEX_MESSAGE_CHANNEL); + Messages.subscribe(HIFI_GRAB_DISABLE_MESSAGE_CHANNEL); + Messages.subscribe(HIFI_POINTER_DISABLE_MESSAGE_CHANNEL); + + // Update hand controls. + Script.update.connect(leftHand.onUpdate); + Script.update.connect(rightHand.onUpdate); + } + + function disableProcessing() { + Script.update.disconnect(leftHand.onUpdate); + Script.update.disconnect(rightHand.onUpdate); + + Controller.disableMapping(CONTROLLER_MAPPING_NAME); + + leftBrush.tearDown(); + leftBrush = null; + leftHand.tearDown(); + leftHand = null; + + rightBrush.tearDown(); + rightBrush = null; + rightHand.tearDown(); + rightHand = null; + + Messages.unsubscribe(HIFI_POINT_INDEX_MESSAGE_CHANNEL); + Messages.unsubscribe(HIFI_GRAB_DISABLE_MESSAGE_CHANNEL); + Messages.unsubscribe(HIFI_POINTER_DISABLE_MESSAGE_CHANNEL); + } + function onButtonClicked() { var wasFingerPainting = isFingerPainting; isFingerPainting = !isFingerPainting; button.editProperties({ isActive: isFingerPainting }); - leftHand.setEnabled(isFingerPainting); - rightHand.setEnabled(isFingerPainting); + print("Finger painting: " + isFingerPainting ? "on" : "off"); if (wasFingerPainting) { leftBrush.cancelLine(); rightBrush.cancelLine(); } + if (isFingerPainting) { + enableProcessing(); + } + updateHandFunctions(); + + if (!isFingerPainting) { + disableProcessing(); + } } function onTabletScreenChanged(type, url) { @@ -368,29 +409,6 @@ // Track whether tablet is displayed or not. tablet.screenChanged.connect(onTabletScreenChanged); - - // Connect controller API to handController objects. - leftHand = handController("left"); - rightHand = handController("right"); - var controllerMapping = Controller.newMapping(CONTROLLER_MAPPING_NAME); - controllerMapping.from(Controller.Standard.LT).to(leftHand.onTriggerPress); - controllerMapping.from(Controller.Standard.LeftGrip).to(leftHand.onGripPress); - controllerMapping.from(Controller.Standard.RT).to(rightHand.onTriggerPress); - controllerMapping.from(Controller.Standard.RightGrip).to(rightHand.onGripPress); - Controller.enableMapping(CONTROLLER_MAPPING_NAME); - Script.update.connect(leftHand.onUpdate); - Script.update.connect(rightHand.onUpdate); - - // Connect handController outputs to paintBrush objects. - leftBrush = paintBrush("left"); - leftHand.setUp(leftBrush.startLine, leftBrush.drawLine, leftBrush.finishLine, leftBrush.eraseClosestLine); - rightBrush = paintBrush("right"); - rightHand.setUp(rightBrush.startLine, rightBrush.drawLine, rightBrush.finishLine, rightBrush.eraseClosestLine); - - // Messages channels for enabling/disabling other scripts' functions. - Messages.subscribe(HIFI_POINT_INDEX_MESSAGE_CHANNEL); - Messages.subscribe(HIFI_GRAB_DISABLE_MESSAGE_CHANNEL); - Messages.subscribe(HIFI_POINTER_DISABLE_MESSAGE_CHANNEL); } function tearDown() { @@ -398,32 +416,16 @@ return; } - Script.update.disconnect(leftHand.onUpdate); - Script.update.disconnect(rightHand.onUpdate); - - isFingerPainting = false; - updateHandFunctions(); - - button.clicked.disconnect(onButtonClicked); - tablet.removeButton(button); + if (isFingerPainting) { + isFingerPainting = false; + updateHandFunctions(); + disableProcessing(); + } tablet.screenChanged.disconnect(onTabletScreenChanged); - Controller.disableMapping(CONTROLLER_MAPPING_NAME); - - leftBrush.tearDown(); - leftBrush = null; - leftHand.tearDown(); - leftHand = null; - - rightBrush.tearDown(); - rightBrush = null; - rightHand.tearDown(); - rightHand = null; - - Messages.unsubscribe(HIFI_POINT_INDEX_MESSAGE_CHANNEL); - Messages.unsubscribe(HIFI_GRAB_DISABLE_MESSAGE_CHANNEL); - Messages.unssubscribe(HIFI_POINTER_DISABLE_MESSAGE_CHANNEL); + button.clicked.disconnect(onButtonClicked); + tablet.removeButton(button); } setUp();