--- ray/src/rt/m_direct.c 2003/02/22 02:07:28 2.8 +++ ray/src/rt/m_direct.c 2012/06/09 07:16:47 2.14 @@ -1,74 +1,17 @@ #ifndef lint -static const char RCSid[] = "$Id: m_direct.c,v 2.8 2003/02/22 02:07:28 greg Exp $"; +static const char RCSid[] = "$Id: m_direct.c,v 2.14 2012/06/09 07:16:47 greg Exp $"; #endif /* * Routines for light-redirecting materials and * their associated virtual light sources */ -/* ==================================================================== - * The Radiance Software License, Version 1.0 - * - * Copyright (c) 1990 - 2002 The Regents of the University of California, - * through Lawrence Berkeley National Laboratory. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes Radiance software - * (http://radsite.lbl.gov/) - * developed by the Lawrence Berkeley National Laboratory - * (http://www.lbl.gov/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Radiance," "Lawrence Berkeley National Laboratory" - * and "The Regents of the University of California" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact radiance@radsite.lbl.gov. - * - * 5. Products derived from this software may not be called "Radiance", - * nor may "Radiance" appear in their name, without prior written - * permission of Lawrence Berkeley National Laboratory. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of Lawrence Berkeley National Laboratory. For more - * information on Lawrence Berkeley National Laboratory, please see - * . - */ +#include "copyright.h" #include "ray.h" - #include "otypes.h" - +#include "rtotypes.h" #include "source.h" - #include "func.h" /* @@ -85,9 +28,9 @@ static const char RCSid[] = "$Id: m_direct.c,v 2.8 200 * n A1 A2 .. An */ +static int redirect(OBJREC *m, RAY *r, int n); +static int dir_proj(MAT4 pm, OBJREC *o, SRCREC *s, int n); -static int dir_proj(); - VSMATERIAL direct1_vs = {dir_proj, 1}; VSMATERIAL direct2_vs = {dir_proj, 2}; @@ -96,10 +39,11 @@ VSMATERIAL direct2_vs = {dir_proj, 2}; getfunc(m, 8, 0xff, 1) ) -int -m_direct(m, r) /* shade redirected ray */ -register OBJREC *m; -register RAY *r; +extern int +m_direct( /* shade redirected ray */ + register OBJREC *m, + register RAY *r +) { /* check if source ray */ if (r->rsrc >= 0 && source[r->rsrc].so != r->ro) @@ -116,11 +60,12 @@ register RAY *r; } -int -redirect(m, r, n) /* compute n'th ray redirection */ -OBJREC *m; -RAY *r; -int n; +static int +redirect( /* compute n'th ray redirection */ + OBJREC *m, + RAY *r, + int n +) { MFUNC *mf; register EPNODE **va; @@ -155,18 +100,19 @@ int n; errno = 0; va = mf->ep + 4*n; coef = evalue(va[0]); - if (errno) + if ((errno == EDOM) | (errno == ERANGE)) goto computerr; - if (coef <= FTINY || rayorigin(&nr, r, TRANS, coef) < 0) + setcolor(nr.rcoef, coef, coef, coef); + if (rayorigin(&nr, TRANS, r, nr.rcoef) < 0) return(0); va++; /* compute direction */ for (j = 0; j < 3; j++) { nr.rdir[j] = evalue(va[j]); - if (errno) + if (errno == EDOM || errno == ERANGE) goto computerr; } - if (mf->f != &unitxf) - multv3(nr.rdir, nr.rdir, mf->f->xfm); + if (mf->fxp != &unitxf) + multv3(nr.rdir, nr.rdir, mf->fxp->xfm); if (r->rox != NULL) multv3(nr.rdir, nr.rdir, r->rox->f.xfm); if (normalize(nr.rdir) == 0.0) @@ -175,7 +121,7 @@ int n; if (r->rsrc >= 0) nr.rsrc = source[r->rsrc].sa.sv.sn; rayvalue(&nr); - scalecolor(nr.rcol, coef); + multcolor(nr.rcol, nr.rcoef); addcolor(r->rcol, nr.rcol); if (r->ro != NULL && isflat(r->ro->otype)) r->rt = r->rot + nr.rt; @@ -187,11 +133,12 @@ computerr: static int -dir_proj(pm, o, s, n) /* compute a director's projection */ -MAT4 pm; -OBJREC *o; -SRCREC *s; -int n; +dir_proj( /* compute a director's projection */ + MAT4 pm, + OBJREC *o, + SRCREC *s, + int n +) { RAY tr; OBJREC *m; @@ -220,7 +167,7 @@ int n; if (olddot <= FTINY && olddot >= -FTINY) return(0); /* old dir parallels plane */ tr.rmax = 0.0; - rayorigin(&tr, NULL, PRIMARY, 1.0); + rayorigin(&tr, PRIMARY, NULL, NULL); if (!(*ofun[o->otype].funp)(o, &tr)) return(0); /* no intersection! */ /* compute redirection */ @@ -233,18 +180,18 @@ int n; errno = 0; va = mf->ep + 4*n; coef = evalue(va[0]); - if (errno) + if (errno == EDOM || errno == ERANGE) goto computerr; if (coef <= FTINY) return(0); /* insignificant */ va++; for (i = 0; i < 3; i++) { newdir[i] = evalue(va[i]); - if (errno) + if (errno == EDOM || errno == ERANGE) goto computerr; } - if (mf->f != &unitxf) - multv3(newdir, newdir, mf->f->xfm); + if (mf->fxp != &unitxf) + multv3(newdir, newdir, mf->fxp->xfm); /* normalization unnecessary */ newdot = DOT(newdir, nv); if (newdot <= FTINY && newdot >= -FTINY) @@ -258,7 +205,7 @@ int n; pm[i][j] += nv[i]*h[j]; pm[3][j] = -od*h[j]; } - if (newdot > 0.0 ^ olddot > 0.0) /* add mirroring */ + if ((newdot > 0.0) ^ (olddot > 0.0)) /* add mirroring */ for (j = 0; j < 3; j++) { for (i = 0; i < 3; i++) pm[i][j] -= 2.*nv[i]*nv[j];