Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix android.opengl.Matrix frustum's generation" into jb-mr1-dev

Browse Source
This commit is contained in:
Romain Guy
2012-07-31 11:33:28 -07:00
committed by Android (Google) Code Review
parent e23ae144cc 0a088f5d46
commit 9f52da21d7
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
opengl/java/android/opengl/Matrix.java
View File

@@ -312,7 +312,6 @@ public class Matrix {
* @param near
* @param far
*/
public static void frustumM(float[] m, int offset,
float left, float right, float bottom, float top,
float near, float far) {
@@ -336,10 +335,10 @@ public class Matrix {
final float r_depth = 1.0f / (near - far);
final float x = 2.0f * (near * r_width);
final float y = 2.0f * (near * r_height);
final float A = 2.0f * ((right + left) * r_width);
final float A = (right + left) * r_width;
final float B = (top + bottom) * r_height;
final float C = (far + near) * r_depth;
final float D = 2.0f * (far * near * r_depth);
final float C = -(far + near) * r_depth;
final float D = -2.0f * (far * near * r_depth);
m[offset + 0] = x;
m[offset + 5] = y;
m[offset + 8] = A;