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

avoid unequipping things during a HMD snap-turn

Browse source
This commit is contained in:
Seth Alves 2017-09-26 11:08:33 -07:00
parent afeb98059b
commit 737b583745
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scripts/system/controllers/controllerDispatcher.js
View file

@ -10,7 +10,7 @@
/* global Script, Entities, Overlays, Controller, Vec3, Quat, getControllerWorldLocation, RayPick, /* global Script, Entities, Overlays, Controller, Vec3, Quat, getControllerWorldLocation, RayPick,
controllerDispatcherPlugins:true, controllerDispatcherPluginsNeedSort:true, controllerDispatcherPlugins:true, controllerDispatcherPluginsNeedSort:true,
LEFT_HAND, RIGHT_HAND, NEAR_GRAB_PICK_RADIUS, DEFAULT_SEARCH_SPHERE_DISTANCE, DISPATCHER_PROPERTIES, LEFT_HAND, RIGHT_HAND, NEAR_GRAB_PICK_RADIUS, DEFAULT_SEARCH_SPHERE_DISTANCE, DISPATCHER_PROPERTIES,
getGrabPointSphereOffset, HMD, MyAvatar, Messages getGrabPointSphereOffset, HMD, MyAvatar, Messages, findHandChildEntities
*/ */
controllerDispatcherPlugins = {}; controllerDispatcherPlugins = {};
@ -27,7 +27,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
var BASIC_TIMER_INTERVAL_MS = 1000 / TARGET_UPDATE_HZ; var BASIC_TIMER_INTERVAL_MS = 1000 / TARGET_UPDATE_HZ;
var PROFILE = false; var PROFILE = false;
var DEBUG = false; var DEBUG = true;
if (typeof Test !== "undefined") { if (typeof Test !== "undefined") {
PROFILE = true; PROFILE = true;
@ -266,6 +266,20 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
}); });
} }
// sometimes, during a HMD snap-turn, an equipped or held item wont be near
// the hand when the findEntities is done. Gather up any hand-children here.
for (h = LEFT_HAND; h <= RIGHT_HAND; h++) {
var handChildrenIDs = findHandChildEntities(h);
handChildrenIDs.forEach(function (handChildID) {
if (handChildID in nearbyEntityPropertiesByID) {
return;
}
var props = Entities.getEntityProperties(handChildID, DISPATCHER_PROPERTIES);
props.id = handChildID;
nearbyEntityPropertiesByID[handChildID] = props;
});
}
// bundle up all the data about the current situation // bundle up all the data about the current situation
var controllerData = { var controllerData = {
triggerValues: [_this.leftTriggerValue, _this.rightTriggerValue], triggerValues: [_this.leftTriggerValue, _this.rightTriggerValue],