ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/util/wrapBSDF.c
(Generate patch)

Comparing ray/src/util/wrapBSDF.c (file contents):
Revision 2.21 by greg, Fri Oct 14 00:54:22 2016 UTC vs.
Revision 2.23 by greg, Wed Apr 3 23:50:25 2019 UTC

# Line 52 | Line 52 | struct s_fieldID {
52   } XMLfieldID[] = {
53          {"m", 0, 1, "Manufacturer"},
54          {"n", 0, 1, "Name"},
55 +        {"d", 0, 0, "DeviceType"},
56          {"c", 0, 0, "ThermalConductivity"},
57          {"ef", 0, 0, "EmissivityFront"},
58          {"eb", 0, 0, "EmissivityBack"},
# Line 63 | Line 64 | struct s_fieldID {
64          {"\0", 0, 0, NULL}      /* terminator */
65   };
66                                          /* field assignments */
67 < #define MAXASSIGN       12
67 > #define MAXASSIGN       16
68   const char      *field_assignment[MAXASSIGN];
69   int             nfield_assign = 0;
70   #define FASEP   ';'
# Line 121 | Line 122 | static char    basis_definition[][256] = {
122          "\t</DataDefinition>\n",
123   };
124  
125 + /* Check that the last-added data file is unique */
126 + static int
127 + check_new_data_file()
128 + {
129 +        int     i = ndataf;
130 +
131 +        while (i-- > 0)
132 +                if ((data_file[i].spectrum == data_file[ndataf].spectrum) &
133 +                                (data_file[i].type == data_file[ndataf].type)) {
134 +                        fprintf(stderr,
135 +                                "%s: warning - ignoring duplicate component\n",
136 +                                        data_file[ndataf].fname);
137 +                        return 0;
138 +                }
139 +        return 1;
140 + }
141 +
142   /* Copy data from file descriptor to stdout and close */
143   static int
144   copy_and_close(int fd)
# Line 834 | Line 852 | main(int argc, char *argv[])
852                          }
853                          data_file[ndataf].fname = argv[i];
854                          data_file[ndataf].spectrum = cur_spectrum;
855 <                        ndataf++;
855 >                        ndataf += check_new_data_file();
856                          continue;
857                  case 'r':               /* reflection */
858                          if (i >= argc-1)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines