Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 03:09:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing Hifi-Hand-Drop for equipEntity

Browse source
This commit is contained in:
druiz17 2017-09-06 17:15:05 -07:00
parent 0d66bfca05
commit cc7a222374
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -492,6 +492,7 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
localPosition: this.offsetPosition,
localRotation: this.offsetRotation
};
var isClone = false;
if (entityIsCloneable(grabbedProperties)) {
var cloneID = this.cloneHotspot(grabbedProperties, controllerData);
@ -622,7 +623,7 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
this.endEquipEntity();
return makeRunningValues(false, [], []);
}
if (!this.targetEntityID) {
return this.checkNearbyHotspots(controllerData, deltaTime, timestamp);
}
@ -695,7 +696,6 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
if (channel === 'Hifi-Hand-Grab') {
try {
data = JSON.parse(message);
print(JSON.stringify(data));
var equipModule = (data.hand === "left") ? leftEquipEntity : rightEquipEntity;
var entityProperties = Entities.getEntityProperties(data.entityID, DISPATCHER_PROPERTIES);
entityProperties.id = data.entityID;
@ -704,19 +704,17 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
} catch (e) {
print("WARNING: equipEntity.js -- error parsing Hifi-Hand-Grab message: " + message);
}
}
} else if (channel === 'Hifi-Hand-Drop') {
data = JSON.parse(message);
if (data.hand === 'left') {
leftEquipEntity.endEquipEntity();
} else if (data.hand === 'right') {
rightEquipEntity.endEquipEntity();
} else if (data.hand === 'both') {
leftEquipEntity.endEquipEntity();
rightEquipEntity.endEquipEntity();
} else if (channel === 'Hifi-Hand-Drop') {
if (message === "left") {
leftEquipEntity.endEquipEntity();
} else if (message === "right") {
rightEquipEntity.endEquipEntity();
} else if (message === "both") {
leftEquipEntity.endEquipEntity();
rightEquipEntity.endEquipEntity();
}
}
}
};
Messages.subscribe('Hifi-Hand-Grab');