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

Merge pull request #6321 from sethalves/fix-whiteboard

Browse source 
whiteboard fixes
This commit is contained in:
Ryan Downe Karpf 2015-11-05 13:28:21 -08:00
commit c6c578e48c
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/controllers/handControllerGrab.js
View file

@ -455,6 +455,10 @@ function MyController(hand) {
continue; continue;
} }
if (propsForCandidate.type == 'PolyLine') {
continue;
}
if (propsForCandidate.type == 'Zone') { if (propsForCandidate.type == 'Zone') {
continue; continue;
} }

12
examples/painting/whiteboard/whiteboardSpawner.js
View file

@ -75,8 +75,8 @@ var drawingSurface = Entities.addEntity({
color: { color: {
currentColor: colors[0] currentColor: colors[0]
}, },
"grabbableKey": { grabbableKey: {
wantsTrigger:true wantsTrigger: true
} }
}) })
@ -156,7 +156,10 @@ function setUp() {
color: { color: {
currentColor: colors[0] currentColor: colors[0]
}, },
colorIndicator: colorIndicatorBox colorIndicator: colorIndicatorBox,
grabbableKey: {
wantsTrigger: true
}
}) })
}); });
@ -189,7 +192,8 @@ function setUp() {
script: scriptURL, script: scriptURL,
userData: JSON.stringify({ userData: JSON.stringify({
whiteboard: drawingSurface, whiteboard: drawingSurface,
colorIndicator: colorIndicatorBox colorIndicator: colorIndicatorBox,
grabbableKey: {wantsTrigger: true}
}) })
}); });
colorBoxes.push(colorBox); colorBoxes.push(colorBox);