From 5b36449edd24d9c1ea5a462909dc32d463d8bc9e Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Fri, 22 Jun 2018 09:54:25 -0700 Subject: [PATCH 1/2] allowing grabbing of collisionless entities --- scripts/system/controllers/grab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/controllers/grab.js b/scripts/system/controllers/grab.js index a835373e4d..88e19a419f 100644 --- a/scripts/system/controllers/grab.js +++ b/scripts/system/controllers/grab.js @@ -270,7 +270,7 @@ function Grabber() { var renderStates = [{name: "grabbed", end: beacon}]; this.mouseRayEntities = Pointers.createPointer(PickType.Ray, { joint: "Mouse", - filter: Picks.PICK_ENTITIES, + filter: Picks.PICK_ENTITIES | Picks.PICK_INCLUDE_NONCOLLIDABLE, faceAvatar: true, scaleWithAvatar: true, enabled: true, From 1239472f2d332154d708dcb4e402c7a521e50d96 Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Fri, 22 Jun 2018 11:35:01 -0700 Subject: [PATCH 2/2] adding line for allowing grabbing of collisionless overlays --- scripts/system/controllers/grab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/controllers/grab.js b/scripts/system/controllers/grab.js index 88e19a419f..ba973f0108 100644 --- a/scripts/system/controllers/grab.js +++ b/scripts/system/controllers/grab.js @@ -260,7 +260,7 @@ function Grabber() { this.mouseRayOverlays = Picks.createPick(PickType.Ray, { joint: "Mouse", - filter: Picks.PICK_OVERLAYS, + filter: Picks.PICK_OVERLAYS | Picks.PICK_INCLUDE_NONCOLLIDABLE, enabled: true }); var tabletItems = getMainTabletIDs();