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

Addition of equipHotspots

Browse source
This commit is contained in:
Anthony J. Thibault 2016-06-24 15:08:55 -07:00
parent f3c5324e5c
commit b042210637
1 changed files with 81 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
scripts/system/controllers/handControllerGrab.js
View file

@ -324,6 +324,14 @@ EntityPropertiesCache.prototype.getWearableProps = function(entityID) {
return undefined; return undefined;
} }
}; };
EntityPropertiesCache.prototype.getEquipHotspotsProps = function(entityID) {
var props = this.cache[entityID];
if (props) {
return props.userData.equipHotspots ? props.userData.equipHotspots : {};
} else {
return undefined;
}
};
function MyController(hand) { function MyController(hand) {
this.hand = hand; this.hand = hand;
@ -1083,8 +1091,8 @@ function MyController(hand) {
}; };
this.entityIsEquippableWithDistanceCheck = function (entityID, handPosition) { this.entityIsEquippableWithDistanceCheck = function (entityID, handPosition) {
var distance, handJointName;
var props = this.entityPropertyCache.getProps(entityID); var props = this.entityPropertyCache.getProps(entityID);
var distance = Vec3.distance(props.position, handPosition);
var grabProps = this.entityPropertyCache.getGrabProps(entityID); var grabProps = this.entityPropertyCache.getGrabProps(entityID);
var debug = (WANT_DEBUG_SEARCH_NAME && props.name === WANT_DEBUG_SEARCH_NAME); var debug = (WANT_DEBUG_SEARCH_NAME && props.name === WANT_DEBUG_SEARCH_NAME);
@ -1096,30 +1104,81 @@ function MyController(hand) {
return false; return false;
} }
if (distance > EQUIP_RADIUS) { var equipHotspotsProps = this.entityPropertyCache.getEquipHotspotsProps(entityID);
if (debug) { if (equipHotspotsProps && equipHotspotsProps.length > 0) {
print("equip is skipping '" + props.name + "': too far away, " + distance + " meters"); var i, length = equipHotspotsProps.length;
} for (i = 0; i < length; i++) {
return false; var hotspot = equipHotspotsProps[i];
} if (!hotspot.position) {
if (debug) {
print("equip is skipping '" + props.name + "': equip hotspot[" + i + "] is missing a position");
}
continue;
}
var wearableProps = this.entityPropertyCache.getWearableProps(entityID); if (!hotspot.radius) {
if (!wearableProps || !wearableProps.joints) { if (debug) {
if (debug) { print("equip is skipping '" + props.name + "': equip hotspot[" + i + "] is missing a radius");
print("equip is skipping '" + props.name + "': no wearable attach-point"); }
} continue;
return false; }
}
var handJointName = this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"; distance = Vec3.distance(hotspot.position, handPosition);
if (!wearableProps.joints[handJointName]) { if (distance > hotspot.radius) {
if (debug) { if (debug) {
print("equip is skipping '" + props.name + "': no wearable joint for " + handJointName); print("equip is skipping '" + props.name + "': equip hotspot[" + i + "] is too far away, " + distance + " meters");
} }
return false; continue;
} }
return true; if (!hotspot.joints) {
if (debug) {
print("equip is skipping '" + props.name + "': equip hotspot[" + i + "] is missing joints");
}
continue;
}
handJointName = this.hand === RIGHT_HAND ? "RightHand" : "LeftHand";
if (!hotspot.joints[handJointName]) {
if (debug) {
print("equip is skipping '" + props.name + "': equip hotspot[" + i + "] is missing joint." + handJointName);
}
continue;
}
return true;
}
return false;
} else {
distance = Vec3.distance(props.position, handPosition);
if (distance > EQUIP_RADIUS) {
if (debug) {
print("equip is skipping '" + props.name + "': too far away, " + distance + " meters");
}
return false;
}
var wearableProps = this.entityPropertyCache.getWearableProps(entityID);
if (!wearableProps || !wearableProps.joints) {
if (debug) {
print("equip is skipping '" + props.name + "': no wearable attach-point");
}
return false;
}
handJointName = this.hand === RIGHT_HAND ? "RightHand" : "LeftHand";
if (!wearableProps.joints[handJointName]) {
if (debug) {
print("equip is skipping '" + props.name + "': no wearable joint for " + handJointName);
}
return false;
}
return true;
}
}; };
this.entityIsGrabbable = function (entityID) { this.entityIsGrabbable = function (entityID) {