Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d45d2db authored by Hendrik Wagenaar's avatar Hendrik Wagenaar Committed by android-build-merger
Browse files

Merge "Add 180 rotation to sensord orientation" into oc-dev am: 61a5669b 

am: 96536f84

Change-Id: I72a402a10270b5b3aa740b9a2dc5c15728394120
parents e7837ab2 96536f84

services/vr/sensord/pose_service.cpp

+9 −0
Original line number Diff line number Diff line
@@ -440,6 +440,15 @@ void PoseService::UpdatePoseMode() { 
            kRotX90 * Rotationd(AngleAxisd(-k90DegInRad, kVecAxisY));

        start_from_head_rotation =

            (pose_state.sensor_from_start_rotation * kPostRotation).inverse();

      } else if (device_orientation_type_ == kOrientationTypeLandscape180) {

        const Rotationd kPreRotation =

            Rotationd(AngleAxisd(k90DegInRad * 2.0, kVecAxisY)) *

            Rotationd(AngleAxisd(k90DegInRad * 2.0, kVecAxisZ));

        const Rotationd kPostRotation = kRotX90;

        start_from_head_rotation =

            (kPreRotation *

             pose_state.sensor_from_start_rotation * kPostRotation)

                .inverse();

      } else {

        const Rotationd kPreRotation =

            Rotationd(AngleAxisd(k90DegInRad, kVecAxisZ));

services/vr/sensord/pose_service.h

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ class PoseService : public pdx::ServiceBase<PoseService> { 
    kOrientationTypePortrait = 1,

    // Landscape device.

    kOrientationTypeLandscape = 2,

    // 180 Landscape device.

    kOrientationTypeLandscape180 = 3,

  };



  // Initializes the service. Keeps a reference to sensor_thread, which must be