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

Comparing ray/src/rt/aniso.c (file contents):
Revision 2.34 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.43 by greg, Tue Apr 19 01:15:06 2005 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id$";
3   #endif
4   /*
5   *  Shading functions for anisotropic materials.
6   */
7  
8 < /* ====================================================================
9 < * The Radiance Software License, Version 1.0
10 < *
11 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 < *
14 < * Redistribution and use in source and binary forms, with or without
15 < * modification, are permitted provided that the following conditions
16 < * are met:
17 < *
18 < * 1. Redistributions of source code must retain the above copyright
19 < *         notice, this list of conditions and the following disclaimer.
20 < *
21 < * 2. Redistributions in binary form must reproduce the above copyright
22 < *       notice, this list of conditions and the following disclaimer in
23 < *       the documentation and/or other materials provided with the
24 < *       distribution.
25 < *
26 < * 3. The end-user documentation included with the redistribution,
27 < *           if any, must include the following acknowledgment:
28 < *             "This product includes Radiance software
29 < *                 (http://radsite.lbl.gov/)
30 < *                 developed by the Lawrence Berkeley National Laboratory
31 < *               (http://www.lbl.gov/)."
32 < *       Alternately, this acknowledgment may appear in the software itself,
33 < *       if and wherever such third-party acknowledgments normally appear.
34 < *
35 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 < *       and "The Regents of the University of California" must
37 < *       not be used to endorse or promote products derived from this
38 < *       software without prior written permission. For written
39 < *       permission, please contact [email protected].
40 < *
41 < * 5. Products derived from this software may not be called "Radiance",
42 < *       nor may "Radiance" appear in their name, without prior written
43 < *       permission of Lawrence Berkeley National Laboratory.
44 < *
45 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 < * SUCH DAMAGE.
57 < * ====================================================================
58 < *
59 < * This software consists of voluntary contributions made by many
60 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 < * information on Lawrence Berkeley National Laboratory, please see
62 < * <http://www.lbl.gov/>.
63 < */
8 > #include "copyright.h"
9  
10   #include  "ray.h"
11 <
11 > #include  "ambient.h"
12   #include  "otypes.h"
13 <
13 > #include  "rtotypes.h"
14 > #include  "source.h"
15   #include  "func.h"
70 –
16   #include  "random.h"
17  
18   #ifndef  MAXITER
# Line 115 | Line 60 | typedef struct {
60          double  pdot;           /* perturbed dot product */
61   }  ANISODAT;            /* anisotropic material data */
62  
63 < static void     getacoords();
64 < static void     agaussamp();
63 > static srcdirf_t diraniso;
64 > static void getacoords(RAY  *r, ANISODAT  *np);
65 > static void agaussamp(RAY  *r, ANISODAT  *np);
66  
67  
68   static void
69 < diraniso(cval, np, ldir, omega)         /* compute source contribution */
70 < COLOR  cval;                    /* returned coefficient */
71 < register ANISODAT  *np;         /* material data */
72 < FVECT  ldir;                    /* light source direction */
73 < double  omega;                  /* light source size */
69 > diraniso(               /* compute source contribution */
70 >        COLOR  cval,                    /* returned coefficient */
71 >        void  *nnp,             /* material data */
72 >        FVECT  ldir,                    /* light source direction */
73 >        double  omega                   /* light source size */
74 > )
75   {
76 +        register ANISODAT *np = nnp;
77          double  ldot;
78          double  dtmp, dtmp1, dtmp2;
79          FVECT  h;
# Line 146 | Line 94 | double  omega;                 /* light source size */
94                   *  modified by the color of the material.
95                   */
96                  copycolor(ctmp, np->mcolor);
97 <                dtmp = ldot * omega * np->rdiff / PI;
97 >                dtmp = ldot * omega * np->rdiff * (1.0/PI);
98                  scalecolor(ctmp, dtmp);
99                  addcolor(cval, ctmp);
100          }
# Line 157 | Line 105 | double  omega;                 /* light source size */
105                   */
106                                                  /* add source width if flat */
107                  if (np->specfl & SP_FLAT)
108 <                        au2 = av2 = omega/(4.0*PI);
108 >                        au2 = av2 = omega * (0.25/PI);
109                  else
110                          au2 = av2 = 0.0;
111                  au2 += np->u_alpha*np->u_alpha;
# Line 174 | Line 122 | double  omega;                 /* light source size */
122                                                  /* gaussian */
123                  dtmp = DOT(np->pnorm, h);
124                  dtmp = (dtmp1 + dtmp2) / (dtmp*dtmp);
125 <                dtmp = exp(-dtmp) * (0.25/PI)
178 <                                * sqrt(ldot/(np->pdot*au2*av2));
125 >                dtmp = exp(-dtmp) / (4.0*PI * np->pdot * sqrt(au2*av2));
126                                                  /* worth using? */
127                  if (dtmp > FTINY) {
128                          copycolor(ctmp, np->scolor);
# Line 189 | Line 136 | double  omega;                 /* light source size */
136                   *  Compute diffuse transmission.
137                   */
138                  copycolor(ctmp, np->mcolor);
139 <                dtmp = -ldot * omega * np->tdiff / PI;
139 >                dtmp = -ldot * omega * np->tdiff * (1.0/PI);
140                  scalecolor(ctmp, dtmp);
141                  addcolor(cval, ctmp);
142          }
# Line 199 | Line 146 | double  omega;                 /* light source size */
146                   *  is always modified by material color.
147                   */
148                                                  /* roughness + source */
149 <                au2 = av2 = omega / PI;
149 >                au2 = av2 = omega * (1.0/PI);
150                  au2 += np->u_alpha*np->u_alpha;
151                  av2 += np->v_alpha*np->v_alpha;
152                                                  /* "half vector" */
# Line 220 | Line 167 | double  omega;                 /* light source size */
167                  } else
168                          dtmp = 0.0;
169                                                  /* gaussian */
170 <                dtmp = exp(-dtmp) * (1.0/PI)
224 <                                * sqrt(-ldot/(np->pdot*au2*av2));
170 >                dtmp = exp(-dtmp) / (PI * np->pdot * sqrt(au2*av2));
171                                                  /* worth using? */
172                  if (dtmp > FTINY) {
173                          copycolor(ctmp, np->mcolor);
# Line 233 | Line 179 | double  omega;                 /* light source size */
179   }
180  
181  
182 < int
183 < m_aniso(m, r)                   /* shade ray that hit something anisotropic */
184 < register OBJREC  *m;
185 < register RAY  *r;
182 > extern int
183 > m_aniso(                        /* shade ray that hit something anisotropic */
184 >        register OBJREC  *m,
185 >        register RAY  *r
186 > )
187   {
188          ANISODAT  nd;
189          COLOR  ctmp;
# Line 247 | Line 194 | register RAY  *r;
194  
195          if (m->oargs.nfargs != (m->otype == MAT_TRANS2 ? 8 : 6))
196                  objerror(m, USER, "bad number of real arguments");
197 +                                                /* check for back side */
198 +        if (r->rod < 0.0) {
199 +                if (!backvis && m->otype != MAT_TRANS2) {
200 +                        raytrans(r);
201 +                        return(1);
202 +                }
203 +                raytexture(r, m->omod);
204 +                flipsurface(r);                 /* reorient if backvis */
205 +        } else
206 +                raytexture(r, m->omod);
207 +                                                /* get material color */
208          nd.mp = m;
209          nd.rp = r;
252 –                                                /* get material color */
210          setcolor(nd.mcolor, m->oargs.farg[0],
211                             m->oargs.farg[1],
212                             m->oargs.farg[2]);
# Line 259 | Line 216 | register RAY  *r;
216          nd.v_alpha = m->oargs.farg[5];
217          if (nd.u_alpha < FTINY || nd.v_alpha <= FTINY)
218                  objerror(m, USER, "roughness too small");
219 <                                                /* check for back side */
263 <        if (r->rod < 0.0) {
264 <                if (!backvis && m->otype != MAT_TRANS2) {
265 <                        raytrans(r);
266 <                        return(1);
267 <                }
268 <                flipsurface(r);                 /* reorient if backvis */
269 <        }
270 <                                                /* get modifiers */
271 <        raytexture(r, m->omod);
219 >
220          nd.pdot = raynormal(nd.pnorm, r);       /* perturb normal */
221          if (nd.pdot < .001)
222                  nd.pdot = .001;                 /* non-zero for diraniso() */
# Line 328 | Line 276 | register RAY  *r;
276                  agaussamp(r, &nd);
277  
278          if (nd.rdiff > FTINY) {         /* ambient from this side */
279 <                ambient(ctmp, r, nd.pnorm);
279 >                copycolor(ctmp, nd.mcolor);     /* modified by material color */
280                  if (nd.specfl & SP_RBLT)
281                          scalecolor(ctmp, 1.0-nd.trans);
282                  else
283                          scalecolor(ctmp, nd.rdiff);
284 <                multcolor(ctmp, nd.mcolor);     /* modified by material color */
284 >                multambient(ctmp, r, nd.pnorm);
285                  addcolor(r->rcol, ctmp);        /* add to returned color */
286          }
287          if (nd.tdiff > FTINY) {         /* ambient from other side */
# Line 343 | Line 291 | register RAY  *r;
291                  bnorm[0] = -nd.pnorm[0];
292                  bnorm[1] = -nd.pnorm[1];
293                  bnorm[2] = -nd.pnorm[2];
294 <                ambient(ctmp, r, bnorm);
294 >                copycolor(ctmp, nd.mcolor);     /* modified by color */
295                  if (nd.specfl & SP_TBLT)
296                          scalecolor(ctmp, nd.trans);
297                  else
298                          scalecolor(ctmp, nd.tdiff);
299 <                multcolor(ctmp, nd.mcolor);     /* modified by color */
299 >                multambient(ctmp, r, bnorm);
300                  addcolor(r->rcol, ctmp);
301                  flipsurface(r);
302          }
# Line 360 | Line 308 | register RAY  *r;
308  
309  
310   static void
311 < getacoords(r, np)               /* set up coordinate system */
312 < RAY  *r;
313 < register ANISODAT  *np;
311 > getacoords(             /* set up coordinate system */
312 >        RAY  *r,
313 >        register ANISODAT  *np
314 > )
315   {
316          register MFUNC  *mf;
317          register int  i;
# Line 372 | Line 321 | register ANISODAT  *np;
321          errno = 0;
322          for (i = 0; i < 3; i++)
323                  np->u[i] = evalue(mf->ep[i]);
324 <        if (errno) {
324 >        if (errno == EDOM || errno == ERANGE) {
325                  objerror(np->mp, WARNING, "compute error");
326                  np->specfl |= SP_BADU;
327                  return;
# Line 390 | Line 339 | register ANISODAT  *np;
339  
340  
341   static void
342 < agaussamp(r, np)                /* sample anisotropic gaussian specular */
343 < RAY  *r;
344 < register ANISODAT  *np;
342 > agaussamp(              /* sample anisotropic gaussian specular */
343 >        RAY  *r,
344 >        register ANISODAT  *np
345 > )
346   {
347          RAY  sr;
348          FVECT  h;
# Line 402 | Line 352 | register ANISODAT  *np;
352          register int  i;
353                                          /* compute reflection */
354          if ((np->specfl & (SP_REFL|SP_RBLT)) == SP_REFL &&
355 <                        rayorigin(&sr, r, SPECULAR, np->rspec) == 0) {
355 >                        rayorigin(&sr, SPECULAR, r, np->scolor) == 0) {
356                  dimlist[ndims++] = (int)np->mp;
357                  for (niter = 0; niter < MAXITER; niter++) {
358                          if (niter)
# Line 431 | Line 381 | register ANISODAT  *np;
381                                  sr.rdir[i] = r->rdir[i] + d*h[i];
382                          if (DOT(sr.rdir, r->ron) > FTINY) {
383                                  rayvalue(&sr);
384 <                                multcolor(sr.rcol, np->scolor);
384 >                                multcolor(sr.rcol, sr.rcoef);
385                                  addcolor(r->rcol, sr.rcol);
386                                  break;
387                          }
# Line 439 | Line 389 | register ANISODAT  *np;
389                  ndims--;
390          }
391                                          /* compute transmission */
392 +        copycolor(sr.rcoef, np->mcolor);                /* modify by material color */
393 +        scalecolor(sr.rcoef, np->tspec);
394          if ((np->specfl & (SP_TRAN|SP_TBLT)) == SP_TRAN &&
395 <                        rayorigin(&sr, r, SPECULAR, np->tspec) == 0) {
395 >                        rayorigin(&sr, SPECULAR, r, sr.rcoef) == 0) {
396                  dimlist[ndims++] = (int)np->mp;
397                  for (niter = 0; niter < MAXITER; niter++) {
398                          if (niter)
# Line 467 | Line 419 | register ANISODAT  *np;
419                          if (DOT(sr.rdir, r->ron) < -FTINY) {
420                                  normalize(sr.rdir);     /* OK, normalize */
421                                  rayvalue(&sr);
422 <                                scalecolor(sr.rcol, np->tspec);
471 <                                multcolor(sr.rcol, np->mcolor); /* modify */
422 >                                multcolor(sr.rcol, sr.rcoef);
423                                  addcolor(r->rcol, sr.rcol);
424                                  break;
425                          }

Diff Legend

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