History

include release message

druiz17 committed 9 years ago

Commit e77ac9f1 parent b1052484 files · +23 −0Browse files

Showing the changes to scripts/system/controllers/controllerModules (4 of 4 files). Show all

Unified · Split

4 files
  1. scripts/system/controllers/controllerModules/equipEntity.js +6 −0
  2. scripts/system/controllers/controllerModules/nearActionGrabEntity.js +6 −0
  3. scripts/system/controllers/controllerModules/nearParentGrabEntity.js +5 −0
  4. scripts/system/controllers/controllerModules/nearParentGrabOverlay.js +6 −0
scripts/system/controllers/controllerModules/equipEntity.js+6−0
@@ -546,6 +546,12 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa · 545 unmodified lines
546546 var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
547547 Entities.callEntityMethod(this.targetEntityID, "releaseEquip", args);
548548
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+
549555 ensureDynamic(this.targetEntityID);
550556 this.targetEntityID = null;
551557 this.messageGrabEntity = false;
scripts/system/controllers/controllerModules/nearActionGrabEntity.js+6−0
@@ -144,6 +144,12 @@ Script.include("/~/system/libraries/cloneEntityUtils.js"); · 143 unmodified lines
144144 Entities.deleteAction(this.targetEntityID, this.actionID);
145145 this.actionID = null;
146146
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+
147153 this.targetEntityID = null;
148154 };
149155
scripts/system/controllers/controllerModules/nearParentGrabEntity.js+5−0
@@ -138,6 +138,11 @@ Script.include("/~/system/libraries/cloneEntityUtils.js"); · 137 unmodified lines
138138
139139 var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
140140 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+ }));
141146 this.grabbing = false;
142147 this.targetEntityID = null;
143148 };
scripts/system/controllers/controllerModules/nearParentGrabOverlay.js+6−0
@@ -148,6 +148,12 @@ Script.include("/~/system/libraries/utils.js"); · 147 unmodified lines
148148 }
149149 }
150150
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+
151157 this.grabbedThingID = null;
152158 };
153159

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t