346 |
|
error(COMMAND, "missing angle"); |
347 |
|
return; |
348 |
|
} |
349 |
< |
if (getinterest(sskip(sskip(s)), 0, vc, &mag) < 0) |
349 |
> |
if (getinterest(sskip2(s,2), 0, vc, &mag) < 0) |
350 |
|
return; |
351 |
|
moveview(angle, elev, mag, vc); |
352 |
|
} |
492 |
|
extern double shadthresh; |
493 |
|
extern double shadcert; |
494 |
|
extern COLOR ambval; |
495 |
+ |
extern int ambvwt; |
496 |
|
extern double ambacc; |
497 |
|
extern int ambres; |
498 |
|
extern int ambdiv; |
499 |
|
extern int ambssamp; |
500 |
|
extern int ambounce; |
501 |
|
extern COLOR cextinction; |
502 |
< |
extern double salbedo; |
502 |
> |
extern COLOR salbedo; |
503 |
|
extern double seccg; |
504 |
|
extern double ssampdist; |
505 |
|
extern int directvis; |
512 |
|
|
513 |
|
if (s[0] == '\0') { |
514 |
|
(*dev->comout)( |
515 |
< |
"aa ab ad ar as av b dc dv dj ds dt i lr lw me ma mg ms ps pt sj st bv: "); |
515 |
> |
"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: "); |
516 |
|
(*dev->comin)(buf, NULL); |
517 |
|
s = buf; |
518 |
|
} |
574 |
|
case 'v': /* value */ |
575 |
|
getparam(s+2, "ambient value", 'C', (COLOR *)ambval); |
576 |
|
break; |
577 |
+ |
case 'w': /* weight */ |
578 |
+ |
getparam(s+2, "ambient value weight", 'i', &ambvwt); |
579 |
+ |
break; |
580 |
|
case 'a': /* accuracy */ |
581 |
|
if (getparam(s+2, "ambient accuracy", 'r', &ambacc)) |
582 |
|
setambacc(ambacc); |
605 |
|
(COLOR *)cextinction); |
606 |
|
break; |
607 |
|
case 'a': /* scattering albedo */ |
608 |
< |
getparam(s+2, "scattering albedo", 'r', &salbedo); |
608 |
> |
getparam(s+2, "scattering albedo", 'C', |
609 |
> |
(COLOR *)salbedo); |
610 |
|
break; |
611 |
|
case 'g': /* scattering eccentricity */ |
612 |
|
getparam(s+2, "scattering eccentricity", 'r', &seccg); |
667 |
|
thisray.rmax = 0.0; |
668 |
|
|
669 |
|
if (!sscanvec(s, thisray.rorg) || |
670 |
< |
!sscanvec(sskip(sskip(sskip(s))), thisray.rdir)) { |
670 |
> |
!sscanvec(sskip2(s,3), thisray.rdir)) { |
671 |
|
|
672 |
|
if (dev->getcur == NULL) |
673 |
|
return; |