From d66038fff2823f22613004513aa13c3bf479ca1d Mon Sep 17 00:00:00 2001 From: kunalgosar Date: Tue, 21 Mar 2017 16:37:51 -0700 Subject: [PATCH 1/4] press B to exit finger painting --- scripts/system/fingerPaint.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js index 27206ef9fa..3c44014890 100644 --- a/scripts/system/fingerPaint.js +++ b/scripts/system/fingerPaint.js @@ -328,6 +328,7 @@ controllerMapping.from(Controller.Standard.LeftGrip).to(leftHand.onGripPress); controllerMapping.from(Controller.Standard.RT).to(rightHand.onTriggerPress); controllerMapping.from(Controller.Standard.RightGrip).to(rightHand.onGripPress); + controllerMapping.from(Controller.Standard.B).to(onButtonClicked); Controller.enableMapping(CONTROLLER_MAPPING_NAME); // Connect handController outputs to paintBrush objects. From b8500e45adb4e18b73bae46688ff4613810da91b Mon Sep 17 00:00:00 2001 From: kunalgosar Date: Tue, 4 Apr 2017 15:02:52 -0700 Subject: [PATCH 2/4] added tutorial --- scripts/system/fingerPaint.js | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js index 3c44014890..9ceec46fb3 100644 --- a/scripts/system/fingerPaint.js +++ b/scripts/system/fingerPaint.js @@ -23,6 +23,7 @@ HIFI_POINT_INDEX_MESSAGE_CHANNEL = "Hifi-Point-Index", HIFI_GRAB_DISABLE_MESSAGE_CHANNEL = "Hifi-Grab-Disable", HIFI_POINTER_DISABLE_MESSAGE_CHANNEL = "Hifi-Pointer-Disable"; + HOW_TO_EXIT_MESSAGE = "Press B on your controller to exit FingerPainting mode"; function paintBrush(name) { // Paints in 3D. @@ -319,6 +320,15 @@ } } + function howToExitTutorial() { + HMD.requestShowHandControllers(); + setControllerPartLayer('button_b', 'highlight'); + Window.alert(HOW_TO_EXIT_MESSAGE); + setControllerPartLayer('button_b', 'blank'); + HMD.requestHideHandControllers(); + Settings.setValue("FingerPaintTutorialComplete", true); + } + function enableProcessing() { // Connect controller API to handController objects. leftHand = handController("left"); @@ -330,6 +340,10 @@ controllerMapping.from(Controller.Standard.RightGrip).to(rightHand.onGripPress); controllerMapping.from(Controller.Standard.B).to(onButtonClicked); Controller.enableMapping(CONTROLLER_MAPPING_NAME); + + if (!Settings.getValue("FingerPaintTutorialComplete")) { + howToExitTutorial(); + } // Connect handController outputs to paintBrush objects. leftBrush = paintBrush("left"); @@ -434,6 +448,17 @@ button.clicked.disconnect(onButtonClicked); tablet.removeButton(button); } + + /** + * A controller in made up of parts, and each part can have multiple "layers," + * which are really just different texures. For example, the "trigger" part + * has "normal" and "highlight" layers. + */ + function setControllerPartLayer(part, layer) { + data = {}; + data[part] = layer; + Messages.sendLocalMessage('Controller-Set-Part-Layer', JSON.stringify(data)); + } setUp(); Script.scriptEnding.connect(tearDown); From a5b10cc51eac56b76b60d07c084665d8f8c51fc7 Mon Sep 17 00:00:00 2001 From: kunalgosar Date: Tue, 4 Apr 2017 15:34:56 -0700 Subject: [PATCH 3/4] alert window to give directions --- scripts/system/fingerPaint.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js index 9ceec46fb3..ec3c8af3d9 100644 --- a/scripts/system/fingerPaint.js +++ b/scripts/system/fingerPaint.js @@ -323,7 +323,7 @@ function howToExitTutorial() { HMD.requestShowHandControllers(); setControllerPartLayer('button_b', 'highlight'); - Window.alert(HOW_TO_EXIT_MESSAGE); + messageWindow = Window.alert(HOW_TO_EXIT_MESSAGE); setControllerPartLayer('button_b', 'blank'); HMD.requestHideHandControllers(); Settings.setValue("FingerPaintTutorialComplete", true); From 891d52909e5fcca4bf1dfc65f5af7032a4b21303 Mon Sep 17 00:00:00 2001 From: kunalgosar Date: Fri, 14 Apr 2017 14:10:19 -0700 Subject: [PATCH 4/4] fixed typo in comments --- scripts/system/fingerPaint.js | 2 +- tutorial/tutorial.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js index ec3c8af3d9..88245503e8 100644 --- a/scripts/system/fingerPaint.js +++ b/scripts/system/fingerPaint.js @@ -450,7 +450,7 @@ } /** - * A controller in made up of parts, and each part can have multiple "layers," + * A controller is made up of parts, and each part can have multiple "layers," * which are really just different texures. For example, the "trigger" part * has "normal" and "highlight" layers. */ diff --git a/tutorial/tutorial.js b/tutorial/tutorial.js index 26fa51e896..97528b9b3b 100644 --- a/tutorial/tutorial.js +++ b/tutorial/tutorial.js @@ -118,7 +118,7 @@ function findEntitiesWithTag(tag) { } /** - * A controller in made up of parts, and each part can have multiple "layers," + * A controller is made up of parts, and each part can have multiple "layers," * which are really just different texures. For example, the "trigger" part * has "normal" and "highlight" layers. */