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; |
216 |
|
for (c = repeatcnt; c-- > 0; ) { |
217 |
|
jitterloc(loc); |
218 |
|
d = viewray(rorg, rdir, &vw, loc[0], loc[1]); |
219 |
< |
if (d < -FTINY) |
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) |
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) |