Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-28 00:11:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13322 from dback2/fixEquipMessage

Browse source 
Fix Hifi-Grab-Hand message for equipping
This commit is contained in:
John Conklin II 2018-06-11 13:16:39 -07:00 committed by GitHub
commit 9db71fb40d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -273,7 +273,6 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
this.shouldSendStart = false; this.shouldSendStart = false;
this.equipedWithSecondary = false; this.equipedWithSecondary = false;
this.handHasBeenRightsideUp = false; this.handHasBeenRightsideUp = false;
this.mouseEquip = false;
this.parameters = makeDispatcherModuleParameters( this.parameters = makeDispatcherModuleParameters(
300, 300,
@ -283,11 +282,10 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
var equipHotspotBuddy = new EquipHotspotBuddy(); var equipHotspotBuddy = new EquipHotspotBuddy();
this.setMessageGrabData = function(entityProperties, mouseEquip) { this.setMessageGrabData = function(entityProperties) {
if (entityProperties) { if (entityProperties) {
this.messageGrabEntity = true; this.messageGrabEntity = true;
this.grabEntityProps = entityProperties; this.grabEntityProps = entityProperties;
this.mouseEquip = mouseEquip;
} }
}; };
@ -584,7 +582,6 @@ 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) {
@ -630,14 +627,12 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
// if the potentialHotspot is cloneable, clone it and return it // if the potentialHotspot is cloneable, clone it and return it
// if the potentialHotspot os not cloneable and locked return null // if the potentialHotspot os not cloneable and locked return null
if (potentialEquipHotspot && if (potentialEquipHotspot &&
(((this.triggerSmoothedSqueezed() || this.secondarySmoothedSqueezed()) && !this.waitForTriggerRelease) || (((this.triggerSmoothedSqueezed() || this.secondarySmoothedSqueezed()) && !this.waitForTriggerRelease) ||
this.messageGrabEntity)) { this.messageGrabEntity)) {
this.grabbedHotspot = potentialEquipHotspot; this.grabbedHotspot = potentialEquipHotspot;
this.targetEntityID = this.grabbedHotspot.entityID; this.targetEntityID = this.grabbedHotspot.entityID;
this.startEquipEntity(controllerData); this.startEquipEntity(controllerData);
this.messageGrabEntity = false;
this.equipedWithSecondary = this.secondarySmoothedSqueezed(); this.equipedWithSecondary = this.secondarySmoothedSqueezed();
return makeRunningValues(true, [potentialEquipHotspot.entityID], []); return makeRunningValues(true, [potentialEquipHotspot.entityID], []);
} else { } else {
@ -661,7 +656,7 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
var timestamp = Date.now(); var timestamp = Date.now();
this.updateInputs(controllerData); this.updateInputs(controllerData);
if (!this.mouseEquip && !this.isTargetIDValid(controllerData)) { if (!this.messageGrabEntity && !this.isTargetIDValid(controllerData)) {
this.endEquipEntity(); this.endEquipEntity();
return makeRunningValues(false, [], []); return makeRunningValues(false, [], []);
} }
@ -762,9 +757,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;
var mouseEquip = false; equipModule.setMessageGrabData(entityProperties);
equipModule.setMessageGrabData(entityProperties, mouseEquip);
} 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);
} }
@ -812,15 +805,14 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
var distanceToLeftHand = Vec3.distance(entityProperties.position, leftHandPosition); var distanceToLeftHand = Vec3.distance(entityProperties.position, leftHandPosition);
var leftHandAvailable = leftEquipEntity.targetEntityID === null; var leftHandAvailable = leftEquipEntity.targetEntityID === null;
var rightHandAvailable = rightEquipEntity.targetEntityID === null; var rightHandAvailable = rightEquipEntity.targetEntityID === null;
var mouseEquip = true;
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.setMessageGrabData(entityProperties, mouseEquip); 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.setMessageGrabData(entityProperties, mouseEquip); leftEquipEntity.setMessageGrabData(entityProperties);
} }
} }
} }