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

Commit 010835d4 authored by Stephen Hines's avatar Stephen Hines Committed by Android (Google) Code Review
Browse files

Merge "Fix RS matrix docs regarding row/column and x/y."

parents 0fb362b4 ec6f200c

graphics/java/android/renderscript/Matrix2f.java

+10 −10
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 The Android Open Source Project

 * Copyright (C) 2009-2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -59,23 +59,23 @@ public class Matrix2f { 
    /**

    * Returns the value for a given row and column

    *

    * @param i row of the value to return

    * @param j column of the value to return

    * @param x column of the value to return

    * @param y row of the value to return

    *

    * @return value in the ith row and jth column

    * @return value in the yth row and xth column

    */

    public float get(int i, int j) {

        return mMat[i*2 + j];

    public float get(int x, int y) {

        return mMat[x*2 + y];

    }



    /**

    * Sets the value for a given row and column

    *

    * @param i row of the value to set

    * @param j column of the value to set

    * @param x column of the value to set

    * @param y row of the value to set

    */

    public void set(int i, int j, float v) {

        mMat[i*2 + j] = v;

    public void set(int x, int y, float v) {

        mMat[x*2 + y] = v;

    }



    /**

graphics/java/android/renderscript/Matrix3f.java

+10 −10
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 The Android Open Source Project

 * Copyright (C) 2009-2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -59,23 +59,23 @@ public class Matrix3f { 
    /**

    * Returns the value for a given row and column

    *

    * @param i row of the value to return

    * @param j column of the value to return

    * @param x column of the value to return

    * @param y row of the value to return

    *

    * @return value in the ith row and jth column

    * @return value in the yth row and xth column

    */

    public float get(int i, int j) {

        return mMat[i*3 + j];

    public float get(int x, int y) {

        return mMat[x*3 + y];

    }



    /**

    * Sets the value for a given row and column

    *

    * @param i row of the value to set

    * @param j column of the value to set

    * @param x column of the value to set

    * @param y row of the value to set

    */

    public void set(int i, int j, float v) {

        mMat[i*3 + j] = v;

    public void set(int x, int y, float v) {

        mMat[x*3 + y] = v;

    }



    /**

graphics/java/android/renderscript/Matrix4f.java

+10 −10
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 The Android Open Source Project

 * Copyright (C) 2009-2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -59,23 +59,23 @@ public class Matrix4f { 
    /**

    * Returns the value for a given row and column

    *

    * @param i row of the value to return

    * @param j column of the value to return

    * @param x column of the value to return

    * @param y row of the value to return

    *

    * @return value in the ith row and jth column

    * @return value in the yth row and xth column

    */

    public float get(int i, int j) {

        return mMat[i*4 + j];

    public float get(int x, int y) {

        return mMat[x*4 + y];

    }



    /**

    * Sets the value for a given row and column

    *

    * @param i row of the value to set

    * @param j column of the value to set

    * @param x column of the value to set

    * @param y row of the value to set

    */

    public void set(int i, int j, float v) {

        mMat[i*4 + j] = v;

    public void set(int x, int y, float v) {

        mMat[x*4 + y] = v;

    }



    /**