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

Comparing ray/src/cv/bsdfrep.c (file contents):
Revision 2.4 by greg, Tue Oct 23 05:10:42 2012 UTC vs.
Revision 2.6 by greg, Thu Nov 8 00:31:17 2012 UTC

# Line 14 | Line 14 | static const char RCSid[] = "$Id$";
14   #include "rtio.h"
15   #include "resolu.h"
16   #include "bsdfrep.h"
17 +                                /* active grid resolution */
18 + int                     grid_res = GRIDRES;
19 +
20                                  /* coverage/symmetry using INP_QUAD? flags */
21   int                     inp_coverage = 0;
22                                  /* all incident angles in-plane so far? */
# Line 53 | Line 56 | new_input_direction(double new_theta, double new_phi)
56                  new_theta = -new_theta;
57                  new_phi += 180.;
58          }
59 +        if ((theta_in_deg = new_theta) < 1.0)
60 +                return(1);              /* don't rely on phi near normal */
61          while (new_phi < 0)
62                  new_phi += 360.;
63          while (new_phi >= 360.)
# Line 61 | Line 66 | new_input_direction(double new_theta, double new_phi)
66                  single_plane_incident = (round(new_phi) == round(phi_in_deg));
67          else if (single_plane_incident < 0)
68                  single_plane_incident = 1;
64 –        theta_in_deg = new_theta;       /* assume it's OK */
69          phi_in_deg = new_phi;
70          if ((1. < new_phi) & (new_phi < 89.))
71                  inp_coverage |= INP_QUAD1;
# Line 168 | Line 172 | rev_rbf_symmetry(RBFNODE *rbf, int sym)
172          rev_symmetry(rbf->invec, sym);
173          if (sym & MIRROR_X)
174                  for (n = rbf->nrbf; n-- > 0; )
175 <                        rbf->rbfa[n].gx = GRIDRES-1 - rbf->rbfa[n].gx;
175 >                        rbf->rbfa[n].gx = grid_res-1 - rbf->rbfa[n].gx;
176          if (sym & MIRROR_Y)
177                  for (n = rbf->nrbf; n-- > 0; )
178 <                        rbf->rbfa[n].gy = GRIDRES-1 - rbf->rbfa[n].gy;
178 >                        rbf->rbfa[n].gy = grid_res-1 - rbf->rbfa[n].gy;
179   }
180  
181 + /* Rotate RBF to correspond to given incident vector */
182 + void
183 + rotate_rbf(RBFNODE *rbf, const FVECT invec)
184 + {
185 +        static const FVECT      vnorm = {.0, .0, 1.};
186 +        const double            phi = atan2(invec[1],invec[0]) -
187 +                                        atan2(rbf->invec[1],rbf->invec[0]);
188 +        FVECT                   outvec;
189 +        int                     pos[2];
190 +        int                     n;
191 + #ifdef DEBUG
192 +        {
193 +                double  tdiff = 180./M_PI*fabs(acos(invec[2])-acos(rbf->invec[2]));
194 +                if (tdiff >= 1.5)
195 +                        fprintf(stderr,
196 +                        "%s: Warning - rotated theta differs by %.1f degrees\n",
197 +                                        progname, tdiff);
198 +        }
199 + #endif
200 +        for (n = rbf->nrbf; n-- > 0; ) {
201 +                ovec_from_pos(outvec, rbf->rbfa[n].gx, rbf->rbfa[n].gy);
202 +                spinvector(outvec, outvec, vnorm, phi);
203 +                pos_from_vec(pos, outvec);
204 +                rbf->rbfa[n].gx = pos[0];
205 +                rbf->rbfa[n].gy = pos[1];
206 +        }
207 +        VCOPY(rbf->invec, invec);
208 + }
209 +
210   /* Compute volume associated with Gaussian lobe */
211   double
212   rbf_volume(const RBFVAL *rbfp)
# Line 190 | Line 223 | ovec_from_pos(FVECT vec, int xpos, int ypos)
223          double  uv[2];
224          double  r2;
225          
226 <        SDsquare2disk(uv, (1./GRIDRES)*(xpos+.5), (1./GRIDRES)*(ypos+.5));
226 >        SDsquare2disk(uv, (1./grid_res)*(xpos+.5), (1./grid_res)*(ypos+.5));
227                                  /* uniform hemispherical projection */
228          r2 = uv[0]*uv[0] + uv[1]*uv[1];
229          vec[0] = vec[1] = sqrt(2. - r2);
# Line 208 | Line 241 | pos_from_vec(int pos[2], const FVECT vec)
241  
242          SDdisk2square(sq, vec[0]*norm, vec[1]*norm);
243  
244 <        pos[0] = (int)(sq[0]*GRIDRES);
245 <        pos[1] = (int)(sq[1]*GRIDRES);
244 >        pos[0] = (int)(sq[0]*grid_res);
245 >        pos[1] = (int)(sq[1]*grid_res);
246   }
247  
248   /* Evaluate RBF for DSF at the given normalized outgoing direction */
# Line 351 | Line 384 | clear_bsdf_rep(void)
384          inp_coverage = 0;
385          single_plane_incident = -1;
386          input_orient = output_orient = 0;
387 +        grid_res = GRIDRES;
388   }
389  
390   /* Write our BSDF mesh interpolant out to the given binary stream */
# Line 363 | Line 397 | save_bsdf_rep(FILE *ofp)
397                                          /* finish header */
398          fprintf(ofp, "SYMMETRY=%d\n", !single_plane_incident * inp_coverage);
399          fprintf(ofp, "IO_SIDES= %d %d\n", input_orient, output_orient);
400 +        fprintf(ofp, "GRIDRES=%d\n", grid_res);
401          fputformat(BSDFREP_FMT, ofp);
402          fputc('\n', ofp);
403                                          /* write each DSF */
# Line 424 | Line 459 | headline(char *s, void *p)
459                  sscanf(s+9, "%d %d", &input_orient, &output_orient);
460                  return(0);
461          }
462 +        if (!strncmp(s, "GRIDRES=", 8)) {
463 +                sscanf(s+8, "%d", &grid_res);
464 +                return(0);
465 +        }
466          if (formatval(fmt, s) && strcmp(fmt, BSDFREP_FMT))
467                  return(-1);
468          return(0);
# Line 438 | Line 477 | load_bsdf_rep(FILE *ifp)
477          int             i;
478  
479          clear_bsdf_rep();
480 +        if (ifp == NULL)
481 +                return(0);
482          if (getheader(ifp, headline, NULL) < 0 || single_plane_incident < 0 |
483                          !input_orient | !output_orient) {
484                  fprintf(stderr, "%s: missing/bad format for BSDF interpolant\n",

Diff Legend

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