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

Comparing ray/src/util/glare.csh (file contents):
Revision 1.1 by greg, Wed Apr 24 18:27:08 1991 UTC vs.
Revision 1.10 by greg, Wed May 8 11:08:01 1991 UTC

# Line 53 | Line 53 | If the viewpoint is not the same as the picture, an er
53   If no view is specified, the view parameters are taken from the picture,
54   so the view specification is optional unless you are starting from an
55   octree.
56 +
57   _EOF_
58          readvar picture
59          readvar octree
# Line 61 | Line 62 | _EOF_
62                  echo "You must specify a picture or an octree"
63                  exit 1
64          endif
65 +        if ( $picture == $nofile && "$view" == "" ) then
66 +                echo "You must give a view if there is no picture"
67 +                exit 1
68 +        endif
69          if ( $picture != $nofile ) then
70                  if ( ! -r $picture ) then
71                          echo "Cannot read $picture"
# Line 80 | Line 85 | With an octree, you should give the same options for -
85   so forth as are used to render the scene.  Please enter them below.
86  
87   _EOF_
88 +                if ($picture != $nofile) then
89 +                        echo "These are the parameters from the picture:"
90 +                        getinfo $picture
91 +                endif
92                  readvar rtargs
93                  set fgargs=($fgargs $rtargs $octree)
94          endif
# Line 90 | Line 99 | _EOF_
99                  if ("$<" =~ [yY]) then
100                          set fgargs=(-r 400 $fgargs)
101                  else
102 <                        set fgargs=(-r 200 $fgargs)
102 >                        set fgargs=(-r 250 $fgargs)
103                  endif
104 <                echo -n "Are these sources very bright? "
104 >                echo -n "Are these sources relatively bright? "
105                  if ("$<" =~ [nN]*) then
106                          set fgargs=(-c $fgargs)
107                  endif
# Line 131 | Line 140 | if ($?DISPLAY && $picture != $nofile) then
140          echo ""
141          echo "Displaying glare sources in '$picture'..."
142          xglaresrc $picture $glarefile
134        if ($status) then
135                x11image =+0+0 -g 2.6 $picture &
136                sleep 40
137                xglaresrc $picture $glarefile
138        endif
143   endif
144 < set ndxnam=("Guth Visual Comfort Probability" "Guth Disability Glare Ratio")
145 < set ndxcom=(guth_vcp guth_dgr)
144 > set ndxnam=("Guth Visual Comfort Probability" "Guth Disability Glare Ratio" "CIE Glare Index")
145 > set ndxcom=("glarendx -t guth_vcp" "glarendx -t guth_dgr" "glarendx -t cie_cgi")
146 > set bcdlvl=(50 124 18.5)
147   while ( 1 )
148          echo ""
149          echo "  0.  Quit"
# Line 172 | Line 177 | while ( 1 )
177                          else if ($octree != $nofile) then
178                                  set subtitle="$subtitle $octree"
179                          endif
180 +                        if ( "$subtitle" == "" ) then
181 +                                set subtitle="`getinfo < $glarefile | grep findglare`"
182 +                        endif
183                          cat <<_EOF_ > $plotfile
184 + include=line.plt
185   include=polar.plt
186   title="$ndxnam[$choice]"
187   subtitle="$subtitle"
188 + Bdata=
189 +        0       $bcdlvl[$choice]
190 +        360     $bcdlvl[$choice]
191 + ;
192 + Blabel="BCD level"
193   Adata=
194   _EOF_
195                          getinfo - < $gndxfile >> $plotfile

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines