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

Merge pull request #13441 from wayne-chen/collisionlessGrab-case-12661

Browse source 
Fixing collisionless grabbing
This commit is contained in:
John Conklin II 2018-06-26 13:05:25 -07:00 committed by GitHub
commit 47f907f44e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/system/controllers/grab.js
View file

@ -260,7 +260,7 @@ function Grabber() {
this.mouseRayOverlays = Picks.createPick(PickType.Ray, { this.mouseRayOverlays = Picks.createPick(PickType.Ray, {
joint: "Mouse", joint: "Mouse",
filter: Picks.PICK_OVERLAYS, filter: Picks.PICK_OVERLAYS | Picks.PICK_INCLUDE_NONCOLLIDABLE,
enabled: true enabled: true
}); });
var tabletItems = getMainTabletIDs(); var tabletItems = getMainTabletIDs();
@ -270,7 +270,7 @@ function Grabber() {
var renderStates = [{name: "grabbed", end: beacon}]; var renderStates = [{name: "grabbed", end: beacon}];
this.mouseRayEntities = Pointers.createPointer(PickType.Ray, { this.mouseRayEntities = Pointers.createPointer(PickType.Ray, {
joint: "Mouse", joint: "Mouse",
filter: Picks.PICK_ENTITIES, filter: Picks.PICK_ENTITIES | Picks.PICK_INCLUDE_NONCOLLIDABLE,
faceAvatar: true, faceAvatar: true,
scaleWithAvatar: true, scaleWithAvatar: true,
enabled: true, enabled: true,