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.40 by greg, Thu Aug 28 03:22:16 2003 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  
12 + #include  "ambient.h"
13 +
14   #include  "otypes.h"
15  
16   #include  "func.h"
# 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 372 | Line 320 | register ANISODAT  *np;
320          errno = 0;
321          for (i = 0; i < 3; i++)
322                  np->u[i] = evalue(mf->ep[i]);
323 <        if (errno) {
323 >        if (errno == EDOM || errno == ERANGE) {
324                  objerror(np->mp, WARNING, "compute error");
325                  np->specfl |= SP_BADU;
326                  return;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines