From 1009182c06e1a63db3f52327fdd7c49206c0c523 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 14 Apr 2017 11:52:07 -0700 Subject: [PATCH] grab and handControllerGrab use new far-grab action --- scripts/system/controllers/grab.js | 2 +- scripts/system/controllers/handControllerGrab.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/system/controllers/grab.js b/scripts/system/controllers/grab.js index 10f477b3af..811799917d 100644 --- a/scripts/system/controllers/grab.js +++ b/scripts/system/controllers/grab.js @@ -529,7 +529,7 @@ Grabber.prototype.moveEvent = function(event) { if (!this.actionID) { if (!entityIsGrabbedByOther(this.entityID)) { - this.actionID = Entities.addAction("spring", this.entityID, actionArgs); + this.actionID = Entities.addAction("far-grab", this.entityID, actionArgs); } } else { Entities.updateAction(this.entityID, this.actionID, actionArgs); diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js index 0dfe64bbaa..fc16d7d1c5 100644 --- a/scripts/system/controllers/handControllerGrab.js +++ b/scripts/system/controllers/handControllerGrab.js @@ -2527,7 +2527,7 @@ function MyController(hand) { var timeScale = this.distanceGrabTimescale(this.mass, distanceToObject); this.actionID = NULL_UUID; - this.actionID = Entities.addAction("spring", this.grabbedThingID, { + this.actionID = Entities.addAction("far-grab", this.grabbedThingID, { targetPosition: this.currentObjectPosition, linearTimeScale: timeScale, targetRotation: this.currentObjectRotation,