--- ray/src/util/rtpict.pl	2019/08/16 04:32:46	2.12
+++ ray/src/util/rtpict.pl	2022/04/12 00:30:58	2.25
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# RCSid $Id: rtpict.pl,v 2.12 2019/08/16 04:32:46 greg Exp $
+# RCSid $Id: rtpict.pl,v 2.25 2022/04/12 00:30:58 greg Exp $
 #
 # Run rtrace in parallel mode to simulate rpict -n option
 # May also be used to render layered images with -o* option
@@ -11,27 +11,32 @@ use strict;
 my $nprocs = 1;
 # rtrace options and the associated number of arguments
 my %rtraceC = ('-dt',1, '-dc',1, '-dj',1, '-ds',1, '-dr',1, '-dp',1,
-		'-ss',1, '-st',1, '-e',1, '-am',1,
+		'-ss',1, '-st',1, '-e',1, '-am',1, '-P',1, '-PP',1,
 		'-ab',1, '-af',1, '-ai',1, '-aI',1, '-ae',1, '-aE',1,
 		'-av',3, '-aw',1, '-aa',1, '-ar',1, '-ad',1, '-as',1,
-		'-me',3, '-ma',3, '-mg',1, '-ms',1, '-lr',1, '-lw',1);
+		'-me',3, '-ma',3, '-mg',1, '-ms',1, '-lr',1, '-lw',1,
+		'-ap',2, '-am',1, '-ac',1, '-aC',1);
 # boolean rtrace options
 my @boolO = ('-w', '-bv', '-dv', '-i', '-u');
 # view options and the associated number of arguments
 my %vwraysC = ('-vf',1, '-vtv',0, '-vtl',0, '-vth',0, '-vta',0, '-vts',0, '-vtc',0,
 		'-x',1, '-y',1, '-vp',3, '-vd',3, '-vu',3, '-vh',1, '-vv',1,
-		'-vo',1, '-va',1, '-vs',1, '-vl',1, '-pa',1, '-pj',1);
+		'-vo',1, '-va',1, '-vs',1, '-vl',1, '-pa',1, '-pj',1, '-pd',1);
 # options we need to silently ignore
-my %ignoreC = ('-t',1, '-ps',1, '-pt',1, '-pm',1, '-pd',1);
+my %ignoreC = ('-t',1, '-ps',1, '-pt',1, '-pm',1,);
 # Starting options for rtrace (rpict values)
 my @rtraceA = split(' ', 'rtrace -u- -dt .05 -dc .5 -ds .25 -dr 1 ' .
 				'-aa .2 -ar 64 -ad 512 -as 128 -lr 7 -lw 1e-03');
-my @vwraysA = ('vwrays', '-ff', '-pj', '.67');
+my @vwraysA = ('vwrays', '-pj', '.67');
 my @vwrightA = ('vwright', '-vtv');
-my @rpictA = ('rpict');
+my @rpictA = ('rpict', '-ps', '1');
 my $outpatt = '^-o[vrxlLRXnNsmM]+';
 my $refDepth = "";
 my $irrad = 0;
+my $persist = 0;
+my $ambounce = 0;
+my $ambcache = 1;
+my $ambfile;
 my $outlyr;
 my $outdir;
 my $outpic;
@@ -40,7 +45,7 @@ OPTION:				# sort through options
 while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
 	# Check for file inclusion
 	if ("$ARGV[0]" =~ /^\@/) {
-		open my $handle, '<', substr($ARGV[0], 1);
+		open my $handle, '<', substr($ARGV[0], 1) or die "No file for $ARGV[0]\n";
 		shift @ARGV;
 		chomp(my @args = <$handle>);
 		close $handle;
@@ -75,6 +80,15 @@ while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
 	}
 	# Check rtrace options
 	if (defined $rtraceC{$ARGV[0]}) {
+		if ("$ARGV[0]" =~ /^-PP?$/) {
+			$persist = 1;
+		} elsif ("$ARGV[0]" eq '-ab') {
+			$ambounce = $ARGV[1];
+		} elsif ("$ARGV[0]" eq '-aa') {
+			$ambcache = ($ARGV[1] > 0.0);
+		} elsif ("$ARGV[0]" eq '-af') {
+			$ambfile = "$ARGV[1]";
+		}
 		push @rtraceA, $ARGV[0];
 		push @rpictA, shift(@ARGV);
 		for (my $i = $rtraceC{$rpictA[-1]}; $i-- > 0; ) {
@@ -124,7 +138,7 @@ if (defined $outpic) {		# redirect output?
 }
 #####################################################################
 ##### May as well run rpict?
-if ($nprocs == 1 && !defined($outdir)) {
+if ($nprocs == 1 && $persist == 0 && !defined($outdir)) {
 	push(@rpictA, $ARGV[0]) if ($#ARGV == 0);
 	exec @rpictA ;
 }
@@ -136,16 +150,42 @@ my $view = `@vwrightA 0`;
 chomp $view;
 my @res = split(/\s/, `@vwraysA -d`);
 #####################################################################
+##### Resort pixels to reduce ambient cache collisions?
+if ($nprocs > 1 && $ambounce > 0 && $ambcache && defined($ambfile)) {
+	if (!defined($outzbf) && !defined($outdir)) {
+		# Straight picture output, so just shuffle sample order
+		system "cnt -s $res[1] $res[3] > /tmp/ord$$.txt";
+		die "cnt error\n" if ( $? );
+		system "@vwraysA -ff -i < /tmp/ord$$.txt " .
+			"| @rtraceA -ffa -ov '$oct' > /tmp/pix$$.txt";
+		die "Error running rtrace\n" if ( $? );
+		system "( getinfo < /tmp/pix$$.txt | getinfo -a 'VIEW=$view'; " .
+			"getinfo - < /tmp/pix$$.txt | rlam /tmp/ord$$.txt - " .
+			"| sort -k2rn -k1n ) | pvalue -r -Y $res[3] +X $res[1]";
+		die "rlam error\n" if ( $? );
+		unlink ("/tmp/ord$$.txt", "/tmp/pix$$.txt");
+		exit 0;
+	}
+	# Else randomize overture calculation to prime ambient cache
+	my @ores = (int($res[1]/6), int($res[3]/6));
+	print STDERR "Running $ores[0] by $ores[1] overture calculation " .
+			"to populate '$ambfile'...\n";
+	system "cnt -s @ores | @vwraysA -i -ff -x $ores[0] -y $ores[1] -pj 0 " .
+		"| @rtraceA -ff -ov '$oct' > /dev/null";
+	die "Failure running overture\n" if ( $? );
+	print STDERR "Finished overture.\n";
+}
+#####################################################################
 ##### Generating picture with depth buffer?
 if (defined $outzbf) {
-	exec "@vwraysA | @rtraceA -fff -olv @res $oct | " .
-		"rsplit -ih -iH -f -of $outzbf -oh -oH -of3 - | " .
+	exec "@vwraysA -ff | @rtraceA -fff -olv @res '$oct' | " .
+		"rsplit -ih -iH -f -of '$outzbf' -oh -oH -of3 - | " .
 		"pvalue -r -df | getinfo -a 'VIEW=$view'";
 }
 #####################################################################
 ##### Base case with output picture only?
 if (! defined $outdir) {
-	exec "@vwraysA | @rtraceA -ffc @res $oct | getinfo -a 'VIEW=$view'";
+	exec "@vwraysA -ff | @rtraceA -ffc @res '$oct' | getinfo -a 'VIEW=$view'";
 }
 #####################################################################
 ##### Layered image output case
@@ -186,10 +226,12 @@ if (! -d $outdir) {
 foreach my $oval (split //, $outlyr) {
 	die "Duplicate or unsupported type '$oval' in -o$outlyr\n"
 					if (!defined $rtoutC{$oval});
+	my $outfile = "$outdir/$rtoutC{$oval}";
+	die "File '$outfile' already exists\n" if (-e $outfile);
 	my ($otyp) = ($rtoutC{$oval} =~ /(\.[^.]+)$/);
 	push @rsplitA, $rcodeC{$otyp}[0];
-	push @rsplitA, qq{'$rcodeC{$otyp}[1] > "$outdir/$rtoutC{$oval}"'};
+	push @rsplitA, qq{'$rcodeC{$otyp}[1] > "$outfile"'};
 	delete $rtoutC{$oval};
 }
 			# call rtrace + rsplit
-exec "@vwraysA | @rtraceA -fff @res $oct | getinfo -a 'VIEW=$view' | @rsplitA";
+exec "@vwraysA -ff | @rtraceA -fff @res '$oct' | getinfo -a 'VIEW=$view' | @rsplitA";