am bc13913: Merge change 1195 into donut
Merge commit 'bc139139b0683675147e04e62de492aab5c3f2d0' * commit 'bc139139b0683675147e04e62de492aab5c3f2d0': Use direct, native order Buffers for OpenGL data.
This commit is contained in:
committed by
The Android Open Source Project
commit
8f8e1ccc3b
@@ -16,6 +16,8 @@
|
|||||||
|
|
||||||
package com.example.android.apis.graphics.spritetext;
|
package com.example.android.apis.graphics.spritetext;
|
||||||
|
|
||||||
|
import java.nio.ByteBuffer;
|
||||||
|
import java.nio.ByteOrder;
|
||||||
import java.nio.CharBuffer;
|
import java.nio.CharBuffer;
|
||||||
import java.nio.FloatBuffer;
|
import java.nio.FloatBuffer;
|
||||||
|
|
||||||
@@ -41,18 +43,20 @@ class Grid {
|
|||||||
mW = w;
|
mW = w;
|
||||||
mH = h;
|
mH = h;
|
||||||
int size = w * h;
|
int size = w * h;
|
||||||
mVertexArray = new float[size * 3];
|
final int FLOAT_SIZE = 4;
|
||||||
mVertexBuffer = FloatBuffer.wrap(mVertexArray);
|
final int CHAR_SIZE = 2;
|
||||||
|
mVertexBuffer = ByteBuffer.allocateDirect(FLOAT_SIZE * size * 3)
|
||||||
mTexCoordArray = new float[size * 2];
|
.order(ByteOrder.nativeOrder()).asFloatBuffer();
|
||||||
mTexCoordBuffer = FloatBuffer.wrap(mTexCoordArray);
|
mTexCoordBuffer = ByteBuffer.allocateDirect(FLOAT_SIZE * size * 2)
|
||||||
|
.order(ByteOrder.nativeOrder()).asFloatBuffer();
|
||||||
|
|
||||||
int quadW = mW - 1;
|
int quadW = mW - 1;
|
||||||
int quadH = mH - 1;
|
int quadH = mH - 1;
|
||||||
int quadCount = quadW * quadH;
|
int quadCount = quadW * quadH;
|
||||||
int indexCount = quadCount * 6;
|
int indexCount = quadCount * 6;
|
||||||
mIndexCount = indexCount;
|
mIndexCount = indexCount;
|
||||||
char[] indexArray = new char[indexCount];
|
mIndexBuffer = ByteBuffer.allocateDirect(CHAR_SIZE * indexCount)
|
||||||
|
.order(ByteOrder.nativeOrder()).asCharBuffer();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Initialize triangle list mesh.
|
* Initialize triangle list mesh.
|
||||||
@@ -75,18 +79,17 @@ class Grid {
|
|||||||
char c = (char) ((y + 1) * mW + x);
|
char c = (char) ((y + 1) * mW + x);
|
||||||
char d = (char) ((y + 1) * mW + x + 1);
|
char d = (char) ((y + 1) * mW + x + 1);
|
||||||
|
|
||||||
indexArray[i++] = a;
|
mIndexBuffer.put(i++, a);
|
||||||
indexArray[i++] = b;
|
mIndexBuffer.put(i++, b);
|
||||||
indexArray[i++] = c;
|
mIndexBuffer.put(i++, c);
|
||||||
|
|
||||||
indexArray[i++] = b;
|
mIndexBuffer.put(i++, b);
|
||||||
indexArray[i++] = c;
|
mIndexBuffer.put(i++, c);
|
||||||
indexArray[i++] = d;
|
mIndexBuffer.put(i++, d);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
mIndexBuffer = CharBuffer.wrap(indexArray);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void set(int i, int j, float x, float y, float z, float u, float v) {
|
void set(int i, int j, float x, float y, float z, float u, float v) {
|
||||||
@@ -100,13 +103,13 @@ class Grid {
|
|||||||
int index = mW * j + i;
|
int index = mW * j + i;
|
||||||
|
|
||||||
int posIndex = index * 3;
|
int posIndex = index * 3;
|
||||||
mVertexArray[posIndex] = x;
|
mVertexBuffer.put(posIndex, x);
|
||||||
mVertexArray[posIndex + 1] = y;
|
mVertexBuffer.put(posIndex + 1, y);
|
||||||
mVertexArray[posIndex + 2] = z;
|
mVertexBuffer.put(posIndex + 2, z);
|
||||||
|
|
||||||
int texIndex = index * 2;
|
int texIndex = index * 2;
|
||||||
mTexCoordArray[texIndex] = u;
|
mTexCoordBuffer.put(texIndex, u);
|
||||||
mTexCoordArray[texIndex + 1] = v;
|
mTexCoordBuffer.put(texIndex + 1, v);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void draw(GL10 gl, boolean useTexture) {
|
public void draw(GL10 gl, boolean useTexture) {
|
||||||
@@ -128,11 +131,7 @@ class Grid {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private FloatBuffer mVertexBuffer;
|
private FloatBuffer mVertexBuffer;
|
||||||
private float[] mVertexArray;
|
|
||||||
|
|
||||||
private FloatBuffer mTexCoordBuffer;
|
private FloatBuffer mTexCoordBuffer;
|
||||||
private float[] mTexCoordArray;
|
|
||||||
|
|
||||||
private CharBuffer mIndexBuffer;
|
private CharBuffer mIndexBuffer;
|
||||||
|
|
||||||
private int mW;
|
private int mW;
|
||||||
|
|||||||
Reference in New Issue
Block a user