--- ray/src/util/glare.csh 1991/04/29 08:31:21 1.2 +++ ray/src/util/glare.csh 1991/05/02 15:32:06 1.6 @@ -62,6 +62,10 @@ _EOF_ echo "You must specify a picture or an octree" exit 1 endif + if ( $picture == $nofile && "$view" == "" ) then + echo "You must give a view if there is no picture" + exit 1 + endif if ( $picture != $nofile ) then if ( ! -r $picture ) then echo "Cannot read $picture" @@ -91,9 +95,9 @@ _EOF_ if ("$<" =~ [yY]) then set fgargs=(-r 400 $fgargs) else - set fgargs=(-r 200 $fgargs) + set fgargs=(-r 250 $fgargs) endif - echo -n "Are these sources very bright? " + echo -n "Are these sources relatively bright? " if ("$<" =~ [nN]*) then set fgargs=(-c $fgargs) endif @@ -138,8 +142,8 @@ if ($?DISPLAY && $picture != $nofile) then xglaresrc $picture $glarefile endif endif -set ndxnam=("Guth Visual Comfort Probability" "Guth Disability Glare Ratio") -set ndxcom=(guth_vcp guth_dgr) +set ndxnam=("Guth Visual Comfort Probability" "Guth Disability Glare Ratio" "CIE Glare Index") +set ndxcom=("glarendx -t guth_vcp" "glarendx -t guth_dgr" "glarendx -t cie_cgi") while ( 1 ) echo "" echo " 0. Quit"