[Bf-blender-cvs] [350b7b378d8] soc-2019-openxr: Correct/remove disabled code for space conversion

[Julian Eisel]

Commit: 350b7b378d8b92a876ff4d86ea8c7a7bf0f2d321
Author: Julian Eisel
Date:   Tue Oct 15 22:10:08 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rB350b7b378d8b92a876ff4d86ea8c7a7bf0f2d321

Correct/remove disabled code for space conversion

Turns out we don't actually have to convert between spaces.

===================================================================

M	intern/ghost/intern/GHOST_XrSession.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_XrSession.cpp b/intern/ghost/intern/GHOST_XrSession.cpp
index 2f77ddf2781..1cb321544a2 100644
--- a/intern/ghost/intern/GHOST_XrSession.cpp
+++ b/intern/ghost/intern/GHOST_XrSession.cpp
@@ -129,11 +129,11 @@ static void create_reference_space(OpenXRSessionData *oxr, const GHOST_XrPose *b
  * we can hand OpenXR a proper reference pose/space.
  */
   create_info.poseInReferenceSpace.position.x = base_pose->position[0];
-  create_info.poseInReferenceSpace.position.y = base_pose->position[2];
-  create_info.poseInReferenceSpace.position.z = -base_pose->position[1];
+  create_info.poseInReferenceSpace.position.y = base_pose->position[1];
+  create_info.poseInReferenceSpace.position.z = base_pose->position[2];
   create_info.poseInReferenceSpace.orientation.x = base_pose->orientation_quat[1];
-  create_info.poseInReferenceSpace.orientation.y = base_pose->orientation_quat[3];
-  create_info.poseInReferenceSpace.orientation.z = -base_pose->orientation_quat[2];
+  create_info.poseInReferenceSpace.orientation.y = base_pose->orientation_quat[2];
+  create_info.poseInReferenceSpace.orientation.z = base_pose->orientation_quat[3];
   create_info.poseInReferenceSpace.orientation.w = base_pose->orientation_quat[0];
 #else
   (void)base_pose;
@@ -408,16 +408,7 @@ void GHOST_XrSession::draw(void *draw_customdata)
 
 static void ghost_xr_draw_view_info_from_view(const XrView &view, GHOST_XrDrawViewInfo &r_info)
 {
-#if 0
   /* Set and convert to Blender coodinate space. */
-  r_info.pose.position[0] = view.pose.position.x;
-  r_info.pose.position[1] = -view.pose.position.z;
-  r_info.pose.position[2] = view.pose.position.y;
-  r_info.pose.orientation_quat[0] = view.pose.orientation.w;
-  r_info.pose.orientation_quat[1] = view.pose.orientation.x;
-  r_info.pose.orientation_quat[2] = -view.pose.orientation.z;
-  r_info.pose.orientation_quat[3] = view.pose.orientation.y;
-#else
   r_info.pose.position[0] = view.pose.position.x;
   r_info.pose.position[1] = view.pose.position.y;
   r_info.pose.position[2] = view.pose.position.z;
@@ -425,7 +416,6 @@ static void ghost_xr_draw_view_info_from_view(const XrView &view, GHOST_XrDrawVi
   r_info.pose.orientation_quat[1] = view.pose.orientation.x;
   r_info.pose.orientation_quat[2] = view.pose.orientation.y;
   r_info.pose.orientation_quat[3] = view.pose.orientation.z;
-#endif
 
   r_info.fov.angle_left = view.fov.angleLeft;
   r_info.fov.angle_right = view.fov.angleRight;