Skip to content

Commit bfda435

Browse files
stephenhinesAndroid (Google) Code Review
authored andcommitted
Merge "Remove warnings about unused results."
2 parents f7f9304 + d53333c commit bfda435

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

tests/RenderScriptTests/ModelViewer/src/com/android/modelviewer/simplemodel.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@ static float gZoom;
4848
static float gLastX;
4949
static float gLastY;
5050

51+
static float3 toFloat3(float x, float y, float z) {
52+
float3 f;
53+
f.x = x;
54+
f.y = y;
55+
f.z = z;
56+
return f;
57+
}
58+
5159
void onActionDown(float x, float y) {
5260
gLastX = x;
5361
gLastY = y;
@@ -104,8 +112,8 @@ void updateMeshInfo() {
104112
rsgMeshComputeBoundingBox(info->mMesh,
105113
&minX, &minY, &minZ,
106114
&maxX, &maxY, &maxZ);
107-
info->bBoxMin = (minX, minY, minZ);
108-
info->bBoxMax = (maxX, maxY, maxZ);
115+
info->bBoxMin = toFloat3(minX, minY, minZ);
116+
info->bBoxMax = toFloat3(maxX, maxY, maxZ);
109117
gLookAt += (info->bBoxMin + info->bBoxMax)*0.5f;
110118
}
111119
gLookAt = gLookAt / (float)size;

tests/RenderScriptTests/ShadersTest/src/com/android/shaderstest/shaderstest.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ static float gZoom;
5757
static float gLastX;
5858
static float gLastY;
5959

60+
static float3 toFloat3(float x, float y, float z) {
61+
float3 f;
62+
f.x = x;
63+
f.y = y;
64+
f.z = z;
65+
return f;
66+
}
67+
6068
void onActionDown(float x, float y) {
6169
gLastX = x;
6270
gLastY = y;
@@ -112,8 +120,8 @@ void updateMeshInfo() {
112120
rsgMeshComputeBoundingBox(info->mMesh,
113121
&minX, &minY, &minZ,
114122
&maxX, &maxY, &maxZ);
115-
info->bBoxMin = (minX, minY, minZ);
116-
info->bBoxMax = (maxX, maxY, maxZ);
123+
info->bBoxMin = toFloat3(minX, minY, minZ);
124+
info->bBoxMax = toFloat3(maxX, maxY, maxZ);
117125
gLookAt += (info->bBoxMin + info->bBoxMax)*0.5f;
118126
}
119127
gLookAt = gLookAt / (float)size;

0 commit comments

Comments
 (0)