289 |
|
char *s |
290 |
|
) |
291 |
|
{ |
292 |
< |
FVECT vc; |
292 |
> |
char buf[64]; |
293 |
|
double dist; |
294 |
|
|
295 |
|
if (sscanf(s, "%lf", &dist) < 1) { |
305 |
|
error(COMMAND, "not on image"); |
306 |
|
return; |
307 |
|
} |
308 |
< |
rayorigin(&thisray, NULL, PRIMARY, 1.0); |
308 |
> |
rayorigin(&thisray, PRIMARY, NULL, NULL); |
309 |
|
if (!localhit(&thisray, &thescene)) { |
310 |
|
error(COMMAND, "not a local object"); |
311 |
|
return; |
316 |
|
return; |
317 |
|
} |
318 |
|
ourview.vdist = dist; |
319 |
+ |
sprintf(buf, "Focus distance set to %f\n", dist); |
320 |
+ |
(*dev->comout)(buf); |
321 |
|
} |
322 |
|
|
323 |
|
|
524 |
|
|
525 |
|
if (s[0] == '\0') { |
526 |
|
(*dev->comout)( |
527 |
< |
"aa ab ad ar as av aw b dc dv dj ds dt i lr lw me ma mg ms ps pt sj st bv: "); |
527 |
> |
"aa ab ad ar as av aw b bv dc dv dj ds dt i lr lw me ma mg ms ps pt sj st u: "); |
528 |
|
(*dev->comin)(buf, NULL); |
529 |
|
s = buf; |
530 |
|
} |
531 |
|
switch (s[0]) { |
532 |
+ |
case 'u': /* uncorrelated sampling */ |
533 |
+ |
getparam(s+1, "uncorrelated sampling", 'b', |
534 |
+ |
(void *)&rand_samp); |
535 |
+ |
break; |
536 |
|
case 'l': /* limit */ |
537 |
|
switch (s[1]) { |
538 |
|
case 'w': /* weight */ |
725 |
|
return; |
726 |
|
} |
727 |
|
|
728 |
< |
rayorigin(&thisray, NULL, PRIMARY, 1.0); |
728 |
> |
rayorigin(&thisray, PRIMARY, NULL, NULL); |
729 |
|
|
730 |
|
rayvalue(&thisray); |
731 |
|
|
733 |
|
(*dev->comout)("ray hit nothing"); |
734 |
|
else { |
735 |
|
OBJREC *mat = NULL; |
736 |
< |
OBJREC *mod = NULL;; |
736 |
> |
OBJREC *mod = NULL; |
737 |
|
char matspec[256]; |
738 |
|
matspec[0] = '\0'; |
739 |
|
if (thisray.ro->omod != OVOID) { |
744 |
|
strcpy(matspec, "back of "); |
745 |
|
if (mod != NULL) { |
746 |
|
strcat(matspec, mod->oname); |
747 |
< |
if (mat != mod) |
748 |
< |
sprintf(matspec+strlen(matspec), " (%s)", |
749 |
< |
mat!=NULL ? mat->oname : VOIDID); |
747 |
> |
if (mat != mod && mat != NULL) |
748 |
> |
sprintf(matspec+strlen(matspec), |
749 |
> |
" (%s)", mat->oname); |
750 |
|
} else |
751 |
|
strcat(matspec, VOIDID); |
752 |
|
sprintf(buf, "ray hit %s %s \"%s\"", matspec, |