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

don't attempt to grab other's avatar-entities

Browse source
This commit is contained in:
Seth Alves 2018-12-14 14:22:57 -08:00
parent 895e8cdba1
commit 613f290226
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scripts/system/libraries/controllerDispatcherUtils.js
View file

@ -5,7 +5,7 @@
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
/* global module, Camera, HMD, MyAvatar, controllerDispatcherPlugins:true, Quat, Vec3, Overlays, Xform, Mat4, /* global module, HMD, MyAvatar, controllerDispatcherPlugins:true, Quat, Vec3, Overlays, Xform, Mat4,
Selection, Uuid, Selection, Uuid,
MSECS_PER_SEC:true , LEFT_HAND:true, RIGHT_HAND:true, FORBIDDEN_GRAB_TYPES:true, MSECS_PER_SEC:true , LEFT_HAND:true, RIGHT_HAND:true, FORBIDDEN_GRAB_TYPES:true,
HAPTIC_PULSE_STRENGTH:true, HAPTIC_PULSE_DURATION:true, ZERO_VEC:true, ONE_VEC:true, HAPTIC_PULSE_STRENGTH:true, HAPTIC_PULSE_DURATION:true, ZERO_VEC:true, ONE_VEC:true,
@ -31,6 +31,7 @@
disableDispatcherModule:true, disableDispatcherModule:true,
getEnabledModuleByName:true, getEnabledModuleByName:true,
getGrabbableData:true, getGrabbableData:true,
isAnothersAvatarEntity:true,
entityIsGrabbable:true, entityIsGrabbable:true,
entityIsDistanceGrabbable:true, entityIsDistanceGrabbable:true,
getControllerJointIndexCacheTime:true, getControllerJointIndexCacheTime:true,
@ -152,7 +153,9 @@ DISPATCHER_PROPERTIES = [
"grab.equippableIndicatorURL", "grab.equippableIndicatorURL",
"grab.equippableIndicatorScale", "grab.equippableIndicatorScale",
"grab.equippableIndicatorOffset", "grab.equippableIndicatorOffset",
"userData" "userData",
"entityHostType",
"owningAvatarID"
]; ];
// priority -- a lower priority means the module will be asked sooner than one with a higher priority in a given update step // priority -- a lower priority means the module will be asked sooner than one with a higher priority in a given update step
@ -287,10 +290,24 @@ getGrabbableData = function (ggdProps) {
return grabbableData; return grabbableData;
}; };
isAnothersAvatarEntity = function (iaaeProps) {
if (iaaeProps.entityHostType !== "avatar") {
return false;
}
if (iaaeProps.owningAvatarID === MyAvatar.sessionUUID) {
return false;
}
if (iaaeProps.owningAvatarID === MyAvatar.SELF_ID) {
return false;
}
return true;
};
entityIsGrabbable = function (eigProps) { entityIsGrabbable = function (eigProps) {
var grabbable = getGrabbableData(eigProps).grabbable; var grabbable = getGrabbableData(eigProps).grabbable;
if (!grabbable || if (!grabbable ||
eigProps.locked || eigProps.locked ||
isAnothersAvatarEntity(eigProps) ||
FORBIDDEN_GRAB_TYPES.indexOf(eigProps.type) >= 0) { FORBIDDEN_GRAB_TYPES.indexOf(eigProps.type) >= 0) {
return false; return false;
} }