163 |
|
if (r2 == 0.) |
164 |
|
return(MG_EILL); |
165 |
|
inv = r2 < 0.; |
166 |
< |
} else if (r2 != 0. && inv ^ r2 < 0.) |
166 |
> |
} else if (r2 != 0. && inv ^ (r2 < 0.)) |
167 |
|
return(MG_EILL); |
168 |
|
if (inv) { |
169 |
|
r1 = -r1; |
276 |
|
xf_rotvect(norm, cv->n); /* rotate normal */ |
277 |
|
r1 = xf_scale(atof(av[2])); /* scale radii */ |
278 |
|
r2 = xf_scale(atof(av[3])); |
279 |
< |
if (r1 < 0. | r2 <= r1) |
279 |
> |
if ((r1 < 0.) | (r2 <= r1)) |
280 |
|
return(MG_EILL); |
281 |
|
if ((mat = material()) == NULL) /* get material */ |
282 |
|
return(MG_EBADMAT); |
421 |
|
{ |
422 |
|
static int ntris; |
423 |
|
BARYCCM bvecs; |
424 |
< |
FLOAT bcoor[3][3]; |
424 |
> |
RREAL bcoor[3][3]; |
425 |
|
C_VERTEX *cvt; |
426 |
|
FVECT v1, v2, v3; |
427 |
|
FVECT n1, n2, n3; |
490 |
|
} |
491 |
|
d = c_cmaterial->rd + c_cmaterial->td + |
492 |
|
c_cmaterial->rs + c_cmaterial->ts; |
493 |
< |
if (d < 0. | d > 1.) |
493 |
> |
if ((d < 0.) | (d > 1.)) |
494 |
|
return(NULL); |
495 |
|
/* check for glass/dielectric */ |
496 |
|
if (c_cmaterial->nr > 1.1 && |
621 |
|
register char *op, *arg; |
622 |
|
{ |
623 |
|
*op = ' '; |
624 |
< |
while (*++op = *arg++) |
624 |
> |
while ( (*++op = *arg++) ) |
625 |
|
; |
626 |
|
return(op); |
627 |
|
} |