Commit cd65a6c9 authored by emerit's avatar emerit
Browse files

fix merge

parent 215fe263

lib_rend/lib_rend.c

+2 −24
Original line number Diff line number Diff line
@@ -4060,7 +4060,7 @@ ivas_error IVAS_REND_SetHeadRotation( 
    IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle                        */

#ifdef TD5

    const IVAS_QUATERNION headRot[RENDERER_HEAD_POSITIONS_PER_FRAME], /* i  : head orientations for next rendering call  */

    const IVAS_POSITION Pos[RENDERER_HEAD_POSITIONS_PER_FRAME]        /* i  : listener positions for next rendering call */

    const IVAS_POSITION headPos[RENDERER_HEAD_POSITIONS_PER_FRAME]    /* i  : listener positions for next rendering call */

#else

    const IVAS_QUATERNION headRot[RENDERER_HEAD_POSITIONS_PER_FRAME] /* i  : head positions for next rendering call */

#endif
@@ -4094,32 +4094,10 @@ ivas_error IVAS_REND_SetHeadRotation( 
        {

            hIvasRend->headRotData.headPositions[i] = headRot[i];

#ifdef TD5

            hIvasRend->headRotData.Pos[i] = Pos[i];

            hIvasRend->headRotData.Pos[i] = headPos[i];

#endif

        }

    }



#ifdef TD5

    if ( headPos == NULL )

    {

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

        {

            hIvasRend->headRotData.Pos[i].x = 0;

            hIvasRend->headRotData.Pos[i].y = 0;

            hIvasRend->headRotData.Pos[i].z = 0;

        };

    }

    else

    {

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

        {

            hIvasRend->headRotData.Pos[i].x = headPos[i][0];

            hIvasRend->headRotData.Pos[i].y = headPos[i][1];

            hIvasRend->headRotData.Pos[i].z = headPos[i][2];

        }

    }

#endif



    return IVAS_ERR_OK;

}