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

Comparing ray/src/util/do_file.tcl (file contents):
Revision 2.13 by greg, Fri May 17 13:53:07 1996 UTC vs.
Revision 2.17 by greg, Sat Feb 22 02:07:30 2003 UTC

# Line 1 | Line 1
1 < # SCCSid "$SunId$ LBL"
1 > # RCSid: $Id$
2   #
3   # Choose the Rad Input File to work on.
4   #
# 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 73 | Line 76 | proc preen {} {                        # clean up radvar
76  
77   proc setradvar stmt {           # assign a rad variable
78          global radvar
79 <        regexp {^([a-zA-Z][a-zA-Z0-9]*) *= *(.*)$} $stmt dummy vnam vval
79 >        regexp {^([a-zA-Z][a-zA-Z0-9]*) *=[     ]*(.*)$} $stmt dummy vnam vval
80          switch -glob $vnam {
81                  obj* { eval lappend radvar(objects) $vval }
82                  sce* { eval lappend radvar(scene) $vval }
# Line 91 | Line 94 | proc setradvar stmt {          # assign a rad variable
94                  AMB* { set radvar(AMBFILE) $vval }
95                  OPT* { set radvar(OPTFILE) $vval }
96                  EXP* { set radvar(EXPOSURE) $vval }
97 +                EYE* { set radvar(EYESEP) $vval }
98                  RES* { set radvar(RESOLUTION) $vval }
99                  UP { set radvar(UP) $vval }
100                  IND* { set radvar(INDIRECT) $vval }
# Line 119 | Line 123 | proc putradvar {fi vn} {       # print out a rad variable
123          }
124          if {[lsearch -exact {ZONE QUALITY OCTREE PICTURE AMBFILE OPTFILE
125                          EXPOSURE RESOLUTION UP INDIRECT DETAIL PENUMBRAS
126 <                        RAWFILE ZFILE VARIABILITY REPORT} $vn] >= 0} {
126 >                        EYESEP RAWFILE ZFILE VARIABILITY REPORT} $vn] >= 0} {
127                  puts $fi "$vn= $radvar($vn)"
128                  return
129          }
# Line 158 | Line 162 | proc load_vars {f {vl all}} {  # load RIF variables
162          if {"$vl" == "all"} {
163                  catch {unset radvar}
164                  while {[gets $fi curli] != -1} {
165 <                        if [regexp {^[a-zA-Z][a-zA-Z0-9]*= } $curli] {
165 >                        if [regexp {^[a-zA-Z][a-zA-Z0-9]* *=} $curli] {
166                                  setradvar $curli
167                          } else {
168                                  break
# Line 167 | Line 171 | proc load_vars {f {vl all}} {  # load RIF variables
171                  set curmess {Project loaded.}
172          } else {
173                  foreach n $vl {
174 <                        catch {unset radvar($n)}
174 >                        if [regexp {[a-z][a-z]*} $n] {
175 >                                set radvar($n) {}
176 >                        } else {
177 >                                catch {unset radvar($n)}
178 >                        }
179                  }
180                  while {[gets $fi curli] != -1} {
181                          if [regexp {^[a-zA-Z][a-zA-Z0-9]* *=} $curli] {

Diff Legend

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