Commit f214d465 authored by Lauros Pajunen's avatar Lauros Pajunen
Browse files

Revert head tracking parameter back to pointer, move head tracking data... 

Revert head tracking parameter back to pointer, move head tracking data readings under headRotEnabled
parent 6f55d5cc

lib_rend/ivas_prot_rend.h

+1 −1
Original line number Diff line number Diff line
@@ -1322,7 +1322,7 @@ ivas_error combine_external_and_head_orientations_dec( 
);



ivas_error combine_external_and_head_orientations_rend(

    IVAS_REND_HeadRotData hHeadTrackData,                                           /* i  : head track data                                         */

    IVAS_REND_HeadRotData *hHeadTrackData,                                          /* i  : head track handle                                       */

    EXTERNAL_ORIENTATION_HANDLE hExtOrientationData,                                /* i  : external orientation handle                             */

    COMBINED_ORIENTATION_HANDLE hCombinedOrientationData                            /* i/o: combined orientation handle                             */

);

lib_rend/ivas_rotation.c

+5 −8
Original line number Diff line number Diff line
@@ -887,7 +887,7 @@ ivas_error combine_external_and_head_orientations_dec( 
 *------------------------------------------------------------------------*/



ivas_error combine_external_and_head_orientations_rend(

    IVAS_REND_HeadRotData hHeadTrackData,                /* i  : head track data                */

    IVAS_REND_HeadRotData *hHeadTrackData,               /* i  : head track handle              */

    EXTERNAL_ORIENTATION_HANDLE hExtOrientationData,     /* i  : external orientation handle    */

    COMBINED_ORIENTATION_HANDLE hCombinedOrientationData /* i/o: combined orientation handle    */

)
@@ -898,14 +898,11 @@ ivas_error combine_external_and_head_orientations_rend( 
    int16_t i;



    sr_pose_pred_axis = DEFAULT_AXIS;

    if ( hHeadTrackData.hOrientationTracker != NULL )

    if ( hHeadTrackData->headRotEnabled )

    {

        if ( hHeadTrackData.headRotEnabled )

        {

            headRotQuaternions = hHeadTrackData.headPositions;

            listenerPos = hHeadTrackData.Pos;

        }

        sr_pose_pred_axis = hHeadTrackData.sr_pose_pred_axis;

        headRotQuaternions = hHeadTrackData->headPositions;

        listenerPos = hHeadTrackData->Pos;

        sr_pose_pred_axis = hHeadTrackData->sr_pose_pred_axis;

    }

    else if ( hExtOrientationData != NULL )

    {

lib_rend/lib_rend.c

+1 −1
Original line number Diff line number Diff line
@@ -5058,7 +5058,7 @@ ivas_error IVAS_REND_CombineHeadAndExternalOrientation( 
        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



    return combine_external_and_head_orientations_rend( hIvasRend->headRotData, hIvasRend->hExternalOrientationData, hIvasRend->hCombinedOrientationData );

    return combine_external_and_head_orientations_rend( &hIvasRend->headRotData, hIvasRend->hExternalOrientationData, hIvasRend->hCombinedOrientationData );

}