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

Fixed a potential bug with puck-attach parenting

Browse source
This commit is contained in:
seefo 2017-08-02 13:08:24 -07:00
parent 620f1a65c0
commit 961f748d87
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -140,18 +140,25 @@ function finalizePuck() {
} }
function updatePucks() { function updatePucks() {
// for each puck, update its position and orientation // for each puck, update its position and orientation
for (var puck in trackedPucks) { for (var puckName in trackedPucks) {
var action = indexToTrackedObjectName(puck); var action = indexToTrackedObjectName(puckName);
var pose = Controller.getPoseValue(Controller.Standard[action]); var pose = Controller.getPoseValue(Controller.Standard[action]);
if (pose && pose.valid) { if (pose && pose.valid) {
if (trackedPucks[puck].trackedEntityID) { var puck = trackedPucks[puckName];
if (puck.trackedEntityID) {
var avatarXform = new Xform(MyAvatar.orientation, MyAvatar.position); var avatarXform = new Xform(MyAvatar.orientation, MyAvatar.position);
var puckXform = new Xform(pose.rotation, pose.translation); var puckXform = new Xform(pose.rotation, pose.translation);
var finalXform = Xform.mul(avatarXform, Xform.mul(puckXform, Vec3.ZERO)); var finalXform = Xform.mul(avatarXform, Xform.mul(puckXform, Vec3.ZERO));
Entities.editEntity(trackedPucks[puck].puckEntityID, { Entities.editEntity(puck.puckEntityID, {
position: finalXform.pos, position: finalXform.pos,
rotation: finalXform.rot rotation: finalXform.rot,
});
// in case someone grabbed both entities and destroyed the
// child/parent relationship
Entities.editEntity(puck.trackedEntityID, {
parentID: puck.puckEntityID
}); });
} }
} }