Skip to content

Commit

Permalink
Fix access to x, y, z in the trajectory helper
Browse files Browse the repository at this point in the history
- Update math.gl usage and remove deprecated math.gl function from v2
- Fixes #534, #535, #540
  • Loading branch information
twojtasz committed Dec 10, 2019
1 parent 4981dbd commit e872d39
Show file tree
Hide file tree
Showing 3 changed files with 1,252 additions and 1,085 deletions.
Expand Up @@ -154,7 +154,7 @@ export default class FutureTrackletsConverter {
const pose = this._makePoseShape(object.data.poses.item[futurePoseIndex]);

// Translate the future position
const v = transform.transformVector([pose.x, pose.y, pose.z]);
const v = transform.transform([pose.x, pose.y, pose.z]);
pose.x = v[0];
pose.y = v[1];
pose.z = v[2];
Expand Down
10 changes: 5 additions & 5 deletions modules/builder/src/builders/helpers/xviz-trajectory-helper.js
Expand Up @@ -27,7 +27,7 @@ export function getRelativeCoordinates(vertices, basePose) {
}

const transformMatrix = basePose.getTransformationMatrix();
return vertices.map(p => transformMatrix.transformVector(p));
return vertices.map(p => transformMatrix.transform(p));
}

/**
Expand All @@ -54,9 +54,9 @@ export function getPoseTrajectory({poses, startFrame, endFrame}) {
const offset = getGeospatialVector(startPose, currPose);

// transform offset to startPose coordinate system
const relativeOffset = worldToStartPoseTransformMatrix.transformVector(offset);
const relativeOffset = worldToStartPoseTransformMatrix.transform(offset);

return [relativeOffset.x, relativeOffset.y, relativeOffset.z];
return relativeOffset;
});
}

Expand Down Expand Up @@ -87,7 +87,7 @@ export function getGeospatialToPoseTransform(from, to) {
// transform offset to `fromPose` coordinate
// TODO figure out why this step is needed
const worldToFromPoseTransformMatrix = fromPose.getTransformationMatrix().invert();
offset = worldToFromPoseTransformMatrix.transformVector(offset);
offset = worldToFromPoseTransformMatrix.transform(offset);

const toPose = new Pose({
x: offset[0],
Expand Down Expand Up @@ -134,7 +134,7 @@ export function getObjectTrajectory({

// objects in curr frame are meters offset based on currVehiclePose
// need to convert to the coordinate system of the startVehiclePose
const p = transformMatrix.transformVector([step.x, step.y, step.z]);
const p = transformMatrix.transform([step.x, step.y, step.z]);
vertices.push(p);
}

Expand Down

0 comments on commit e872d39

Please sign in to comment.