139 |
|
} |
140 |
|
|
141 |
|
|
142 |
< |
float * /* keep consistent with COLOR typedef */ |
142 |
> |
COLORV * |
143 |
|
greyof( /* convert color to greyscale */ |
144 |
|
COLOR col |
145 |
|
) |
517 |
|
) |
518 |
|
{ |
519 |
|
double d; |
520 |
– |
FVECT v1; |
520 |
|
VIEW nv = ourview; |
521 |
|
int i; |
522 |
|
|
523 |
|
spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.)); |
524 |
< |
if (elev != 0.0) { |
525 |
< |
fcross(v1, ourview.vup, nv.vdir); |
526 |
< |
normalize(v1); |
528 |
< |
spinvector(nv.vdir, nv.vdir, v1, elev*(PI/180.)); |
529 |
< |
} |
524 |
> |
if (elev != 0.0) |
525 |
> |
geodesic(nv.vdir, nv.vdir, nv.vup, elev*(-PI/180.), GEOD_RAD); |
526 |
> |
|
527 |
|
if (nv.type == VT_PAR) { |
528 |
|
nv.horiz /= mag; |
529 |
|
nv.vert /= mag; |