Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reworked geometric algebra. Accesses Basis via get_column. #219

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Reworked geometric algebra. Accesses Basis via get_column. #219

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13660e2
Reworked geometric algebra. Accesses Basis via get_column.
The-Cyber-Captain Oct 12, 2024
1c56797
Tidied comments. Reinstated root tracker's position.
The-Cyber-Captain Nov 4, 2024
8141970
Adjusting for clang
The-Cyber-Captain Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions plugin/src/main/cpp/extensions/openxr_fb_body_tracking_extension_wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,23 +307,27 @@ void OpenXRFbBodyTrackingExtensionWrapper::_on_process() {
// If the location data is good then we need to apply some corrections
// before handing the data back to Godot. These include:
//
// - The Root joint carries no data, so instead place it on the ground
// - The Root joint carries no useful orientation data, so instead align it
// under the hips pointing forwards.
//
// - Adjusting the left and right shoulder back so they are aligned
// with how models are designed, rather than the Meta positions of
// the tips of the clavicles.
if (locations.isActive) {
// Align root under the hips pointing 'forwards'
// IE, +z aligns with hips & user's real-world [upper-body] forward.
// (Remaining, however, parallel to the XRorigin / Global XZ plane; root's basis rotated around Y to fit)

// Get the hips transform
Transform3D hips = xr_body_tracker->get_joint_transform(XRBodyTracker::JOINT_HIPS);

// Construct the root under the hips pointing forwards
Vector3 root_y = Vector3(0.0, 1.0, 0.0);
Vector3 root_z = -hips.basis[Vector3::AXIS_X].cross(root_y);
Vector3 root_x = root_y.cross(root_z);
Vector3 root_o = hips.origin.slide(Vector3(0.0, 1.0, 0.0));
Vector3 hips_left = hips.basis.get_column(Vector3::AXIS_X);
Vector3 root_x = (hips_left.slide(Vector3(0.0, 1.0, 0.0))).normalized();
Vector3 root_z = root_x.cross(root_y);
Vector3 root_o = xr_body_tracker->get_joint_transform(XRBodyTracker::JOINT_ROOT).origin;
Transform3D root = Transform3D(root_x, root_y, root_z, root_o).orthonormalized();
xr_body_tracker->set_joint_transform(XRBodyTracker::JOINT_ROOT, root);
// Set tracker pose, velocities, confidence.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we really need this comment either - it's not really saying anything that the line of code itself says just as well.

xr_body_tracker->set_pose("default", root, Vector3(), Vector3(), XRPose::XR_TRACKING_CONFIDENCE_HIGH);

// Distance in meters to push the shoulder joints back from the
Expand All @@ -333,7 +337,7 @@ void OpenXRFbBodyTrackingExtensionWrapper::_on_process() {

// Deduce the shoulder offset from the upper chest transform
Transform3D upper_chest = xr_body_tracker->get_joint_transform(XRBodyTracker::JOINT_UPPER_CHEST);
Vector3 shoulder_offset = upper_chest.basis[2] * shoulder_z_offset;
Vector3 shoulder_offset = upper_chest.basis.get_column(Vector3::AXIS_Z) * shoulder_z_offset;

// Correct the left shoulder
Transform3D left_shoulder = xr_body_tracker->get_joint_transform(XRBodyTracker::JOINT_LEFT_SHOULDER);
Expand Down
Loading