Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 15:49:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

missing reset flag on end equip, remove mouseEquip check on unequip via U

Browse source
This commit is contained in:
unknown 2018-04-17 16:13:10 -07:00 committed by David Back
parent a869b58dfb
commit 3a35fa1c08
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -579,6 +579,7 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
this.targetEntityID = null; this.targetEntityID = null;
this.messageGrabEntity = false; this.messageGrabEntity = false;
this.grabEntityProps = null; this.grabEntityProps = null;
this.mouseEquip = false;
}; };
this.updateInputs = function (controllerData) { this.updateInputs = function (controllerData) {
@ -796,7 +797,7 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
if (intersection.intersects) { if (intersection.intersects) {
var entityProperties = Entities.getEntityProperties(intersection.entityID, DISPATCHER_PROPERTIES); var entityProperties = Entities.getEntityProperties(intersection.entityID, DISPATCHER_PROPERTIES);
if (entityProperties.parentID === EMPTY_PARENT_ID) { if (entityProperties.parentID === EMPTY_PARENT_ID) {
entityProperties.id = intersection.entityID; entityProperties.id = intersection.entityID;
var rightHandPosition = MyAvatar.getJointPosition("RightHand"); var rightHandPosition = MyAvatar.getJointPosition("RightHand");
var leftHandPosition = MyAvatar.getJointPosition("LeftHand"); var leftHandPosition = MyAvatar.getJointPosition("LeftHand");
var distanceToRightHand = Vec3.distance(entityProperties.position, rightHandPosition); var distanceToRightHand = Vec3.distance(entityProperties.position, rightHandPosition);
@ -819,10 +820,10 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
var onKeyPress = function(event) { var onKeyPress = function(event) {
if (event.text === UNEQUIP_KEY) { if (event.text === UNEQUIP_KEY) {
if (rightEquipEntity.mouseEquip) { if (rightEquipEntity.targetEntityID) {
rightEquipEntity.endEquipEntity(); rightEquipEntity.endEquipEntity();
} }
if (leftEquipEntity.mouseEquip) { if (leftEquipEntity.targetEntityID) {
leftEquipEntity.endEquipEntity(); leftEquipEntity.endEquipEntity();
} }
} }