Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 03:58:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix far grabbing collisionless entity removing collisionless property

Browse source
This commit is contained in:
David Rowe 2018-10-13 10:22:27 +13:00
parent ca4fe0682e
commit 3bc4581f82
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/system/controllers/controllerModules/farActionGrabEntity.js
View file

@ -102,7 +102,6 @@ Script.include("/~/system/libraries/Xform.js");
this.potentialEntityWithContextOverlay = false; this.potentialEntityWithContextOverlay = false;
this.entityWithContextOverlay = false; this.entityWithContextOverlay = false;
this.contextOverlayTimer = false; this.contextOverlayTimer = false;
this.previousCollisionStatus = false;
this.locked = false; this.locked = false;
this.highlightedEntity = null; this.highlightedEntity = null;
this.reticleMinX = MARGIN; this.reticleMinX = MARGIN;
@ -490,7 +489,8 @@ Script.include("/~/system/libraries/Xform.js");
var targetProps = Entities.getEntityProperties(entityID, [ var targetProps = Entities.getEntityProperties(entityID, [
"dynamic", "shapeType", "position", "dynamic", "shapeType", "position",
"rotation", "dimensions", "density", "rotation", "dimensions", "density",
"userData", "locked", "type", "href" "userData", "locked", "type", "href",
"collisionless"
]); ]);
if (targetProps.href !== "") { if (targetProps.href !== "") {
AddressManager.handleLookupString(targetProps.href); AddressManager.handleLookupString(targetProps.href);
@ -543,7 +543,8 @@ Script.include("/~/system/libraries/Xform.js");
var selectionTargetProps = Entities.getEntityProperties(targetEntityID, [ var selectionTargetProps = Entities.getEntityProperties(targetEntityID, [
"dynamic", "shapeType", "position", "dynamic", "shapeType", "position",
"rotation", "dimensions", "density", "rotation", "dimensions", "density",
"userData", "locked", "type", "href" "userData", "locked", "type", "href",
"collisionless"
]); ]);
var selectionTargetObject = new TargetObject(targetEntityID, selectionTargetProps); var selectionTargetObject = new TargetObject(targetEntityID, selectionTargetProps);