Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 00:44:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12980 from dback2/desktopEquip

Browse source 
Desktop equip - deleted/cleared entities fix
This commit is contained in:
John Conklin II 2018-04-25 11:35:04 -07:00 committed by GitHub
commit eef3bc2df5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
scripts/system/controllers/controllerModules/equipEntity.js
View file

@ -838,11 +838,31 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
} }
}; };
var deleteEntity = function(entityID) {
if (rightEquipEntity.targetEntityID === entityID) {
rightEquipEntity.endEquipEntity();
}
if (leftEquipEntity.targetEntityID === entityID) {
leftEquipEntity.endEquipEntity();
}
};
var clearEntities = function() {
if (rightEquipEntity.targetEntityID) {
rightEquipEntity.endEquipEntity();
}
if (leftEquipEntity.targetEntityID) {
leftEquipEntity.endEquipEntity();
}
};
Messages.subscribe('Hifi-Hand-Grab'); Messages.subscribe('Hifi-Hand-Grab');
Messages.subscribe('Hifi-Hand-Drop'); Messages.subscribe('Hifi-Hand-Drop');
Messages.messageReceived.connect(handleMessage); Messages.messageReceived.connect(handleMessage);
Controller.mousePressEvent.connect(onMousePress); Controller.mousePressEvent.connect(onMousePress);
Controller.keyPressEvent.connect(onKeyPress); Controller.keyPressEvent.connect(onKeyPress);
Entities.deletingEntity.connect(deleteEntity);
Entities.clearingEntities.connect(clearEntities);
var leftEquipEntity = new EquipEntity(LEFT_HAND); var leftEquipEntity = new EquipEntity(LEFT_HAND);
var rightEquipEntity = new EquipEntity(RIGHT_HAND); var rightEquipEntity = new EquipEntity(RIGHT_HAND);
@ -859,6 +879,8 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
Messages.messageReceived.disconnect(handleMessage); Messages.messageReceived.disconnect(handleMessage);
Controller.mousePressEvent.disconnect(onMousePress); Controller.mousePressEvent.disconnect(onMousePress);
Controller.keyPressEvent.disconnect(onKeyPress); Controller.keyPressEvent.disconnect(onKeyPress);
Entities.deletingEntity.disconnect(deleteEntity);
Entities.clearingEntities.disconnect(clearEntities);
} }
Script.scriptEnding.connect(cleanup); Script.scriptEnding.connect(cleanup);
}()); }());