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

Merge "Remove warnings about unused results."

Browse Source
This commit is contained in:
Stephen Hines
2011-12-06 18:33:42 -08:00
committed by Android (Google) Code Review
parent f7f930480c d53333cc21
commit bfda435744
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/RenderScriptTests/ModelViewer/src/com/android/modelviewer/simplemodel.rs
View File

@@ -48,6 +48,14 @@ static float gZoom;
static float gLastX; static float gLastX;
static float gLastY; static float gLastY;
static float3 toFloat3(float x, float y, float z) {
float3 f;
f.x = x;
f.y = y;
f.z = z;
return f;
}
void onActionDown(float x, float y) { void onActionDown(float x, float y) {
gLastX = x; gLastX = x;
gLastY = y; gLastY = y;
@@ -104,8 +112,8 @@ void updateMeshInfo() {
rsgMeshComputeBoundingBox(info->mMesh, rsgMeshComputeBoundingBox(info->mMesh,
&minX, &minY, &minZ, &minX, &minY, &minZ,
&maxX, &maxY, &maxZ); &maxX, &maxY, &maxZ);
info->bBoxMin = (minX, minY, minZ); info->bBoxMin = toFloat3(minX, minY, minZ);
info->bBoxMax = (maxX, maxY, maxZ); info->bBoxMax = toFloat3(maxX, maxY, maxZ);
gLookAt += (info->bBoxMin + info->bBoxMax)*0.5f; gLookAt += (info->bBoxMin + info->bBoxMax)*0.5f;
} }
gLookAt = gLookAt / (float)size; gLookAt = gLookAt / (float)size;

12
tests/RenderScriptTests/ShadersTest/src/com/android/shaderstest/shaderstest.rs
View File

@@ -57,6 +57,14 @@ static float gZoom;
static float gLastX; static float gLastX;
static float gLastY; static float gLastY;
static float3 toFloat3(float x, float y, float z) {
float3 f;
f.x = x;
f.y = y;
f.z = z;
return f;
}
void onActionDown(float x, float y) { void onActionDown(float x, float y) {
gLastX = x; gLastX = x;
gLastY = y; gLastY = y;
@@ -112,8 +120,8 @@ void updateMeshInfo() {
rsgMeshComputeBoundingBox(info->mMesh, rsgMeshComputeBoundingBox(info->mMesh,
&minX, &minY, &minZ, &minX, &minY, &minZ,
&maxX, &maxY, &maxZ); &maxX, &maxY, &maxZ);
info->bBoxMin = (minX, minY, minZ); info->bBoxMin = toFloat3(minX, minY, minZ);
info->bBoxMax = (maxX, maxY, maxZ); info->bBoxMax = toFloat3(maxX, maxY, maxZ);
gLookAt += (info->bBoxMin + info->bBoxMax)*0.5f; gLookAt += (info->bBoxMin + info->bBoxMax)*0.5f;
} }
gLookAt = gLookAt / (float)size; gLookAt = gLookAt / (float)size;