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

avoid having auto-unequip code trigger during a teleport

Browse source
This commit is contained in:
Seth Alves 2016-09-01 19:13:08 -07:00
parent 8505d1eeed
commit 9ef03b1205
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -708,6 +708,7 @@ var equipHotspotBuddy = new EquipHotspotBuddy();
function MyController(hand) { function MyController(hand) {
this.hand = hand; this.hand = hand;
this.autoUnequipCounter = 0;
// handPosition is where the avatar's hand appears to be, in-world. // handPosition is where the avatar's hand appears to be, in-world.
this.getHandPosition = function () { this.getHandPosition = function () {
@ -2087,6 +2088,12 @@ function MyController(hand) {
var TEAR_AWAY_DISTANCE = 0.04; var TEAR_AWAY_DISTANCE = 0.04;
var nearPickedCandidateEntities = Entities.findEntities(heldItemPosition, NEAR_GRAB_RADIUS + TEAR_AWAY_DISTANCE); var nearPickedCandidateEntities = Entities.findEntities(heldItemPosition, NEAR_GRAB_RADIUS + TEAR_AWAY_DISTANCE);
if (nearPickedCandidateEntities.indexOf(this.grabbedEntity) == -1) { if (nearPickedCandidateEntities.indexOf(this.grabbedEntity) == -1) {
this.autoUnequipCounter += 1;
} else {
this.autoUnequipCounter = 0;
}
if (this.autoUnequipCounter > 1) {
// for whatever reason, the held/equipped entity has been pulled away. ungrab or unequip. // for whatever reason, the held/equipped entity has been pulled away. ungrab or unequip.
print("handControllerGrab -- autoreleasing held or equipped item because it is far from hand." + print("handControllerGrab -- autoreleasing held or equipped item because it is far from hand." +
props.parentID + " " + vec3toStr(props.position)); props.parentID + " " + vec3toStr(props.position));
@ -2388,6 +2395,8 @@ function MyController(hand) {
}; };
this.activateEntity = function(entityID, grabbedProperties, wasLoaded) { this.activateEntity = function(entityID, grabbedProperties, wasLoaded) {
this.autoUnequipCounter = 0;
if (this.entityActivated) { if (this.entityActivated) {
return; return;
} }