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.19 by greg, Wed Feb 3 00:22:55 2016 UTC vs.
Revision 2.22 by greg, Tue Feb 14 19:58:37 2017 UTC

# Line 7 | Line 7 | static const char RCSid[] = "$Id$";
7   *      G. Ward         February 2015
8   */
9  
10 + #include "platform.h"
11   #include <ctype.h>
12   #include "rtio.h"
13   #include "paths.h"
# Line 51 | 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 62 | 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 165 | Line 167 | input2str(const char *inpspec)
167                          fprintf(stderr, "%s: cannot open\n", inpspec);
168                          return "";
169                  }
170 < #ifndef _WIN32                          /* XXX somehow broken on Windows */
170 > #if !defined(_WIN32) && !defined(_WIN64)
171 >                                /* XXX somehow broken on Windows */
172                  len = lseek(fd, 0L, SEEK_END);
173                  if (len > 0) {
174                          lseek(fd, 0L, SEEK_SET);
# Line 393 | Line 396 | determine_angle_basis(const char *fn, ezxml_t wtl)
396   static int
397   filter_klems_matrix(FILE *fp)
398   {
396 – #define MAX_COLUMNS     145
399          const char      *bn = klems_basis_name[angle_basis];
398 –        float           col_corr[MAX_COLUMNS];
400          int             i, j, n = nabases;
401                                          /* get angle basis */
402          while (n-- > 0)
# Line 403 | Line 404 | filter_klems_matrix(FILE *fp)
404                          break;
405          if (n < 0)
406                  return 0;
406 –        if (abase_list[n].nangles > MAX_COLUMNS) {
407 –                fputs("Internal error - too many Klems columns!\n", stderr);
408 –                return 0;
409 –        }
410 –                                        /* get correction factors */
411 –        for (j = abase_list[n].nangles; j--; )
412 –                col_corr[j] = 1.f / io_getohm(j, &abase_list[n]);
407                                          /* read/correct/write matrix */
408          for (i = 0; i < abase_list[n].nangles; i++) {
409 +            const double        corr = 1./io_getohm(i, &abase_list[n]);
410              for (j = 0; j < abase_list[n].nangles; j++) {
411                  double  d;
412                  if (fscanf(fp, "%lf", &d) != 1)
# Line 420 | Line 415 | filter_klems_matrix(FILE *fp)
415                          fputs("Negative BSDF data!\n", stderr);
416                          return 0;
417                  }
418 <                printf(" %.3e", d*col_corr[j]*(d > 0));
418 >                printf(" %.3e", d*corr*(d > 0));
419              }
420              fputc('\n', stdout);
421          }
# Line 430 | Line 425 | filter_klems_matrix(FILE *fp)
425                          return 0;
426                  }
427          return 1;                       /* all is good */
433 – #undef MAX_COLUMNS
428   }
429  
430   /* Write out BSDF data block with surrounding tags */

Diff Legend

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