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

Comparing ray/src/util/rmtxop.c (file contents):
Revision 2.34 by greg, Wed Aug 21 01:09:25 2024 UTC vs.
Revision 2.41 by greg, Fri Apr 18 23:59:03 2025 UTC

# Line 10 | Line 10 | static const char RCSid[] = "$Id$";
10   #include "rmatrix.h"
11   #include "platform.h"
12  
13 < #define MAXCOMP         MAXCSAMP        /* #components we support */
13 > /* Preferred BSDF component:
14 >        none, transmission, reflection front (normal side), reflection back */
15 > typedef enum {RMPnone=-1, RMPtrans=0, RMPreflF, RMPreflB} RMPref;
16  
17   /* Unary matrix operation(s) */
18   typedef struct {
# Line 34 | Line 36 | typedef struct {
36   int     verbose = 0;                    /* verbose reporting? */
37  
38   /* Load matrix */
39 < static int
39 > int
40   loadmatrix(ROPMAT *rop)
41   {
42 <        if (rop->mtx != NULL)           /* already loaded? */
42 >        if (rop->mtx)                   /* already loaded? */
43                  return(0);
44 +                                        /* check for BSDF input */
45 +        if ((rop->inspec[0] != '!') & (rop->rmp != RMPnone)) {
46 +                const char      *sp = strrchr(rop->inspec, '.');
47 +                if (sp > rop->inspec && !strcasecmp(sp+1, "XML")) {
48 +                        CMATRIX *cm = rop->rmp==RMPtrans ? cm_loadBTDF(rop->inspec) :
49 +                                        cm_loadBRDF(rop->inspec, rop->rmp==RMPreflB) ;
50 +                        if (!cm)
51 +                                return(-1);
52 +                        rop->mtx = rmx_from_cmatrix(cm);
53 +                        cm_free(cm);
54 +                        rop->mtx->dtype = DTascii;
55 +                        return(1);      /* loaded BSDF XML file */
56 +                }
57 +        }                               /* else load regular matrix */
58 +        rop->mtx = rmx_load(rop->inspec);
59  
60 <        rop->mtx = rmx_load(rop->inspec, rop->rmp);
44 <
45 <        return(!rop->mtx ? -1 : 1);
60 >        return(rop->mtx ? 1 : -1);
61   }
62  
63 < static int      checksymbolic(ROPMAT *rop);
63 > extern int      checksymbolic(ROPMAT *rop);
64  
65   /* Check/set transform based on a reference input file */
66 < static int
66 > int
67   checkreffile(ROPMAT *rop)
68   {
69          static const char       *curRF = NULL;
# Line 107 | Line 122 | checkreffile(ROPMAT *rop)
122   }
123  
124   /* Compute conversion row from spectrum to one channel of RGB */
125 < static void
125 > void
126   rgbrow(ROPMAT *rop, int r, int p)
127   {
128          const int       nc = rop->mtx->ncomp;
# Line 124 | Line 139 | rgbrow(ROPMAT *rop, int r, int p)
139   }
140  
141   /* Compute conversion row from spectrum to one channel of XYZ */
142 < static void
142 > void
143   xyzrow(ROPMAT *rop, int r, int p)
144   {
145          const int       nc = rop->mtx->ncomp;
# Line 141 | Line 156 | xyzrow(ROPMAT *rop, int r, int p)
156   }
157  
158   /* Use the spectral sensitivity function to compute matrix coefficients */
159 < static void
159 > void
160   sensrow(ROPMAT *rop, int r, double (*sf)(const SCOLOR sc, int ncs, const float wlpt[4]))
161   {
162          const int       nc = rop->mtx->ncomp;
# Line 156 | Line 171 | sensrow(ROPMAT *rop, int r, double (*sf)(const SCOLOR
171   }
172  
173   /* Check/set symbolic transform */
174 < static int
174 > int
175   checksymbolic(ROPMAT *rop)
176   {
177          const int       nc = rop->mtx->ncomp;
# Line 267 | Line 282 | checksymbolic(ROPMAT *rop)
282   }
283  
284   /* Get matrix and perform unary operations */
285 < static RMATRIX *
285 > RMATRIX *
286   loadop(ROPMAT *rop)
287   {
288          int     outtype = 0;
# Line 343 | Line 358 | loadop(ROPMAT *rop)
358                  }
359          }
360          if (rop->preop.transpose) {             /* transpose matrix? */
361 <                mres = rmx_transpose(rop->mtx);
347 <                if (mres == NULL) {
361 >                if (!rmx_transpose(rop->mtx)) {
362                          fputs(rop->inspec, stderr);
363                          fputs(": transpose failed\n", stderr);
364                          goto failure;
# Line 353 | Line 367 | loadop(ROPMAT *rop)
367                          fputs(rop->inspec, stderr);
368                          fputs(": transposed rows and columns\n", stderr);
369                  }
356 –                rmx_free(rop->mtx);
357 –                rop->mtx = mres;
370          }
371          mres = rop->mtx;
372          rop->mtx = NULL;
# Line 367 | Line 379 | failure:
379   }
380  
381   /* Execute binary operation, free matrix arguments and return new result */
382 < static RMATRIX *
382 > RMATRIX *
383   binaryop(const char *inspec, RMATRIX *mleft, int op, RMATRIX *mright)
384   {
385          RMATRIX *mres = NULL;
# Line 444 | Line 456 | binaryop(const char *inspec, RMATRIX *mleft, int op, R
456   }
457  
458   /* Perform matrix operations from left to right */
459 < static RMATRIX *
459 > RMATRIX *
460   op_left2right(ROPMAT *mop)
461   {
462          RMATRIX *mleft = loadop(mop);
# Line 460 | Line 472 | op_left2right(ROPMAT *mop)
472   }
473  
474   /* Perform matrix operations from right to left */
475 < static RMATRIX *
475 > RMATRIX *
476   op_right2left(ROPMAT *mop)
477   {
478          RMATRIX *mright;
# Line 489 | Line 501 | op_right2left(ROPMAT *mop)
501                                                  : (mop)->mtx->ncols)
502  
503   /* Should we prefer concatenating from rightmost matrix towards left? */
504 < static int
504 > int
505   prefer_right2left(ROPMAT *mop)
506   {
507          int     mri = 0;
# Line 516 | Line 528 | prefer_right2left(ROPMAT *mop)
528          return(t_ncols(mop+mri) < t_nrows(mop));
529   }
530  
531 < static int
531 > int
532   get_factors(double da[], int n, char *av[])
533   {
534          int     ac;
# Line 526 | Line 538 | get_factors(double da[], int n, char *av[])
538          return(ac);
539   }
540  
541 < static ROPMAT *
541 > ROPMAT *
542   resize_moparr(ROPMAT *mop, int n2alloc)
543   {
544          int     nmats = 0;
# Line 534 | Line 546 | resize_moparr(ROPMAT *mop, int n2alloc)
546  
547          while (mop[nmats++].binop)
548                  ;
549 <        for (i = nmats; i > n2alloc; i--)
549 >        for (i = nmats; i >= n2alloc; i--)
550                  rmx_free(mop[i].mtx);
551          mop = (ROPMAT *)realloc(mop, n2alloc*sizeof(ROPMAT));
552          if (mop == NULL) {
# Line 681 | Line 693 | main(int argc, char *argv[])
693          mres = loadop(mop+nmats);
694          if (mres == NULL)
695                  return(1);
696 <        if (outfmt == DTfromHeader)     /* check data type */
696 >        if ((outfmt == DTfromHeader) & (mres->dtype < DTspec))
697                  outfmt = mres->dtype;
698 <        if (outfmt == DTrgbe) {
698 >        if (outfmt == DTrgbe) {         /* check data type */
699                  if (mres->ncomp > 3)
700                          outfmt = DTspec;
701                  else if (mres->dtype == DTxyze)
702                          outfmt = DTxyze;
703          }
704 + #if DTrmx_native==DTfloat
705 +        if (outfmt == DTdouble)
706 +                fprintf(stderr,
707 +                        "%s: warning - writing float result as double\n",
708 +                                argv[0]);
709 + #endif
710          newheader("RADIANCE", stdout);  /* write result to stdout */
711          printargs(argc, argv, stdout);
712          return(rmx_write(mres, outfmt, stdout) ? 0 : 1);

Diff Legend

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