Revision: 54996
http://brlcad.svn.sourceforge.net/brlcad/?rev=54996&view=rev
Author: brlcad
Date: 2013-04-01 06:05:18 +0000 (Mon, 01 Apr 2013)
Log Message:
-----------
yet more explicit indication of floating point, put a zero after the decimal
point.
Modified Paths:
--------------
brlcad/trunk/src/fb/fbcbars.c
brlcad/trunk/src/fb/fbcolor.c
brlcad/trunk/src/fb/fbgammamod.c
brlcad/trunk/src/libdm/dm-plot.c
brlcad/trunk/src/libdm/dm-ps.c
brlcad/trunk/src/libged/analyze.c
brlcad/trunk/src/libged/dg_obj.c
brlcad/trunk/src/libged/inside.c
brlcad/trunk/src/liboptical/sh_air.c
brlcad/trunk/src/liboptical/sh_fire.c
brlcad/trunk/src/liboptical/sh_spm.c
brlcad/trunk/src/liboptical/sh_toyota.c
brlcad/trunk/src/mged/dodraw.c
brlcad/trunk/src/rt/sh_tcl.c
brlcad/trunk/src/util/pixbackgnd.c
Modified: brlcad/trunk/src/fb/fbcbars.c
===================================================================
--- brlcad/trunk/src/fb/fbcbars.c 2013-04-01 05:52:46 UTC (rev 54995)
+++ brlcad/trunk/src/fb/fbcbars.c 2013-04-01 06:05:18 UTC (rev 54996)
@@ -94,7 +94,7 @@
#define SETUP 7.5 /* black setup; 7.5 IRE
*/
#define COMP(x) \
- (unsigned char)(((x) * 255.) / (1.0 - SETUP/100.0)) /* setup
compensation */
+ (unsigned char)(((x) * 255.0) / (1.0 - SETUP/100.0)) /* setup
compensation */
static RGBpixel fcc_all[8] = {
/* 100% white */{255, 255, 255},
Modified: brlcad/trunk/src/fb/fbcolor.c
===================================================================
--- brlcad/trunk/src/fb/fbcolor.c 2013-04-01 05:52:46 UTC (rev 54995)
+++ brlcad/trunk/src/fb/fbcolor.c 2013-04-01 06:05:18 UTC (rev 54996)
@@ -319,20 +319,20 @@
if (r != v) {
if (g == v) {
if (b != x)
- h = (int) (42.5 * (3. - (double)(v-b) / dif));
+ h = (int) (42.5 * (3.0 - (double)(v-b) / dif));
else
- h = (int) (42.5 * (1. + (double)(v-r) / dif));
+ h = (int) (42.5 * (1.0 + (double)(v-r) / dif));
} else {
if (r != x)
- h = (int) (42.5 * (5. - (double)(v-r) / dif));
+ h = (int) (42.5 * (5.0 - (double)(v-r) / dif));
else
- h = (int) (42.5 * (3. + (double)(v-g) / dif));
+ h = (int) (42.5 * (3.0 + (double)(v-g) / dif));
}
} else {
if (g != x)
- h = (int) (42.5 * (1. - (double)(v-g) / dif));
+ h = (int) (42.5 * (1.0 - (double)(v-g) / dif));
else
- h = (int) (42.5 * (5. + (double)(v-b) / dif));
+ h = (int) (42.5 * (5.0 + (double)(v-b) / dif));
}
}
@@ -362,13 +362,13 @@
if (hsv[1] != 0)
{
- s = (double)hsv[1] / 255.;
+ s = (double)hsv[1] / 255.0;
h = (double)hsv[0] / 42.666;
f = modf(h, &(foo));
v = (double)hsv[2];
- m = (int) (v * (1. - s) + .5);
- n = (int) (v * (1. - s*f) + .5);
- k = (int) (v * (1. - (s * (1.-f))) + .5);
+ m = (int) (v * (1.0 - s) + .5);
+ n = (int) (v * (1.0 - s*f) + .5);
+ k = (int) (v * (1.0 - (s * (1.-f))) + .5);
switch ((int) h)
{
case 0:
Modified: brlcad/trunk/src/fb/fbgammamod.c
===================================================================
--- brlcad/trunk/src/fb/fbgammamod.c 2013-04-01 05:52:46 UTC (rev 54995)
+++ brlcad/trunk/src/fb/fbgammamod.c 2013-04-01 06:05:18 UTC (rev 54996)
@@ -182,9 +182,9 @@
gexp = 1.0 / ( post_gam + gg - 1 );
bexp = 1.0 / ( post_gam + bg - 1 );
- radd = (ra + add) / 255.;
- gadd = (ga + add) / 255.;
- badd = (ba + add) / 255.;
+ radd = (ra + add) / 255.0;
+ gadd = (ga + add) / 255.0;
+ badd = (ba + add) / 255.0;
rmul = rm * mul;
gmul = gm * mul;
Modified: brlcad/trunk/src/libdm/dm-plot.c
===================================================================
--- brlcad/trunk/src/libdm/dm-plot.c 2013-04-01 05:52:46 UTC (rev 54995)
+++ brlcad/trunk/src/libdm/dm-plot.c 2013-04-01 06:05:18 UTC (rev 54996)
@@ -484,14 +484,14 @@
plot_setWinBounds(struct dm *dmp, fastf_t *w)
{
/* Compute the clipping bounds */
- dmp->dm_clipmin[0] = w[0] / 2048.;
- dmp->dm_clipmax[0] = w[1] / 2047.;
- dmp->dm_clipmin[1] = w[2] / 2048.;
- dmp->dm_clipmax[1] = w[3] / 2047.;
+ dmp->dm_clipmin[0] = w[0] / 2048.0;
+ dmp->dm_clipmax[0] = w[1] / 2047.0;
+ dmp->dm_clipmin[1] = w[2] / 2048.0;
+ dmp->dm_clipmax[1] = w[3] / 2047.0;
if (dmp->dm_zclip) {
- dmp->dm_clipmin[2] = w[4] / 2048.;
- dmp->dm_clipmax[2] = w[5] / 2047.;
+ dmp->dm_clipmin[2] = w[4] / 2048.0;
+ dmp->dm_clipmax[2] = w[5] / 2047.0;
} else {
dmp->dm_clipmin[2] = -1.0e20;
dmp->dm_clipmax[2] = 1.0e20;
Modified: brlcad/trunk/src/libdm/dm-ps.c
===================================================================
--- brlcad/trunk/src/libdm/dm-ps.c 2013-04-01 05:52:46 UTC (rev 54995)
+++ brlcad/trunk/src/libdm/dm-ps.c 2013-04-01 06:05:18 UTC (rev 54996)
@@ -488,14 +488,14 @@
ps_setWinBounds(struct dm *dmp, fastf_t *w)
{
/* Compute the clipping bounds */
- dmp->dm_clipmin[0] = w[0] / 2048.;
- dmp->dm_clipmax[0] = w[1] / 2047.;
- dmp->dm_clipmin[1] = w[2] / 2048.;
- dmp->dm_clipmax[1] = w[3] / 2047.;
+ dmp->dm_clipmin[0] = w[0] / 2048.0;
+ dmp->dm_clipmax[0] = w[1] / 2047.0;
+ dmp->dm_clipmin[1] = w[2] / 2048.0;
+ dmp->dm_clipmax[1] = w[3] / 2047.0;
if (dmp->dm_zclip) {
- dmp->dm_clipmin[2] = w[4] / 2048.;
- dmp->dm_clipmax[2] = w[5] / 2047.;
+ dmp->dm_clipmin[2] = w[4] / 2048.0;
+ dmp->dm_clipmax[2] = w[5] / 2047.0;
} else {
dmp->dm_clipmin[2] = -1.0e20;
dmp->dm_clipmax[2] = 1.0e20;
Modified: brlcad/trunk/src/libged/analyze.c
===================================================================
--- brlcad/trunk/src/libged/analyze.c 2013-04-01 05:52:46 UTC (rev 54995)
+++ brlcad/trunk/src/libged/analyze.c 2013-04-01 06:05:18 UTC (rev 54996)
@@ -1353,13 +1353,13 @@
vol_hyperb = area_hyperb*h;
/* surface area of hyperbolic body */
- area_body=0.;
+ area_body=0.0;
#if 0
k = (b+c)*(b+c) - c*c;
-#define X_eval(y) sqrt(1. + (4.*k)/(r*r*k*k*(y)*(y) + r*r*c*c))
+#define X_eval(y) sqrt(1.0 + (4.*k)/(r*r*k*k*(y)*(y) + r*r*c*c))
#define L_eval(y) .5*k*(y)*X_eval(y) \
+ r*k*(r*r*c*c + 4.*k - r*r*c*c/k)*arcsinh((y)*sqrt(k)/c)
- area_body = 2.*(L_eval(r) - L_eval(0.));
+ area_body = 2.*(L_eval(r) - L_eval(0.0));
#endif
bu_vls_printf(gedp->ged_result_str, "\n");
Modified: brlcad/trunk/src/libged/dg_obj.c
===================================================================
--- brlcad/trunk/src/libged/dg_obj.c 2013-04-01 05:52:46 UTC (rev 54995)
+++ brlcad/trunk/src/libged/dg_obj.c 2013-04-01 06:05:18 UTC (rev 54996)
@@ -3454,9 +3454,9 @@
if (tsp) {
if (tsp->ts_mater.ma_color_valid) {
sp->s_dflag = 0; /* color specified in db */
- sp->s_basecolor[0] = tsp->ts_mater.ma_color[0] * 255.;
- sp->s_basecolor[1] = tsp->ts_mater.ma_color[1] * 255.;
- sp->s_basecolor[2] = tsp->ts_mater.ma_color[2] * 255.;
+ sp->s_basecolor[0] = tsp->ts_mater.ma_color[0] * 255.0;
+ sp->s_basecolor[1] = tsp->ts_mater.ma_color[1] * 255.0;
+ sp->s_basecolor[2] = tsp->ts_mater.ma_color[2] * 255.0;
} else {
sp->s_dflag = 1; /* default color */
sp->s_basecolor[0] = 255;
Modified: brlcad/trunk/src/libged/inside.c
===================================================================
--- brlcad/trunk/src/libged/inside.c 2013-04-01 05:52:46 UTC (rev 54995)
+++ brlcad/trunk/src/libged/inside.c 2013-04-01 06:05:18 UTC (rev 54996)
@@ -764,7 +764,7 @@
VSET(Norm,
0.,
2 * bp * yp/(rp * rp),
- -1.);
+ -1.0);
VUNITIZE(Norm)
th = thick[3] / Norm[Y];
rpc->rpc_r -= th;
@@ -855,7 +855,7 @@
RT_ETO_CK_MAGIC(eto);
- c = 1. - thick[0]/MAGNITUDE(eto->eto_C);
+ c = 1.0 - thick[0]/MAGNITUDE(eto->eto_C);
VSCALE(eto->eto_C, eto->eto_C, c);
eto->eto_rd -= thick[0];
Modified: brlcad/trunk/src/liboptical/sh_air.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_air.c 2013-04-01 05:52:46 UTC (rev
54995)
+++ brlcad/trunk/src/liboptical/sh_air.c 2013-04-01 06:05:18 UTC (rev
54996)
@@ -249,7 +249,7 @@
if (swp->sw_transmit > 1.0) swp->sw_transmit = 1.0;
else if (swp->sw_transmit < 0.0) swp->sw_transmit = 0.0;
- /* extinction = 1. - transmission. Extinguished part replaced by
+ /* extinction = 1.0 - transmission. Extinguished part replaced by
* the "color of the air".
*/
Modified: brlcad/trunk/src/liboptical/sh_fire.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_fire.c 2013-04-01 05:52:46 UTC (rev
54995)
+++ brlcad/trunk/src/liboptical/sh_fire.c 2013-04-01 06:05:18 UTC (rev
54996)
@@ -479,7 +479,7 @@
VMOVE(swp->sw_color, color);
/* VSETALL(swp->sw_basecolor, 1.0);*/
- swp->sw_transmit = 1.0 - (lumens * 4.);
+ swp->sw_transmit = 1.0 - (lumens * 4.0);
if (swp->sw_reflect > 0 || swp->sw_transmit > 0)
(void)rr_render(ap, pp, swp);
Modified: brlcad/trunk/src/liboptical/sh_spm.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_spm.c 2013-04-01 05:52:46 UTC (rev
54995)
+++ brlcad/trunk/src/liboptical/sh_spm.c 2013-04-01 06:05:18 UTC (rev
54996)
@@ -86,7 +86,7 @@
VSET(swp->sw_color,
((double)cp[RED])/256.,
((double)cp[GRN])/256.,
- ((double)cp[BLU])/256.);
+ ((double)cp[BLU])/256.0);
return 1;
}
Modified: brlcad/trunk/src/liboptical/sh_toyota.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_toyota.c 2013-04-01 05:52:46 UTC (rev
54995)
+++ brlcad/trunk/src/liboptical/sh_toyota.c 2013-04-01 06:05:18 UTC (rev
54996)
@@ -177,7 +177,7 @@
tp->sun_sang = 6.840922996708585e-5; /* in steradians */
tp->index_refrac = 1.2;
bu_strlcpy(tp->material, "junk", sizeof(tp->material));
- VSET(tp->Zenith, 0., 0., 1.);
+ VSET(tp->Zenith, 0., 0., 1.0);
if (bu_struct_parse(matparm, toyota_parse, (char *)tp) < 0) {
BU_PUT(tp, struct toyota_specific);
@@ -284,7 +284,7 @@
air_mass(fastf_t air_gamma)
/* Solar altitude off horizon (degrees). */
{
- if (air_gamma <= 0.) {
+ if (air_gamma <= 0.0) {
bu_log("air_mass: sun altitude of %g degrees ignored.\n", air_gamma);
return 0;
}
@@ -305,7 +305,7 @@
/* Solar altitude off horizon (degrees). */
/* atmospheric turbidity (aerosol optical depth) */
{
- return 2000.; /* swag */
+ return 2000.0; /* swag */
}
@@ -323,7 +323,7 @@
/* luminance of the zenith */
/* vectors to zenith and a sky element */
{
- return lz * (1. + 2.*VDOT(Zenith, Sky_elmt)/3.);
+ return lz * (1.0 + 2.*VDOT(Zenith, Sky_elmt)/3.0);
}
@@ -340,7 +340,7 @@
/* vectors to a sky element and to sun */
/* Turbidity factor. */
{
- return 0.;
+ return 0.0;
}
@@ -374,7 +374,7 @@
lum =
lz
* (0.91 + 10*exp(-3.*sky_gamma) + 0.45*cos_gamma*cos_gamma)
- * (1. - exp(-0.32/cos_theta))
+ * (1.0 - exp(-0.32/cos_theta))
/ 0.27385*(0.91 + 10.*exp(-3.*z0) + 0.45*cos_z0*cos_z0);
return lum;
@@ -1394,7 +1394,7 @@
{250.00, 2.51369}
};
- if (lambda < 250. || lambda > 25000.)
+ if (lambda < 250. || lambda > 25000.0)
bu_bomb("atmos_irradiance: bad wavelength.");
@@ -1482,7 +1482,7 @@
{750., 0.004}
};
- if (lambda < 200. || lambda > 750.) {
+ if (lambda < 200. || lambda > 750.0) {
bu_bomb("ozone absorption: bad wavelength.");
}
/* Find index of lower lambda in table. */
@@ -1579,7 +1579,7 @@
{830., 619., -98., 65.}
};
- if (lambda < 300. || lambda > 830.) {
+ if (lambda < 300. || lambda > 830.0) {
bu_bomb("spectral_dist_table: bad wavelength.");
} else {
/* Do linear interpolation to find approximate values. */
@@ -1637,11 +1637,11 @@
break;
}
/* XXX hack */
- if (lum <= 0.) {/*bu_log("lum = %g\n", lum);*/ return 0.;}
+ if (lum <= 0.0) {/*bu_log("lum = %g\n", lum);*/ return 0.0;}
/* Convert to color temperature. Expression based on careful */
/* measurements by Toyota. */
- t_cp = 1.1985e8/pow(lum, 1.2) + 6500.; /* Kelvin */
+ t_cp = 1.1985e8/pow(lum, 1.2) + 6500.0; /* Kelvin */
/* Convert color temperature into spectral distribution */
/* using CIE synthesized daylight expression. */
@@ -1649,13 +1649,13 @@
/* Chromaticity coordinates, taken from Wyszecki, Guenter; Stiles, */
/* WS; "Color Science: Concepts and Methods, Quantitative Data and */
/* Formulae, " John Wiley and Sons, 1982, pp. 145-6. */
- if (t_cp >= 4000. && t_cp < 7000.) {
+ if (t_cp >= 4000. && t_cp < 7000.0) {
x =
-4.6070e9/(t_cp*t_cp*t_cp)
+ 2.9678e6/(t_cp*t_cp)
+ 0.09911e3/t_cp
+ 0.244063;
- } else if (t_cp >= 7000. && t_cp <= 25000.) {
+ } else if (t_cp >= 7000. && t_cp <= 25000.0) {
x =
-2.0064e9/(t_cp*t_cp*t_cp)
+ 1.9018e6/(t_cp*t_cp)
@@ -1756,7 +1756,7 @@
fastf_t work, work2; /* Intermediate results. */
work2 = (n2/n1)*(n2/n1);
- work = sqrt(work2 - (1. - cos_eps*cos_eps));
+ work = sqrt(work2 - (1.0 - cos_eps*cos_eps));
p_parallel = (cos_eps - work)/(cos_eps + work);
p_parallel *= p_parallel;
@@ -1802,7 +1802,7 @@
/* Find "nearby" values of lambda, absorption for interpolation. */
if ((n = fscanf(fp, "%lf %lf", &l, &a)) != 2 || lambda + MIKE_TOL < l) {
fclose(fp);
- return -1.;
+ return -1.0;
}
lambda_l = l;
absorp_l = a;
@@ -1814,7 +1814,7 @@
}
if (n != 2) {
fclose(fp);
- return -1.;
+ return -1.0;
} else {
lambda_h = l;
absorp_h = a;
@@ -2057,7 +2057,7 @@
kbz = 0.0073215;
/* Interpolate values of x, y, z. */
- if (lambda < 380. || lambda > 825.) {
+ if (lambda < 380. || lambda > 825.0) {
bu_log("lambda_to_rgb: bad wavelength, %g nm.", lambda);
bu_bomb("");
}
@@ -2145,7 +2145,7 @@
refl = reflectance(lambda, alpha0, ts->refl, ts->refl_lines);
}
alpha1 = alpha0; /* degrees. */
- while (refl > MIKE_TOL && alpha1 < 90.) {
+ while (refl > MIKE_TOL && alpha1 < 90.0) {
alpha1++;
refl = reflectance(lambda, alpha1, ts->refl, ts->refl_lines);
}
@@ -2176,20 +2176,20 @@
/* Set up coord axes with Ctr as Z axis. */
VCROSS(Xaxis, Yaxis, Ctr);
- irradiance = 0.;
+ irradiance = 0.0;
/* Integrate over solid angle. */
/* JUST INTEGRATE OVER HEMISPHERE - THIS IS CURRENTLY WRONG */
for (ang = SPREAD; ang < alpha_c; ang += SPREAD) {
r = sin(ang);
- for (phi = 0.; phi < 2*M_PI; phi += SPREAD) {
+ for (phi = 0.0; phi < 2*M_PI; phi += SPREAD) {
x = r*cos(phi);
y = r*sin(phi);
VJOIN2(Sky_elmnt, Ctr, x, Xaxis, y, Yaxis);
VUNITIZE(Sky_elmnt);
i_dot_n = VDOT(swp->sw_hit.hit_normal, Sky_elmnt);
- if (i_dot_n >= 1.) i_dot_n = .9999;
+ if (i_dot_n >= 1.0) i_dot_n = .9999;
if (rdebug&RDEBUG_RAYPLOT) {
- VSCALE(work, Sky_elmnt, 200.);
+ VSCALE(work, Sky_elmnt, 200.0);
VADD2(work, swp->sw_hit.hit_point, work);
pl_color(stdout, 0, 255, 0);
pdv_3line(stdout, swp->sw_hit.hit_point, work);
@@ -2198,7 +2198,7 @@
bg_radiance = skylight_spectral_dist(
lambda, ts->Zenith, Sky_elmnt,
Sun, ts->weather, t_vl);
- /* XXX hack */ if (i_dot_n > 0.) {
+ /* XXX hack */ if (i_dot_n > 0.0) {
irradiance +=
reflectance(lambda, acos(i_dot_n)*bn_radtodeg,
ts->refl, ts->refl_lines)
@@ -2212,7 +2212,7 @@
bg_radiance = skylight_spectral_dist(lambda, ts->Zenith, Ctr,
Sun, ts->weather, t_vl);
if (rdebug&RDEBUG_RAYPLOT) {
- VSCALE(work, Ctr, 200.);
+ VSCALE(work, Ctr, 200.0);
VADD2(work, swp->sw_hit.hit_point, work);
pl_color(stdout, 255, 50, 0);
pdv_3line(stdout, swp->sw_hit.hit_point, work);
@@ -2268,7 +2268,7 @@
ts->wavelength = 450; /* XXX nm */
- i_refl = 0.;
+ i_refl = 0.0;
/* Consider effects of light source (>1 doesn't make sense really). */
for (i=ap->a_rt_i->rti_nlights-1; i >= 0; i--) {
@@ -2288,7 +2288,7 @@
/* Create reflected ray. */
i_dot_n = VDOT(swp->sw_hit.hit_normal, ap->a_ray.r_dir);
- if (i_dot_n > 1.) i_dot_n = .9999;
+ if (i_dot_n > 1.0) i_dot_n = .9999;
VSCALE(work, swp->sw_hit.hit_normal, 2*i_dot_n);
VSUB2(Reflected, work, ap->a_ray.r_dir);
VUNITIZE(Reflected);
@@ -2311,7 +2311,7 @@
/* XXX Hack: it always misses */
if (rdebug&RDEBUG_RAYPLOT) {
- VSCALE(work, Reflected, 200.);
+ VSCALE(work, Reflected, 200.0);
VADD2(work, swp->sw_hit.hit_point, work);
pl_color(stdout, 0, 150, 255);
pdv_3line(stdout, swp->sw_hit.hit_point, work);
Modified: brlcad/trunk/src/mged/dodraw.c
===================================================================
--- brlcad/trunk/src/mged/dodraw.c 2013-04-01 05:52:46 UTC (rev 54995)
+++ brlcad/trunk/src/mged/dodraw.c 2013-04-01 06:05:18 UTC (rev 54996)
@@ -310,9 +310,9 @@
sp->s_dflag = 1; /* default color */
}
/* Copy into basecolor anyway, to prevent black */
- sp->s_basecolor[0] = tsp->ts_mater.ma_color[0] * 255.;
- sp->s_basecolor[1] = tsp->ts_mater.ma_color[1] * 255.;
- sp->s_basecolor[2] = tsp->ts_mater.ma_color[2] * 255.;
+ sp->s_basecolor[0] = tsp->ts_mater.ma_color[0] * 255.0;
+ sp->s_basecolor[1] = tsp->ts_mater.ma_color[1] * 255.0;
+ sp->s_basecolor[2] = tsp->ts_mater.ma_color[2] * 255.0;
}
}
sp->s_cflag = 0;
Modified: brlcad/trunk/src/rt/sh_tcl.c
===================================================================
--- brlcad/trunk/src/rt/sh_tcl.c 2013-04-01 05:52:46 UTC (rev 54995)
+++ brlcad/trunk/src/rt/sh_tcl.c 2013-04-01 06:05:18 UTC (rev 54996)
@@ -68,9 +68,9 @@
return TCL_ERROR;
}
- r = atoi(argv[3+0]) / 255.;
- g = atoi(argv[3+1]) / 255.;
- b = atoi(argv[3+2]) / 255.;
+ r = atoi(argv[3+0]) / 255.0;
+ g = atoi(argv[3+1]) / 255.0;
+ b = atoi(argv[3+2]) / 255.0;
rtip = (struct rt_i *)atol(argv[1]);
RT_CK_RTI(rtip);
Modified: brlcad/trunk/src/util/pixbackgnd.c
===================================================================
--- brlcad/trunk/src/util/pixbackgnd.c 2013-04-01 05:52:46 UTC (rev 54995)
+++ brlcad/trunk/src/util/pixbackgnd.c 2013-04-01 06:05:18 UTC (rev 54996)
@@ -78,17 +78,17 @@
if (!ZERO(r - v)) /* r != v */
if (ZERO(g - v)) /* g == v */
if (!ZERO(b - x)) /* b != x */
- h = (double)(42.5 * (3. - (double)(v-b) / dif));
+ h = (double)(42.5 * (3.0 - (double)(v-b) / dif));
else
- h = (double)(42.5 * (1. + (double)(v-r) / dif));
+ h = (double)(42.5 * (1.0 + (double)(v-r) / dif));
else if (!ZERO(r - x)) /* r != x */
- h = (double)(42.5 * (5. - (double)(v-r) / dif));
+ h = (double)(42.5 * (5.0 - (double)(v-r) / dif));
else
- h = (double)(42.5 * (3. + (double)(v-g) / dif));
+ h = (double)(42.5 * (3.0 + (double)(v-g) / dif));
else if (!ZERO(g - x)) /* g != x */
- h = (double)(42.5 * (1. - (double)(v-g) / dif));
+ h = (double)(42.5 * (1.0 - (double)(v-g) / dif));
else
- h = (double)(42.5 * (5. + (double)(v-b) / dif));
+ h = (double)(42.5 * (5.0 + (double)(v-b) / dif));
}
if (!ZERO(v))
@@ -114,13 +114,13 @@
double f;
if (!ZERO(hsv[1])) {
- s = (double)hsv[1] / 255.;
+ s = (double)hsv[1] / 255.0;
h = (double)hsv[0] / 42.666;
f = modf(h, &foo);
v = (double)hsv[2];
- m = (double)(v * (1. - s) + .5);
- n = (double)(v * (1. - s*f) + .5);
- k = (double)(v * (1. - (s * (1.-f))) + .5);
+ m = (double)(v * (1.0 - s) + .5);
+ n = (double)(v * (1.0 - s*f) + .5);
+ k = (double)(v * (1.0 - (s * (1.-f))) + .5);
switch ((int) h) {
case 0:
r = hsv[2];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Own the Future-Intel® Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest.
Compete for recognition, cash, and the chance to get your game
on Steam. $5K grand prize plus 10 genre and skill prizes.
Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
