1 |
– |
/* Copyright (c) 1991 Regents of the University of California */ |
2 |
– |
|
1 |
|
#ifndef lint |
2 |
< |
static char SCCSid[] = "$SunId$ LBL"; |
2 |
> |
static const char RCSid[] = "$Id$"; |
3 |
|
#endif |
6 |
– |
|
4 |
|
/* |
5 |
|
* Routines to do the actual calculation for mkillum |
6 |
|
*/ |
115 |
|
objerror(ob, WARNING, "bad aspect"); |
116 |
|
rt->nrays = 0; |
117 |
|
freeface(ob); |
118 |
< |
free((char *)distarr); |
118 |
> |
free((void *)distarr); |
119 |
|
o_default(ob, il, rt, nm); |
120 |
|
return; |
121 |
|
} |
134 |
|
printobj(il->altmat, ob); |
135 |
|
/* clean up */ |
136 |
|
freeface(ob); |
137 |
< |
free((char *)distarr); |
137 |
> |
free((void *)distarr); |
138 |
|
#undef MAXMISS |
139 |
|
} |
140 |
|
|
160 |
|
nalt = nazi = 1; |
161 |
|
else { |
162 |
|
n = 4.*PI * il->sampdens; |
163 |
< |
nalt = sqrt(n/PI) + .5; |
164 |
< |
nazi = PI*nalt + .5; |
163 |
> |
nalt = sqrt(2./PI*n) + .5; |
164 |
> |
nazi = PI/2.*nalt + .5; |
165 |
|
} |
166 |
|
n = nalt*nazi; |
167 |
|
distarr = (float *)calloc(n, 3*sizeof(float)); |
204 |
|
} else |
205 |
|
printobj(il->altmat, ob); |
206 |
|
/* clean up */ |
207 |
< |
free((char *)distarr); |
207 |
> |
free((void *)distarr); |
208 |
|
} |
209 |
|
|
210 |
|
|
257 |
|
r1 = r3*cos(r2); |
258 |
|
r2 = r3*sin(r2); |
259 |
|
for (j = 0; j < 3; j++) |
260 |
< |
org[j] = CO_P0(co)[j] + r1*u[j] + r1*v[j] + |
260 |
> |
org[j] = CO_P0(co)[j] + r1*u[j] + r2*v[j] + |
261 |
|
.001*co->ad[j]; |
262 |
|
|
263 |
|
/* send sample */ |
273 |
|
printobj(il->altmat, ob); |
274 |
|
/* clean up */ |
275 |
|
freecone(ob); |
276 |
< |
free((char *)distarr); |
276 |
> |
free((void *)distarr); |
277 |
|
} |
278 |
|
|
279 |
|
|
303 |
|
bzero(rt->buf+6*rt->nrays, 6*sizeof(float)); |
304 |
|
errno = 0; |
305 |
|
if ( process(rt->pd, (char *)rt->buf, (char *)rt->buf, |
306 |
< |
3*sizeof(float)*rt->nrays, |
306 |
> |
3*sizeof(float)*(rt->nrays+1), |
307 |
|
6*sizeof(float)*(rt->nrays+1)) < |
308 |
< |
3*sizeof(float)*rt->nrays ) |
308 |
> |
3*sizeof(float)*(rt->nrays+1) ) |
309 |
|
error(SYSTEM, "error reading from rtrace process"); |
310 |
|
i = rt->nrays; |
311 |
|
while (i--) { |