--- ray/src/util/do_file.tcl 2012/06/03 20:32:49 2.19 +++ ray/src/util/do_file.tcl 2017/08/26 16:07:22 2.22 @@ -1,12 +1,12 @@ -# RCSid: $Id: do_file.tcl,v 2.19 2012/06/03 20:32:49 greg Exp $ +# RCSid: $Id: do_file.tcl,v 2.22 2017/08/26 16:07:22 greg Exp $ # # Choose the Rad Input File to work on. # proc preen {} { # clean up radvar global radvar rifname - foreach n {objects scene materials illum mkillum render oconv rvu rpict pfilt - RAWFILE ZFILE AMBFILE OPTFILE EXPOSURE ZONE REPORT} { + foreach n {objects scene materials illum mkillum mkpmap render oconv rvu rpict pfilt + RAWFILE ZFILE AMBFILE PGMAP PCMAP OPTFILE EXPOSURE ZONE REPORT} { if {! [info exists radvar($n)]} { set radvar($n) {} } @@ -83,6 +83,7 @@ proc setradvar stmt { # assign a rad variable mat* { eval lappend radvar(materials) $vval } ill* { eval lappend radvar(illum) $vval } mki* { eval lappend radvar(mkillum) $vval } + mkp* { eval lappend radvar(mkpmap) $vval } ren* { eval lappend radvar(render) $vval } oco* { eval lappend radvar(oconv) $vval } rvu { eval lappend radvar(rvu) $vval } @@ -106,6 +107,8 @@ proc setradvar stmt { # assign a rad variable REP* { set radvar(REPORT) $vval } RAW* { set radvar(RAWFILE) $vval } ZF* {set radvar(ZFILE) $vval } + PGM* {set radvar(PGMAP) $vval } + PCM* {set radvar(PCMAP) $vval } } } @@ -121,12 +124,6 @@ proc putradvar {fi vn} { # print out a rad variable foreach v $radvar(view) { puts $fi "view= $v" } - return - } - if {[lsearch -exact {ZONE QUALITY OCTREE PICTURE AMBFILE OPTFILE - EXPOSURE RESOLUTION UP INDIRECT DETAIL PENUMBRAS - EYESEP RAWFILE ZFILE VARIABILITY REPORT} $vn] >= 0} { - puts $fi "$vn= $radvar($vn)" return } puts -nonewline $fi "$vn="