summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormeta <s@w23.at>2011-01-17 23:36:05 (GMT)
committermeta <s@w23.at>2011-01-17 23:36:05 (GMT)
commit5c9ca91c2ce39f23246c95d23a982ac0f5721e28 (patch)
tree5df68bf4703135f20030b92cdbb76c69da40fff9 /src
parente01934a24da408ac28076cc151e00c17ad6172ee (diff)
fix truncation warning
Diffstat (limited to 'src')
-rw-r--r--src/polyset.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/polyset.cc b/src/polyset.cc
index d438769..022e6cc 100644
--- a/src/polyset.cc
+++ b/src/polyset.cc
@@ -149,7 +149,7 @@ void PolySet::render_surface(colormode_e colormode, csgmode_e csgmode, double *m
#ifdef ENABLE_OPENCSG
if (shaderinfo) {
glUniform4f(shaderinfo[1], col.redF(), col.greenF(), col.blueF(), 1.0f);
- glUniform4f(shaderinfo[2], 255 / 255.0, 236 / 255.0, 94 / 255.0, 1.0);
+ glUniform4f(shaderinfo[2], 255 / 255.0f, 236 / 255.0f, 94 / 255.0f, 1.0f);
}
#endif /* ENABLE_OPENCSG */
}
@@ -158,8 +158,8 @@ void PolySet::render_surface(colormode_e colormode, csgmode_e csgmode, double *m
glColor3f(col.redF(), col.greenF(), col.blueF());
#ifdef ENABLE_OPENCSG
if (shaderinfo) {
- glUniform4f(shaderinfo[1], 157 / 255.0, 203 / 255.0, 81 / 255.0, 1.0);
- glUniform4f(shaderinfo[2], 171 / 255.0, 216 / 255.0, 86 / 255.0, 1.0);
+ glUniform4f(shaderinfo[1], 157 / 255.0f, 203 / 255.0f, 81 / 255.0f, 1.0f);
+ glUniform4f(shaderinfo[2], 171 / 255.0f, 216 / 255.0f, 86 / 255.0f, 1.0f);
}
#endif /* ENABLE_OPENCSG */
}
@@ -167,8 +167,8 @@ void PolySet::render_surface(colormode_e colormode, csgmode_e csgmode, double *m
glColor4ub(255, 157, 81, 128);
#ifdef ENABLE_OPENCSG
if (shaderinfo) {
- glUniform4f(shaderinfo[1], 255 / 255.0, 157 / 255.0, 81 / 255.0, 0.5);
- glUniform4f(shaderinfo[2], 255 / 255.0, 171 / 255.0, 86 / 255.0, 0.5);
+ glUniform4f(shaderinfo[1], 255 / 255.0f, 157 / 255.0f, 81 / 255.0f, 0.5f);
+ glUniform4f(shaderinfo[2], 255 / 255.0f, 171 / 255.0f, 86 / 255.0f, 0.5f);
}
#endif /* ENABLE_OPENCSG */
}
@@ -176,8 +176,8 @@ void PolySet::render_surface(colormode_e colormode, csgmode_e csgmode, double *m
glColor4ub(180, 180, 180, 128);
#ifdef ENABLE_OPENCSG
if (shaderinfo) {
- glUniform4f(shaderinfo[1], 180 / 255.0, 180 / 255.0, 180 / 255.0, 0.5);
- glUniform4f(shaderinfo[2], 150 / 255.0, 150 / 255.0, 150 / 255.0, 0.5);
+ glUniform4f(shaderinfo[1], 180 / 255.0f, 180 / 255.0f, 180 / 255.0f, 0.5f);
+ glUniform4f(shaderinfo[2], 150 / 255.0f, 150 / 255.0f, 150 / 255.0f, 0.5f);
}
#endif /* ENABLE_OPENCSG */
}
contact: Jan Huwald // Impressum