--- ray/src/cv/bsdf2ttree.c 2013/09/26 17:05:00 2.18 +++ ray/src/cv/bsdf2ttree.c 2013/11/09 05:47:49 2.21 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: bsdf2ttree.c,v 2.18 2013/09/26 17:05:00 greg Exp $"; +static const char RCSid[] = "$Id: bsdf2ttree.c,v 2.21 2013/11/09 05:47:49 greg Exp $"; #endif /* * Load measured BSDF interpolant and write out as XML file with tensor tree. @@ -44,8 +44,9 @@ xml_prologue(int ac, char *av[]) puts(""); puts(""); puts("\t"); - puts("\t\tName"); - puts("\t\tManufacturer"); + printf("\t\t%s\n", bsdf_name[0] ? bsdf_name : "Unknown"); + printf("\t\t%s\n", + bsdf_manuf[0] ? bsdf_manuf : "Unknown"); puts("\t\tOther"); puts("\t"); puts("\t"); @@ -122,7 +123,7 @@ eval_isotropic(char *funame) data_prologue(); /* begin output */ if (pctcull >= 0) { - sprintf(cmd, "rttree_reduce -h -a -ff -r 3 -t %f -g %d", + sprintf(cmd, "rttree_reduce -a -h -ff -r 3 -t %f -g %d", pctcull, samp_order); fflush(stdout); ofp = popen(cmd, "w"); @@ -226,7 +227,8 @@ eval_anisotropic(char *funame) data_prologue(); /* begin output */ if (pctcull >= 0) { - sprintf(cmd, "rttree_reduce -h -a -ff -r 4 -t %f -g %d", + sprintf(cmd, "rttree_reduce%s -h -ff -r 4 -t %f -g %d", + (input_orient>0 ^ output_orient>0) ? "" : " -a", pctcull, samp_order); fflush(stdout); ofp = popen(cmd, "w");