[Bf-blender-cvs] [ed869a2609a] xr-controller-support: Revert changes to wm_xr_controller_pose_to_mat()

[Peter Kim]

Commit: ed869a2609a6443b69a7f9ef6ae7488caf1f9d89
Author: Peter Kim
Date:   Sat May 15 08:45:16 2021 +0900
Branches: xr-controller-support
https://developer.blender.org/rBed869a2609a6443b69a7f9ef6ae7488caf1f9d89

Revert changes to wm_xr_controller_pose_to_mat()

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

M	source/blender/windowmanager/xr/intern/wm_xr_draw.c
M	source/blender/windowmanager/xr/intern/wm_xr_intern.h
M	source/blender/windowmanager/xr/intern/wm_xr_session.c

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

diff --git a/source/blender/windowmanager/xr/intern/wm_xr_draw.c b/source/blender/windowmanager/xr/intern/wm_xr_draw.c
index b120ebcd187..df541113069 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_draw.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_draw.c
@@ -50,6 +50,12 @@ void wm_xr_pose_to_viewmat(const GHOST_XrPose *pose, float r_viewmat[4][4])
   translate_m4(r_viewmat, -pose->position[0], -pose->position[1], -pose->position[2]);
 }
 
+void wm_xr_controller_pose_to_mat(const GHOST_XrPose *pose, float r_mat[4][4])
+{
+  quat_to_mat4(r_mat, pose->orientation_quat);
+  copy_v3_v3(r_mat[3], pose->position);
+}
+
 static void wm_xr_draw_matrices_create(const wmXrDrawData *draw_data,
                                        const GHOST_XrDrawViewInfo *draw_view,
                                        const XrSessionSettings *session_settings,
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_intern.h b/source/blender/windowmanager/xr/intern/wm_xr_intern.h
index f9a2d4080e4..083ae0cee6b 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_intern.h
+++ b/source/blender/windowmanager/xr/intern/wm_xr_intern.h
@@ -195,5 +195,6 @@ void wm_xr_session_object_autokey(struct bContext *C,
                                   bool notify);
 
 void wm_xr_pose_to_viewmat(const GHOST_XrPose *pose, float r_viewmat[4][4]);
+void wm_xr_controller_pose_to_mat(const GHOST_XrPose *pose, float r_mat[4][4]);
 void wm_xr_draw_view(const GHOST_XrDrawViewInfo *draw_view, void *customdata);
 void wm_xr_draw_controllers(const struct bContext *C, struct ARegion *region, void *customdata);
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_session.c b/source/blender/windowmanager/xr/intern/wm_xr_session.c
index 570fa146432..056113a864d 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_session.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_session.c
@@ -572,12 +572,6 @@ void wm_xr_session_actions_init(wmXrData *xr)
   GHOST_XrAttachActionSets(xr->runtime->context);
 }
 
-static void wm_xr_pose_to_mat(const wmXrPose *pose, float r_mat[4][4])
-{
-  quat_to_mat4(r_mat, pose->orientation_quat);
-  copy_v3_v3(r_mat[3], pose->position);
-}
-
 static void wm_xr_session_controller_mats_update(const bContext *C,
                                                  const XrSessionSettings *settings,
                                                  const wmXrAction *controller_pose_action,
@@ -628,7 +622,7 @@ static void wm_xr_session_controller_mats_update(const bContext *C,
     }
 
     /* Calculate controller matrix in world space. */
-    wm_xr_pose_to_mat(&((wmXrPose *)controller_pose_action->states)[i], tmp);
+    wm_xr_controller_pose_to_mat(&((GHOST_XrPose *)controller_pose_action->states)[i], tmp);
 
     /* Apply eye position and base pose offsets. */
     sub_v3_v3(tmp[3], view_ofs);