Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01be251f authored by Flare Chiu's avatar Flare Chiu Committed by Gerrit Code Review
Browse files

Revert "Deprecate setRotateEulerM and replace with setRotateEulerM2" 

Revert submission 2373309-opengl-matrix2

Reason for revert: b/264967121

Reverted changes: /q/submissionid:2373309-opengl-matrix2

Change-Id: Icae70f12fa51212062b70a071a9626561d22215e
parent b52f95da

core/api/current.txt

+1 −2
Original line number Diff line number Diff line
@@ -30767,8 +30767,7 @@ package android.opengl { 
    method public static void scaleM(float[], int, float, float, float);

    method public static void setIdentityM(float[], int);

    method public static void setLookAtM(float[], int, float, float, float, float, float, float, float, float, float);

    method @Deprecated public static void setRotateEulerM(float[], int, float, float, float);

    method public static void setRotateEulerM2(@NonNull float[], int, float, float, float);

    method public static void setRotateEulerM(float[], int, float, float, float);

    method public static void setRotateM(float[], int, float, float, float, float);

    method public static void translateM(float[], int, float[], int, float, float, float);

    method public static void translateM(float[], int, float, float, float);

opengl/java/android/opengl/Matrix.java

+1 −66
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package android.opengl;



import androidx.annotation.NonNull;



/**

 * Matrix math utilities. These methods operate on OpenGL ES format

 * matrices and vectors stored in float arrays.
@@ -809,14 +807,9 @@ public class Matrix { 
     * @param rm returns the result

     * @param rmOffset index into rm where the result matrix starts

     * @param x angle of rotation, in degrees

     * @param y is broken, do not use

     * @param y angle of rotation, in degrees

     * @param z angle of rotation, in degrees

     *

     * @deprecated This method is incorrect around the y axis. This method is

     *             deprecated and replaced (below) by setRotateEulerM2 which

     *             behaves correctly

     */

    @Deprecated

    public static void setRotateEulerM(float[] rm, int rmOffset,

            float x, float y, float z) {

        x *= (float) (Math.PI / 180.0f);
@@ -852,64 +845,6 @@ public class Matrix { 
        rm[rmOffset + 15] =  1.0f;

    }



    /**

     * Converts Euler angles to a rotation matrix.

     *

     * @param rm returns the result

     * @param rmOffset index into rm where the result matrix starts

     * @param x angle of rotation, in degrees

     * @param y angle of rotation, in degrees

     * @param z angle of rotation, in degrees

     *

     * @throws IllegalArgumentException if rm is null;

     * or if rmOffset + 16 > rm.length;

     * rmOffset < 0

     */

    public static void setRotateEulerM2(@NonNull float[] rm, int rmOffset,

            float x, float y, float z) {

        if (rm == null) {

            throw new IllegalArgumentException("rm == null");

        }

        if (rmOffset < 0) {

            throw new IllegalArgumentException("rmOffset < 0");

        }

        if (rm.length < rmOffset + 16) {

            throw new IllegalArgumentException("rm.length < rmOffset + 16");

        }



        x *= (float) (Math.PI / 180.0f);

        y *= (float) (Math.PI / 180.0f);

        z *= (float) (Math.PI / 180.0f);

        float cx = (float) Math.cos(x);

        float sx = (float) Math.sin(x);

        float cy = (float) Math.cos(y);

        float sy = (float) Math.sin(y);

        float cz = (float) Math.cos(z);

        float sz = (float) Math.sin(z);

        float cxsy = cx * sy;

        float sxsy = sx * sy;



        rm[rmOffset + 0]  =  cy * cz;

        rm[rmOffset + 1]  = -cy * sz;

        rm[rmOffset + 2]  =  sy;

        rm[rmOffset + 3]  =  0.0f;



        rm[rmOffset + 4]  =  sxsy * cz + cx * sz;

        rm[rmOffset + 5]  = -sxsy * sz + cx * cz;

        rm[rmOffset + 6]  = -sx * cy;

        rm[rmOffset + 7]  =  0.0f;



        rm[rmOffset + 8]  = -cxsy * cz + sx * sz;

        rm[rmOffset + 9]  =  cxsy * sz + sx * cz;

        rm[rmOffset + 10] =  cx * cy;

        rm[rmOffset + 11] =  0.0f;



        rm[rmOffset + 12] =  0.0f;

        rm[rmOffset + 13] =  0.0f;

        rm[rmOffset + 14] =  0.0f;

        rm[rmOffset + 15] =  1.0f;

    }



    /**

     * Defines a viewing transformation in terms of an eye point, a center of

     * view, and an up vector.