--- ray/src/gen/glaze.csh 2004/08/14 19:36:38 2.3 +++ ray/src/gen/glaze.csh 2004/08/25 01:40:12 2.4 @@ -1,12 +1,12 @@ #!/bin/csh -f -# RCSid: $Id: glaze.csh,v 2.3 2004/08/14 19:36:38 greg Exp $ +# RCSid: $Id: glaze.csh,v 2.4 2004/08/25 01:40:12 greg Exp $ # # Complex glazing model (goes with glaze1.cal and glaze2.cal) # # Oct. 2002 Greg Ward # Aug. 2004 GW (added -f option to read glazings from file) # Funding for this development generously provided by Visarc, Inc. -# (http://www.vizarc.com) +# (http://www.visarc.com) # ################################################################# @@ -30,7 +30,7 @@ set tn_b_arr=(0.886 0.744 0.63 0.21 0.09) set part_arr=(0 0 0 1 1) while ($#argv > 0) - set header="Surface Tr Tg Tb Rcr Rcg Rcb Rgr Rgg Rgb" + set header="Surface Tr Tg Tb Rcr Rcg Rcb Rgr Rgg Rgb Part" if ($#argv < 2 || "$argv[1]" != '-f') then echo "Usage: $0 [-f glazing.dat ..]" exit 1 @@ -47,8 +47,8 @@ while ($#argv > 0) @ i=2 while ($i <= $nl) set ln=(`sed -n ${i}p $gf:q`) - if ($#ln != 10) then - echo "Expected 10 words in line: $ln" + if ($#ln != 11) then + echo "Expected 11 words in line: $ln" exit 1 endif echo $ln[1] @@ -62,6 +62,7 @@ while ($#argv > 0) set rg_r_arr=($rc_r_arr $ln[8]) set rg_g_arr=($rc_g_arr $ln[9]) set rg_b_arr=($rc_b_arr $ln[10]) + set part_arr=($part_arr $ln[11]) @ i++ end end