include release message to controller modules
Showing the changes to scripts/system/controllers/controllerModules (4 of 4 files). Show all
Unified · Split
| @@ -546,6 +546,12 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa · 545 unmodified lines | |||
| 546 | var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID]; | 546 | var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID]; |
| 547 | Entities.callEntityMethod(this.targetEntityID, "releaseEquip", args); | 547 | Entities.callEntityMethod(this.targetEntityID, "releaseEquip", args); |
| 548 | 548 | ||
| 549 | Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({ | ||
| 550 | action: 'release', | ||
| 551 | grabbedEntity: this.targetEntityID, | ||
| 552 | joint: this.hand === RIGHT_HAND ? "RightHand" : "LeftHand" | ||
| 553 | })); | ||
| 554 | |||
| 549 | ensureDynamic(this.targetEntityID); | 555 | ensureDynamic(this.targetEntityID); |
| 550 | this.targetEntityID = null; | 556 | this.targetEntityID = null; |
| 551 | this.messageGrabEntity = false; | 557 | this.messageGrabEntity = false; |
| @@ -144,6 +144,12 @@ Script.include("/~/system/libraries/cloneEntityUtils.js"); · 143 unmodified lines | |||
| 144 | Entities.deleteAction(this.targetEntityID, this.actionID); | 144 | Entities.deleteAction(this.targetEntityID, this.actionID); |
| 145 | this.actionID = null; | 145 | this.actionID = null; |
| 146 | 146 | ||
| 147 | Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({ | ||
| 148 | action: 'release', | ||
| 149 | grabbedEntity: this.targetEntityID, | ||
| 150 | joint: this.hand === RIGHT_HAND ? "RightHand" : "LeftHand" | ||
| 151 | })); | ||
| 152 | |||
| 147 | this.targetEntityID = null; | 153 | this.targetEntityID = null; |
| 148 | }; | 154 | }; |
| 149 | 155 | ||
| @@ -138,6 +138,11 @@ Script.include("/~/system/libraries/cloneEntityUtils.js"); · 137 unmodified lines | |||
| 138 | 138 | ||
| 139 | var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID]; | 139 | var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID]; |
| 140 | Entities.callEntityMethod(this.targetEntityID, "releaseGrab", args); | 140 | Entities.callEntityMethod(this.targetEntityID, "releaseGrab", args); |
| 141 | Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({ | ||
| 142 | action: 'release', | ||
| 143 | grabbedEntity: this.targetEntityID, | ||
| 144 | joint: this.hand === RIGHT_HAND ? "RightHand" : "LeftHand" | ||
| 145 | })); | ||
| 141 | this.grabbing = false; | 146 | this.grabbing = false; |
| 142 | this.targetEntityID = null; | 147 | this.targetEntityID = null; |
| 143 | }; | 148 | }; |
| @@ -148,6 +148,12 @@ Script.include("/~/system/libraries/utils.js"); · 147 unmodified lines | |||
| 148 | } | 148 | } |
| 149 | } | 149 | } |
| 150 | 150 | ||
| 151 | Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({ | ||
| 152 | action: 'release', | ||
| 153 | grabbedEntity: this.grabbedThingID, | ||
| 154 | joint: this.hand === RIGHT_HAND ? "RightHand" : "LeftHand" | ||
| 155 | })); | ||
| 156 | |||
| 151 | this.grabbedThingID = null; | 157 | this.grabbedThingID = null; |
| 152 | }; | 158 | }; |
| 153 | 159 | ||