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

handle another type of abandoned grab

Browse source
This commit is contained in:
Seth Alves 2016-08-27 19:46:15 -07:00
parent 7dad303ce7
commit 3355097bd0
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ Script.include("/~/system/libraries/Xform.js");
// //
var WANT_DEBUG = false; var WANT_DEBUG = false;
var WANT_DEBUG_STATE = false; var WANT_DEBUG_STATE = false;
var WANT_DEBUG_SEARCH_NAME = null; var WANT_DEBUG_SEARCH_NAME = "Hifi-Bow"; // null;
var FORCE_IGNORE_IK = true; var FORCE_IGNORE_IK = true;
var SHOW_GRAB_POINT_SPHERE = true; var SHOW_GRAB_POINT_SPHERE = true;
@ -1255,20 +1255,21 @@ function MyController(hand) {
var physical = propsArePhysical(props); var physical = propsArePhysical(props);
var grabbable = false; var grabbable = false;
var debug = (WANT_DEBUG_SEARCH_NAME && props.name === WANT_DEBUG_SEARCH_NAME); var debug = (WANT_DEBUG_SEARCH_NAME && props.name === WANT_DEBUG_SEARCH_NAME);
var refCount = ("refCount" in grabProps) ? grabProps.refCount : 0;
if (physical) { if (physical) {
// physical things default to grabbable // physical things default to grabbable
grabbable = true; grabbable = true;
} else { } else {
// non-physical things default to non-grabbable unless they are already grabbed // non-physical things default to non-grabbable unless they are already grabbed
if ("refCount" in grabProps && grabProps.refCount > 0) { if (refCount > 0) {
grabbable = true; grabbable = true;
} else { } else {
grabbable = false; grabbable = false;
} }
} }
if (grabbableProps.hasOwnProperty("grabbable")) { if (grabbableProps.hasOwnProperty("grabbable") && refCount == 0) {
grabbable = grabbableProps.grabbable; grabbable = grabbableProps.grabbable;
} }