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

Merge change 24058 into eclair

Browse Source 
* changes:
  Minor perf improvement to fall and expand use of struct.
This commit is contained in:
Android (Google) Code Review
2009-09-04 18:21:30 -07:00
parent a3c745dafa 7042cde5e1
commit ac67ebe667
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libs/rs/java/Fall/res/raw/fall.c
View File

@@ -163,6 +163,7 @@ void generateRipples() {
int* current = loadArrayI32(RSID_RIPPLE_MAP, index * rippleMapSize + origin); int* current = loadArrayI32(RSID_RIPPLE_MAP, index * rippleMapSize + origin);
int *map = loadArrayI32(RSID_REFRACTION_MAP, 0); int *map = loadArrayI32(RSID_REFRACTION_MAP, 0);
float *vertices = loadTriangleMeshVerticesF(NAMED_WaterMesh); float *vertices = loadTriangleMeshVerticesF(NAMED_WaterMesh);
struct vert_s *vert = (struct vert_s *)vertices;
float fw = 1.f / width; float fw = 1.f / width;
float fh = 1.f / height; float fh = 1.f / height;
@@ -173,6 +174,8 @@ void generateRipples() {
int w = width - 1; int w = width - 1;
int wave = *current; int wave = *current;
int offset = h * width; int offset = h * width;
struct vert_s *vtx = vert + offset + w;
while (w >= 0) { while (w >= 0) {
int nextWave = current[1]; int nextWave = current[1];
int dx = nextWave - wave; int dx = nextWave - wave;
@@ -188,12 +191,10 @@ void generateRipples() {
v &= ~(v >> 31); v &= ~(v >> 31);
if (v >= height) v = height - 1; if (v >= height) v = height - 1;
int index = (offset + w) << 3; vtx->s = u * fw;
vertices[index + 3] = u * fw; vtx->t = v * fh;
vertices[index + 4] = v * fh; vtx->z = dy * fy;
vtx --;
// Update Z coordinate of the vertex
vertices[index + 7] = dy * fy;
w -= 1; w -= 1;
current += 1; current += 1;
@@ -205,17 +206,12 @@ void generateRipples() {
// Compute the normals for lighting // Compute the normals for lighting
int y = 0; int y = 0;
int w8 = width << 3;
for ( ; y < height; y += 1) { for ( ; y < height; y += 1) {
int x = 0; int x = 0;
int yOffset = y * width; int yOffset = y * width;
for ( ; x < width; x += 1) { struct vert_s *v = vert;
struct vert_s *v = (struct vec3_s *)(vertices + x);
//int o = ((yOffset + x) << 3);
//int o1 = o + 8 + 5;
//int ow = o + w8 + 5;
//int ow1 = ow + 8;
for ( ; x < width; x += 1) {
struct vec3_s n1, n2, n3; struct vec3_s n1, n2, n3;
vec3Sub(&n1, (struct vec3_s *)&(v+1)->x, (struct vec3_s *)&v->x); vec3Sub(&n1, (struct vec3_s *)&(v+1)->x, (struct vec3_s *)&v->x);
vec3Sub(&n2, (struct vec3_s *)&(v+width)->x, (struct vec3_s *)&v->x); vec3Sub(&n2, (struct vec3_s *)&(v+width)->x, (struct vec3_s *)&v->x);
@@ -231,6 +227,7 @@ void generateRipples() {
v->nx = n3.x; v->nx = n3.x;
v->ny = n3.y; v->ny = n3.y;
v->nz = -n3.z; v->nz = -n3.z;
v += 1;
// reset Z // reset Z
//vertices[(yOffset + x) << 3 + 7] = 0.0f; //vertices[(yOffset + x) << 3 + 7] = 0.0f;
@@ -474,7 +471,7 @@ int main(int index) {
drawRiverbed(); drawRiverbed();
drawSky(); drawSky();
drawLighting(); drawLighting();
//drawLeaves(); drawLeaves();
//drawNormals(); //drawNormals();
return 1; return 1;