Unverified Commit 87e89954 authored by Remco Stoutjesdijk's avatar Remco Stoutjesdijk
Browse files

wrapped angles for deg/rad vv. conversion

parent 8a2144d9

lib_rend/ivas_orient_trk.c

+7 −6
Original line number Diff line number Diff line
@@ -759,12 +759,13 @@ ivas_error ivas_orient_trk_Process( 


        if ( pAbsRot->w == -3.0f )

        {

            Quat2Euler( trkQuat, &trkEuler.z, &trkEuler.y, &trkEuler.x );

            trkEuler.x = rad2deg( trkEuler.x );

            trkEuler.y = rad2deg( trkEuler.y );

            trkEuler.z = rad2deg( trkEuler.z );

            trkEuler.w = -3.0f;

            *pTrkRot = trkEuler;

            //Quat2Euler( trkQuat, &trkEuler.z, &trkEuler.y, &trkEuler.x );

            //trkEuler.x = rad2deg( trkEuler.x );

            //trkEuler.y = rad2deg( trkEuler.y );

            //trkEuler.z = rad2deg( trkEuler.z );

            //trkEuler.w = -3.0f;

            //*pTrkRot = trkEuler;

            *pTrkRot = trkQuat;

        }

        else

        {

lib_rend/ivas_rotation.c

+18 −0
Original line number Diff line number Diff line
@@ -258,6 +258,15 @@ void Euler2Quat( 
 *------------------------------------------------------------------------*/

float deg2rad( float degrees )

{

    if ( degrees > 180.0f )

    {

        degrees = degrees - 360.0f;

    }

    if ( degrees < -180.0f )

    {

        degrees = degrees + 360.0f;

    }



    return PI_OVER_180 * degrees;

}
@@ -268,6 +277,15 @@ float deg2rad( float degrees ) 
 *------------------------------------------------------------------------*/

float rad2deg( float radians )

{

    if ( radians > EVS_PI )

    {

        radians = radians - PI2;

    }

    if ( radians < -EVS_PI )

    {

        radians = radians + PI2;

    }



    return _180_OVER_PI * radians;

}