--- ray/src/util/glare.csh	1991/11/12 12:07:24	1.11
+++ ray/src/util/glare.csh	2003/02/22 02:07:30	2.4
@@ -1,5 +1,5 @@
 #!/bin/csh -f
-# SCCSid "$SunId$ LBL"
+# RCSid: $Id: glare.csh,v 2.4 2003/02/22 02:07:30 greg Exp $
 #
 # Interactive program for calculating glare values
 #
@@ -7,10 +7,15 @@ set fgargs=(-v)
 set nofile="none"
 set octree=$nofile
 set picture=$nofile
+set glarefile=$nofile
 if ($#argv >= 1) then
 	set glarefile=$argv[1]
-else
-	set glarefile=$nofile
+	if ($#argv >= 2) then
+		set picture=$argv[2]
+		if ($#argv >= 3) then
+			set octree=$argv[3]
+		endif
+	endif
 endif
 set rtargs=
 set view=
@@ -55,8 +60,12 @@ so the view specification is optional unless you are s
 octree.
 
 _EOF_
-	readvar picture
-	readvar octree
+	if ( $picture == $nofile ) then
+		readvar picture
+	endif
+	if ( $octree == $nofile ) then
+		readvar octree
+	endif
 	readvar view
 	if ( $picture == $nofile && $octree == $nofile ) then
 		echo "You must specify a picture or an octree"
@@ -149,9 +158,9 @@ if ($?DISPLAY && $picture != $nofile) then
 	echo "Displaying glare sources in '$picture'..."
 	xglaresrc $picture $glarefile
 endif
-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")
-set bcdlvl=(50 124 18.5)
+set ndxnam=("Guth Visual Comfort Probability" "Guth Disability Glare Ratio" "CIE Glare Index" "BRS Glare Index" "Unified Glare Rating" "Daylight Glare Index")
+set ndxcom=("glarendx -t guth_vcp" "glarendx -t guth_dgr" "glarendx -t cie_cgi" "glarendx -t brs_gi" "glarendx -t ugr" "glarendx -t dgi")
+set bcdlvl=(50 124 18.5 18.5 18.5 21.7)
 while ( 1 )
 	echo ""
 	echo "	0.  Quit"