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

fix tabs

Browse source
This commit is contained in:
David Back 2018-06-06 17:35:25 -07:00
parent 048872c79a
commit 0ee55a09b6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -274,7 +274,7 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
this.equipedWithSecondary = false; this.equipedWithSecondary = false;
this.handHasBeenRightsideUp = false; this.handHasBeenRightsideUp = false;
this.mouseEquip = false; this.mouseEquip = false;
this.messageEquip = false; this.messageEquip = false;
this.parameters = makeDispatcherModuleParameters( this.parameters = makeDispatcherModuleParameters(
300, 300,
@ -585,7 +585,7 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
this.messageGrabEntity = false; this.messageGrabEntity = false;
this.grabEntityProps = null; this.grabEntityProps = null;
this.mouseEquip = false; this.mouseEquip = false;
this.messageEquip = false; this.messageEquip = false;
}; };
this.updateInputs = function (controllerData) { this.updateInputs = function (controllerData) {
@ -763,7 +763,7 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
var equipModule = (data.hand === "left") ? leftEquipEntity : rightEquipEntity; var equipModule = (data.hand === "left") ? leftEquipEntity : rightEquipEntity;
var entityProperties = Entities.getEntityProperties(data.entityID, DISPATCHER_PROPERTIES); var entityProperties = Entities.getEntityProperties(data.entityID, DISPATCHER_PROPERTIES);
entityProperties.id = data.entityID; entityProperties.id = data.entityID;
equipModule.messageEquip = true; equipModule.messageEquip = true;
equipModule.setMessageGrabData(entityProperties); equipModule.setMessageGrabData(entityProperties);
} catch (e) { } catch (e) {
print("WARNING: equipEntity.js -- error parsing Hifi-Hand-Grab message: " + message); print("WARNING: equipEntity.js -- error parsing Hifi-Hand-Grab message: " + message);
@ -815,12 +815,12 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
if (rightHandAvailable && (distanceToRightHand < distanceToLeftHand || !leftHandAvailable)) { if (rightHandAvailable && (distanceToRightHand < distanceToLeftHand || !leftHandAvailable)) {
// clear any existing grab actions on the entity now (their later removal could affect bootstrapping flags) // clear any existing grab actions on the entity now (their later removal could affect bootstrapping flags)
clearGrabActions(entityID); clearGrabActions(entityID);
rightEquipEntity.mouseEquip = true; rightEquipEntity.mouseEquip = true;
rightEquipEntity.setMessageGrabData(entityProperties); rightEquipEntity.setMessageGrabData(entityProperties);
} else if (leftHandAvailable && (distanceToLeftHand < distanceToRightHand || !rightHandAvailable)) { } else if (leftHandAvailable && (distanceToLeftHand < distanceToRightHand || !rightHandAvailable)) {
// clear any existing grab actions on the entity now (their later removal could affect bootstrapping flags) // clear any existing grab actions on the entity now (their later removal could affect bootstrapping flags)
clearGrabActions(entityID); clearGrabActions(entityID);
leftEquipEntity.mouseEquip = true; leftEquipEntity.mouseEquip = true;
leftEquipEntity.setMessageGrabData(entityProperties); leftEquipEntity.setMessageGrabData(entityProperties);
} }
} }