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

ensure target mouse entity has equip data

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

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

@ -796,7 +796,8 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
var intersection = Entities.findRayIntersection(pickRay, true); var intersection = Entities.findRayIntersection(pickRay, true);
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) { var hasEquipData = getWearableData(entityProperties).joints || getEquipHotspotsData(entityProperties).length > 0;
if (hasEquipData && 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");