27 |
|
|
28 |
|
double pj = 0.; |
29 |
|
|
30 |
+ |
double pd = 0.; |
31 |
+ |
|
32 |
|
int zfd = -1; |
33 |
|
|
34 |
|
int fromstdin = 0; |
115 |
|
pa = atof(argv[++i]); |
116 |
|
else if (argv[i][2] == 'j') |
117 |
|
pj = atof(argv[++i]); |
118 |
+ |
else if (argv[i][2] == 'd') |
119 |
+ |
pd = atof(argv[++i]); |
120 |
|
else |
121 |
|
goto userr; |
122 |
|
break; |
190 |
|
RREAL loc[2]; |
191 |
|
int pp[2]; |
192 |
|
double d; |
193 |
< |
int i; |
193 |
> |
int i, c; |
194 |
|
|
195 |
|
while (fscanf(fp, "%lf %lf", &px, &py) == 2) { |
196 |
|
px += .5; py += .5; |
213 |
|
exit(1); |
214 |
|
} |
215 |
|
} |
216 |
< |
jitterloc(loc); |
217 |
< |
d = viewray(rorg, rdir, &vw, loc[0], loc[1]); |
218 |
< |
if (d < -FTINY) |
219 |
< |
rorg[0] = rorg[1] = rorg[2] = |
220 |
< |
rdir[0] = rdir[1] = rdir[2] = 0.; |
221 |
< |
else if (zfd >= 0) |
222 |
< |
for (i = 0; i < 3; i++) { |
223 |
< |
rorg[i] += rdir[i]*zval; |
224 |
< |
rdir[i] = -rdir[i]; |
216 |
> |
for (c = repeatcnt; c-- > 0; ) { |
217 |
> |
jitterloc(loc); |
218 |
> |
d = viewray(rorg, rdir, &vw, loc[0], loc[1]); |
219 |
> |
if (d < -FTINY || !jitteraperture(rorg, rdir, &vw, pd)) |
220 |
> |
rorg[0] = rorg[1] = rorg[2] = |
221 |
> |
rdir[0] = rdir[1] = rdir[2] = 0.; |
222 |
> |
else if (zfd >= 0) |
223 |
> |
for (i = 0; i < 3; i++) { |
224 |
> |
rorg[i] += rdir[i]*zval; |
225 |
> |
rdir[i] = -rdir[i]; |
226 |
> |
} |
227 |
> |
else if (d > FTINY) { |
228 |
> |
rdir[0] *= d; rdir[1] *= d; rdir[2] *= d; |
229 |
|
} |
230 |
< |
else if (d > FTINY) { |
231 |
< |
rdir[0] *= d; rdir[1] *= d; rdir[2] *= d; |
230 |
> |
(*putr)(rorg, rdir); |
231 |
> |
if (c) { |
232 |
> |
loc[0] = px/rs.xr; loc[1] = py/rs.yr; |
233 |
> |
} |
234 |
|
} |
225 |
– |
(*putr)(rorg, rdir); |
235 |
|
if (unbuffered) |
236 |
|
fflush(stdout); |
237 |
|
} |
273 |
|
pix2loc(loc, &rs, si, sc); |
274 |
|
jitterloc(loc); |
275 |
|
d = viewray(rorg, rdir, &vw, loc[0], loc[1]); |
276 |
< |
if (d < -FTINY) |
276 |
> |
if (d < -FTINY || !jitteraperture(rorg, rdir, &vw, pd)) |
277 |
|
rorg[0] = rorg[1] = rorg[2] = |
278 |
|
rdir[0] = rdir[1] = rdir[2] = 0.; |
279 |
|
else if (zfd >= 0) |