Skip to content

Commit 4646b55

Browse files
committed
Clang fix
1 parent 422aedc commit 4646b55

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

src/Modules/Visualization/InterfaceWithOspray.cc

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,12 @@ namespace detail
117117
imgSize.x = state->getValue(Parameters::ImageWidth).toInt();
118118
imgSize.y = state->getValue(Parameters::ImageHeight).toInt();
119119

120+
auto toFloat = [state](const Name& name) { return static_cast<float>(state->getValue(name).toDouble()); };
121+
120122
// camera
121-
float cam_pos[] = { state->getValue(Parameters::CameraPositionX).toDouble(), state->getValue(Parameters::CameraPositionY).toDouble(), state->getValue(Parameters::CameraPositionZ).toDouble() };
122-
float cam_up[] = { state->getValue(Parameters::CameraUpX).toDouble(), state->getValue(Parameters::CameraUpY).toDouble(), state->getValue(Parameters::CameraUpZ).toDouble() };
123-
float cam_view[] = { state->getValue(Parameters::CameraViewX).toDouble(), state->getValue(Parameters::CameraViewY).toDouble(), state->getValue(Parameters::CameraViewZ).toDouble() };
123+
float cam_pos[] = { toFloat(Parameters::CameraPositionX), toFloat(Parameters::CameraPositionY), toFloat(Parameters::CameraPositionZ) };
124+
float cam_up[] = { toFloat(Parameters::CameraUpX), toFloat(Parameters::CameraUpY), toFloat(Parameters::CameraUpZ) };
125+
float cam_view[] = { toFloat(Parameters::CameraViewX), toFloat(Parameters::CameraViewY), toFloat(Parameters::CameraViewZ) };
124126

125127
auto map = colorMap.value_or(nullptr);
126128
std::vector<float> vertex, color;
@@ -200,9 +202,9 @@ namespace detail
200202

201203
// complete setup of renderer
202204
ospSet1i(renderer, "aoSamples", 1);
203-
ospSet3f(renderer, "bgColor", state->getValue(Parameters::BackgroundColorR).toDouble(),
204-
state->getValue(Parameters::BackgroundColorG).toDouble(),
205-
state->getValue(Parameters::BackgroundColorB).toDouble());
205+
ospSet3f(renderer, "bgColor", toFloat(Parameters::BackgroundColorR),
206+
toFloat(Parameters::BackgroundColorG),
207+
toFloat(Parameters::BackgroundColorB));
206208
ospSetObject(renderer, "model", world);
207209
ospSetObject(renderer, "camera", camera);
208210
ospSetObject(renderer, "lights", lights);

0 commit comments

Comments
 (0)