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

oops

Browse source
This commit is contained in:
Seth Alves 2017-09-21 11:16:00 -07:00
parent 363a2a3a7a
commit 24bfb3f3b9
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/system/controllers/controllerModules/nearParentGrabEntity.js
View file

@ -301,7 +301,6 @@ Script.include("/~/system/libraries/cloneEntityUtils.js");
var worldEntityProps = controllerData.nearbyEntityProperties[this.hand]; var worldEntityProps = controllerData.nearbyEntityProperties[this.hand];
var cloneID = cloneEntity(targetProps, worldEntityProps); var cloneID = cloneEntity(targetProps, worldEntityProps);
var cloneProps = controllerData.nearbyEntityPropertiesByID[cloneID]; var cloneProps = controllerData.nearbyEntityPropertiesByID[cloneID];
this.grabbing = true; this.grabbing = true;
this.targetEntityID = cloneID; this.targetEntityID = cloneID;
this.startNearParentingGrabEntity(controllerData, cloneProps); this.startNearParentingGrabEntity(controllerData, cloneProps);

2
scripts/system/libraries/controllerDispatcherUtils.js
View file

@ -361,7 +361,7 @@ if (typeof module !== 'undefined') {
LEFT_HAND: LEFT_HAND, LEFT_HAND: LEFT_HAND,
RIGHT_HAND: RIGHT_HAND, RIGHT_HAND: RIGHT_HAND,
BUMPER_ON_VALUE: BUMPER_ON_VALUE, BUMPER_ON_VALUE: BUMPER_ON_VALUE,
TEAR_AWAY_DISTANCE: TEAR_AWAY_DISTANCE TEAR_AWAY_DISTANCE: TEAR_AWAY_DISTANCE,
projectOntoOverlayXYPlane: projectOntoOverlayXYPlane, projectOntoOverlayXYPlane: projectOntoOverlayXYPlane,
projectOntoEntityXYPlane: projectOntoEntityXYPlane projectOntoEntityXYPlane: projectOntoEntityXYPlane
}; };