ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/cv/bsdf2ttree.c
(Generate patch)

Comparing ray/src/cv/bsdf2ttree.c (file contents):
Revision 2.19 by greg, Thu Oct 3 17:01:02 2013 UTC vs.
Revision 2.22 by greg, Tue Nov 26 17:33:55 2013 UTC

# Line 12 | Line 12 | static const char RCSid[] = "$Id$";
12   #include <stdlib.h>
13   #include <math.h>
14   #include "platform.h"
15 + #include "rtprocess.h"
16   #include "calcomp.h"
17   #include "bsdfrep.h"
18                                  /* global argv[0] */
# Line 44 | Line 45 | xml_prologue(int ac, char *av[])
45          puts("<Optical>");
46          puts("<Layer>");
47          puts("\t<Material>");
48 <        puts("\t\t<Name>Name</Name>");
49 <        puts("\t\t<Manufacturer>Manufacturer</Manufacturer>");
48 >        printf("\t\t<Name>%s</Name>\n", bsdf_name[0] ? bsdf_name : "Unknown");
49 >        printf("\t\t<Manufacturer>%s</Manufacturer>\n",
50 >                        bsdf_manuf[0] ? bsdf_manuf : "Unknown");
51          puts("\t\t<DeviceType>Other</DeviceType>");
52          puts("\t</Material>");
53          puts("\t<DataDefinition>");
# Line 122 | Line 124 | eval_isotropic(char *funame)
124  
125          data_prologue();                        /* begin output */
126          if (pctcull >= 0) {
127 <                sprintf(cmd, "rttree_reduce%s -h -ff -r 3 -t %f -g %d",
126 <                                (input_orient>0 ^ output_orient>0) ? "" : " -a",
127 >                sprintf(cmd, "rttree_reduce -a -h -ff -r 3 -t %f -g %d",
128                                  pctcull, samp_order);
129                  fflush(stdout);
130                  ofp = popen(cmd, "w");

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)