Commit 9b6129e1 authored by Lauros Pajunen's avatar Lauros Pajunen
Browse files

Assign identity vector components separately

parent 6a4215f7

lib_rend/ivas_rotation.c

+4 −15
Original line number Diff line number Diff line
@@ -741,7 +741,10 @@ void ivas_external_orientation_reset( 
        int16_t i;

        IVAS_QUATERNION identity;



        identity = (IVAS_QUATERNION) { .w = 1.0f, .x = 0.0f, .y = 0.0f, .z = 0.0f };

        identity.w = 1.0f;

        identity.x = 0.0f;

        identity.y = 0.0f;

        identity.z = 0.0f;

        /* Enable head rotation and disable external orientation as default */

        for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )

        {
@@ -796,14 +799,9 @@ ivas_error ivas_combined_orientation_open( 
    IVAS_VECTOR3 origo;

    int16_t pos_idx;



#ifdef IVAS_RTPDUMP

    identity = (IVAS_QUATERNION) { .w = 1.0f, .x = 0.0f, .y = 0.0f, .z = 0.0f };

    origo = (IVAS_VECTOR3) { .x = 0.0f, .y = 0.0f, .z = 0.0f };

#else

    identity.w = 1.0f;

    identity.x = identity.y = identity.z = 0.0f;

    origo.x = origo.y = origo.z = 0.0f;

#endif



    /* Allocate handle */

    if ( ( *hCombinedOrientationData = (COMBINED_ORIENTATION_HANDLE) malloc( sizeof( COMBINED_ORIENTATION_DATA ) ) ) == NULL )
@@ -988,14 +986,9 @@ ivas_error combine_external_and_head_orientations( 
    IVAS_QUATERNION identity;

    IVAS_VECTOR3 origo;



#ifdef IVAS_RTPDUMP

    identity = (IVAS_QUATERNION) { .w = 1.0f, .x = 0.0f, .y = 0.0f, .z = 0.0f };

    origo = (IVAS_VECTOR3) { .x = 0.0f, .y = 0.0f, .z = 0.0f };

#else

    identity.w = 1.0f;

    identity.x = identity.y = identity.z = 0.0f;

    origo.x = origo.y = origo.z = 0.0f;

#endif



    /* Form combined orientations or return if no data available */

    if ( hCombinedOrientationData == NULL )
@@ -1291,12 +1284,8 @@ static void external_target_interpolation( 
                    if ( hExtOrientationData->enableExternalOrientation[i - 1] == 0 )

                    {

                        IVAS_QUATERNION identity;

#ifdef IVAS_RTPDUMP

                        identity = (IVAS_QUATERNION) { .w = 1.0f, .x = 0.0f, .y = 0.0f, .z = 0.0f };

#else

                        identity.w = 1.0f;

                        identity.x = identity.y = identity.z = 0.0f;

#endif

                        hCombinedOrientationData->Quaternions_ext_interpolation_start = identity;

                    }

                    else if ( hExtOrientationData->enableExternalOrientation[i - 1] == 2 )