--- ray/src/util/rtpict.pl 2019/07/23 18:17:55 2.9 +++ ray/src/util/rtpict.pl 2019/08/14 22:57:24 2.11 @@ -1,5 +1,5 @@ #!/usr/bin/perl -w -# RCSid $Id: rtpict.pl,v 2.9 2019/07/23 18:17:55 greg Exp $ +# RCSid $Id: rtpict.pl,v 2.11 2019/08/14 22:57:24 greg Exp $ # # Run rtrace in parallel mode to simulate rpict -n option # May also be used to render layered images with -o* option @@ -139,10 +139,8 @@ my @res = split(/\s/, `@vwraysA -d`); ##### Generating picture with depth buffer? if (defined $outzbf) { exec "@vwraysA | @rtraceA -fff -olv @res $oct | " . - "rsplit -ih -iH -f " . - "-of $outzbf " . - "-oh -oH -of3 '!pvalue -r -df' | " . - "getinfo -a 'VIEW=$view'"; + "rsplit -ih -iH -f -of $outzbf -oh -oH -of3 - | " . + "pvalue -r -df | getinfo -a 'VIEW=$view'"; } ##################################################################### ##### Base case with output picture only? @@ -155,12 +153,12 @@ my @rsplitA = ("rsplit", "'-t '", "-ih", "-iH", "-oh", # Supported rtrace -o* options and output file name.typ my %rtoutC = ( v => 'radiance.hdr', - r => 'mirrored.hdr', - x => 'unmirrored.hdr', - l => 'effective.dpt', - L => 'firstsurface.dpt', - R => 'mirrored.dpt', - X => 'unmirrored.dpt', + r => 'r_refl.hdr', + x => 'r_unrefl.hdr', + l => 'd_effective.dpt', + L => 'd_firstsurf.dpt', + R => 'd_refl.dpt', + X => 'd_unrefl.dpt', n => 'perturbed.nrm', N => 'unperturbed.nrm', s => 'surface.idx',