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; |
522 |
|
|
523 |
|
if (s[0] == '\0') { |
524 |
|
(*dev->comout)( |
525 |
< |
"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: "); |
525 |
> |
"aa ab ad ar as av aw b dc dv dj ds dt i lr lw me ma mg ms ps pt R sj st bv: "); |
526 |
|
(*dev->comin)(buf, NULL); |
527 |
|
s = buf; |
528 |
|
} |
529 |
|
switch (s[0]) { |
530 |
+ |
case 'R': /* random sampling */ |
531 |
+ |
getparam(s+1, "random sampling", 'b', |
532 |
+ |
(void *)&rand_samp); |
533 |
+ |
break; |
534 |
|
case 'l': /* limit */ |
535 |
|
switch (s[1]) { |
536 |
|
case 'w': /* weight */ |
723 |
|
return; |
724 |
|
} |
725 |
|
|
726 |
< |
rayorigin(&thisray, NULL, PRIMARY, 1.0); |
726 |
> |
rayorigin(&thisray, PRIMARY, NULL, NULL); |
727 |
|
|
728 |
|
rayvalue(&thisray); |
729 |
|
|
742 |
|
strcpy(matspec, "back of "); |
743 |
|
if (mod != NULL) { |
744 |
|
strcat(matspec, mod->oname); |
745 |
< |
if (mat != mod) |
746 |
< |
sprintf(matspec+strlen(matspec), " (%s)", |
747 |
< |
mat!=NULL ? mat->oname : VOIDID); |
745 |
> |
if (mat != mod && mat != NULL) |
746 |
> |
sprintf(matspec+strlen(matspec), |
747 |
> |
" (%s)", mat->oname); |
748 |
|
} else |
749 |
|
strcat(matspec, VOIDID); |
750 |
|
sprintf(buf, "ray hit %s %s \"%s\"", matspec, |