From c4194f23597850945b68b81d3a17b729d49200b4 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 5 Nov 2015 13:26:23 -0800 Subject: [PATCH] don't try to grab polylines. set wantTrigger on various whiteboard parts --- examples/controllers/handControllerGrab.js | 4 ++++ examples/painting/whiteboard/whiteboardSpawner.js | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/examples/controllers/handControllerGrab.js b/examples/controllers/handControllerGrab.js index 6ea08e5a43..5035f2e5a4 100644 --- a/examples/controllers/handControllerGrab.js +++ b/examples/controllers/handControllerGrab.js @@ -455,6 +455,10 @@ function MyController(hand) { continue; } + if (propsForCandidate.type == 'PolyLine') { + continue; + } + if (propsForCandidate.type == 'Zone') { continue; } diff --git a/examples/painting/whiteboard/whiteboardSpawner.js b/examples/painting/whiteboard/whiteboardSpawner.js index 3411061074..53bb7158d5 100644 --- a/examples/painting/whiteboard/whiteboardSpawner.js +++ b/examples/painting/whiteboard/whiteboardSpawner.js @@ -75,8 +75,8 @@ var drawingSurface = Entities.addEntity({ color: { currentColor: colors[0] }, - "grabbableKey": { - wantsTrigger:true + grabbableKey: { + wantsTrigger: true } }) @@ -156,7 +156,10 @@ function setUp() { color: { currentColor: colors[0] }, - colorIndicator: colorIndicatorBox + colorIndicator: colorIndicatorBox, + grabbableKey: { + wantsTrigger: true + } }) }); @@ -189,7 +192,8 @@ function setUp() { script: scriptURL, userData: JSON.stringify({ whiteboard: drawingSurface, - colorIndicator: colorIndicatorBox + colorIndicator: colorIndicatorBox, + grabbableKey: {wantsTrigger: true} }) }); colorBoxes.push(colorBox);