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

Changed puck-attach to make tracked entities collisionless

Browse source
This commit is contained in:
seefo 2017-08-03 16:01:12 -07:00
parent 498ac5d0ab
commit 67b5921079
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
scripts/developer/tests/puck-attach.js
View file

@ -171,17 +171,19 @@ function finalizePuck(puckName) {
if (foundEntity) { if (foundEntity) {
lastPuck.trackedEntityID = foundEntity; lastPuck.trackedEntityID = foundEntity;
// remember the userdata for the tracked entity since we're about to // remember the userdata and collisionless flag for the tracked entity since
// remove it and make it ungrabbable // we're about to remove it and make it ungrabbable and collisionless
lastPuck.trackedEntityUserData = getPropertyForEntity(foundEntity, "userData"); lastPuck.trackedEntityUserData = getPropertyForEntity(foundEntity, "userData");
lastPuck.trackedEntityCollisionFlag = getPropertyForEntity(foundEntity, "collisionless");
// update properties of the tracked entity // update properties of the tracked entity
Entities.editEntity(lastPuck.trackedEntityID, { Entities.editEntity(lastPuck.trackedEntityID, {
"parentID": lastPuck.puckEntityID, "parentID": lastPuck.puckEntityID,
"userData": '{ "grabbableKey": { "grabbable": false } }' "userData": '{ "grabbableKey": { "grabbable": false } }',
"collisionless": 1
}); });
// remove reference to puck since it is now calibrated and finalized // remove reference to puck since it is now calibrated and finalized
lastPuck = undefined; lastPuck = undefined;
} }
} }
function updatePucks() { function updatePucks() {
// for each puck, update its position and orientation // for each puck, update its position and orientation
@ -233,14 +235,19 @@ function destroyPuck(puckName) {
var trackedEntityID = puck.trackedEntityID; var trackedEntityID = puck.trackedEntityID;
// remove the puck as a parent entity and restore the tracked entities // remove the puck as a parent entity and restore the tracked entities
// former userdata // former userdata and collision flag
Entities.editEntity(trackedEntityID, { Entities.editEntity(trackedEntityID, {
"parentID": "{00000000-0000-0000-0000-000000000000}", "parentID": "{00000000-0000-0000-0000-000000000000}",
"userData": puck.trackedEntityUserData "userData": puck.trackedEntityUserData,
"collisionless": puck.trackedEntityCollisionFlag
}); });
delete trackedPucks[puckName]; delete trackedPucks[puckName];
// in some cases, the entity deletion may occur before the parent change
// has been processed, resulting in both the puck and the tracked entity
// to be deleted so we wait 100ms before deleting the puck, assuming
// that the parent change has occured
Script.setTimeout(function() { Script.setTimeout(function() {
// delete the puck // delete the puck
Entities.deleteEntity(puckEntityID); Entities.deleteEntity(puckEntityID);