Skip to content

Commit 33443b5

Browse files
author
Brig Bagley
committed
fixed flat shading. converts int->float colors if needed.
1 parent 6c56c61 commit 33443b5

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

src/Modules/Visualization/ShowField.cc

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,14 @@ RenderState ShowFieldModule::getNodeRenderState(
123123
renState.set(RenderState::USE_SPHERE, state->getValue(ShowFieldModule::NodeAsSpheres).toInt() == 1);
124124

125125
renState.defaultColor = ColorRGB(state->getValue(ShowFieldModule::DefaultMeshColor).toString());
126+
renState.defaultColor = (renState.defaultColor.r() > 1.0 ||
127+
renState.defaultColor.g() > 1.0 ||
128+
renState.defaultColor.b() > 1.0)?
129+
ColorRGB(
130+
renState.defaultColor.r() / 255.,
131+
renState.defaultColor.g() / 255.,
132+
renState.defaultColor.b() / 255.)
133+
: renState.defaultColor;
126134

127135
sphereScalar_ = state->getValue(ShowFieldModule::SphereScaleValue).toDouble();
128136

@@ -152,6 +160,14 @@ RenderState ShowFieldModule::getEdgeRenderState(
152160
renState.set(RenderState::USE_CYLINDER, state->getValue(ShowFieldModule::EdgesAsCylinders).toInt() == 1);
153161

154162
renState.defaultColor = ColorRGB(state->getValue(ShowFieldModule::DefaultMeshColor).toString());
163+
renState.defaultColor = (renState.defaultColor.r() > 1.0 ||
164+
renState.defaultColor.g() > 1.0 ||
165+
renState.defaultColor.b() > 1.0)?
166+
ColorRGB(
167+
renState.defaultColor.r() / 255.,
168+
renState.defaultColor.g() / 255.,
169+
renState.defaultColor.b() / 255.)
170+
: renState.defaultColor;
155171

156172
edgeTransparencyValue_ = (float)(state->getValue(ShowFieldModule::EdgeTransparencyValue).toDouble());
157173

@@ -177,6 +193,14 @@ RenderState ShowFieldModule::getFaceRenderState(
177193
renState.set(RenderState::USE_TRANSPARENCY, state->getValue(ShowFieldModule::FaceTransparency).toBool());
178194

179195
renState.defaultColor = ColorRGB(state->getValue(ShowFieldModule::DefaultMeshColor).toString());
196+
renState.defaultColor = (renState.defaultColor.r() > 1.0 ||
197+
renState.defaultColor.g() > 1.0 ||
198+
renState.defaultColor.b() > 1.0)?
199+
ColorRGB(
200+
renState.defaultColor.r() / 255.,
201+
renState.defaultColor.g() / 255.,
202+
renState.defaultColor.b() / 255.)
203+
: renState.defaultColor;
180204

181205
faceTransparencyValue_ = (float)(state->getValue(ShowFieldModule::FaceTransparencyValue).toDouble());
182206

0 commit comments

Comments
 (0)