ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/src/util/do_file.tcl
(Generate patch)

Comparing src/util/do_file.tcl (file contents):
Revision 2.15 by gregl, Tue Aug 12 15:19:05 1997 UTC vs.
Revision 2.21 by greg, Thu May 28 10:23:06 2015 UTC

# Line 1 | Line 1
1 < # SCCSid "$SunId$ LBL"
1 > # RCSid: $Id$
2   #
3   # Choose the Rad Input File to work on.
4   #
5  
6   proc preen {} {                 # clean up radvar
7          global radvar rifname
8 <        foreach n {objects scene materials illum mkillum render oconv pfilt
9 <                        RAWFILE ZFILE AMBFILE OPTFILE EXPOSURE ZONE REPORT} {
8 >        foreach n {objects scene materials illum mkillum mkpmap render oconv rvu rpict pfilt
9 >                        RAWFILE ZFILE AMBFILE PGMAP PCMAP OPTFILE EXPOSURE ZONE REPORT} {
10                  if {! [info exists radvar($n)]} {
11                          set radvar($n) {}
12                  }
# Line 43 | Line 43 | proc preen {} {                        # clean up radvar
43          if {! [info exists radvar(RESOLUTION)]} {
44                  set radvar(RESOLUTION) 512
45          }
46 +        if {! [info exists radvar(EYESEP)]} {
47 +                set radvar(EYESEP) 1
48 +        }
49          if [info exists radvar(QUALITY)] {
50                  cardval radvar(QUALITY) {High Medium Low}
51          } else {
# Line 80 | Line 83 | proc setradvar stmt {          # assign a rad variable
83                  mat* { eval lappend radvar(materials) $vval }
84                  ill* { eval lappend radvar(illum) $vval }
85                  mki* { eval lappend radvar(mkillum) $vval }
86 +                mkp* { eval lappend radvar(mkpmap) $vval }
87                  ren* { eval lappend radvar(render) $vval }
88                  oco* { eval lappend radvar(oconv) $vval }
89 +                rvu { eval lappend radvar(rvu) $vval }
90 +                rpi* { eval lappend radvar(rpict) $vval }
91                  pf* { eval lappend radvar(pfilt) $vval }
92                  vi* { lappend radvar(view) $vval }
93                  ZO* { set radvar(ZONE) $vval }
# Line 91 | Line 97 | proc setradvar stmt {          # assign a rad variable
97                  AMB* { set radvar(AMBFILE) $vval }
98                  OPT* { set radvar(OPTFILE) $vval }
99                  EXP* { set radvar(EXPOSURE) $vval }
100 +                EYE* { set radvar(EYESEP) $vval }
101                  RES* { set radvar(RESOLUTION) $vval }
102                  UP { set radvar(UP) $vval }
103                  IND* { set radvar(INDIRECT) $vval }
# Line 100 | Line 107 | proc setradvar stmt {          # assign a rad variable
107                  REP* { set radvar(REPORT) $vval }
108                  RAW* { set radvar(RAWFILE) $vval }
109                  ZF* {set radvar(ZFILE) $vval }
110 +                PGM* {set radvar(PGMAP) $vval }
111 +                PCM* {set radvar(PCMAP) $vval }
112          }
113                  
114   }
# Line 119 | Line 128 | proc putradvar {fi vn} {       # print out a rad variable
128          }
129          if {[lsearch -exact {ZONE QUALITY OCTREE PICTURE AMBFILE OPTFILE
130                          EXPOSURE RESOLUTION UP INDIRECT DETAIL PENUMBRAS
131 <                        RAWFILE ZFILE VARIABILITY REPORT} $vn] >= 0} {
131 >                        EYESEP RAWFILE ZFILE VARIABILITY REPORT} $vn] >= 0} {
132                  puts $fi "$vn= $radvar($vn)"
133                  return
134          }
# Line 149 | Line 158 | proc load_vars {f {vl all}} {  # load RIF variables
158          if {"$vl" == "all" && ! [chksave]} {return 0}
159          set curmess {Please wait...}
160          update
161 <        if [catch {exec rad -n -w -e $f >& /usr/tmp/ro[pid]}] {
162 <                set curmess [exec cat /usr/tmp/ro[pid]]
163 <                exec rm -f /usr/tmp/ro[pid]
161 >        if [catch {exec rad -n -w -e $f >& /tmp/ro[pid]}] {
162 >                set curmess [exec cat /tmp/ro[pid]]
163 >                exec rm -f /tmp/ro[pid]
164                  return 0
165          }
166 <        set fi [open /usr/tmp/ro[pid] r]
166 >        set fi [open /tmp/ro[pid] r]
167          if {"$vl" == "all"} {
168                  catch {unset radvar}
169                  while {[gets $fi curli] != -1} {
# Line 187 | Line 196 | proc load_vars {f {vl all}} {  # load RIF variables
196          }
197          set alldone [eof $fi]
198          close $fi
199 <        exec rm -f /usr/tmp/ro[pid]
199 >        exec rm -f /tmp/ro[pid]
200          preen
201          return 1
202   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines