--- ray/src/rt/func.c 2003/02/22 02:07:28 2.14
+++ ray/src/rt/func.c 2004/03/30 16:13:01 2.22
@@ -1,71 +1,17 @@
#ifndef lint
-static const char RCSid[] = "$Id: func.c,v 2.14 2003/02/22 02:07:28 greg Exp $";
+static const char RCSid[] = "$Id: func.c,v 2.22 2004/03/30 16:13:01 schorsch Exp $";
#endif
/*
* func.c - interface to calcomp functions.
*/
-/* ====================================================================
- * 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
+#include "ray.h"
+#include "paths.h"
#include "otypes.h"
-
#include "func.h"
@@ -86,15 +32,16 @@ XF funcxf; /* current transformation */
static OBJREC *fobj = NULL; /* current function object */
static RAY *fray = NULL; /* current function ray */
-static double l_erf(), l_erfc(), l_arg();
+static double l_erf(char *), l_erfc(char *), l_arg(char *);
-MFUNC *
-getfunc(m, ff, ef, dofwd) /* get function for this modifier */
-OBJREC *m;
-int ff;
-unsigned int ef;
-int dofwd;
+extern MFUNC *
+getfunc( /* get function for this modifier */
+ OBJREC *m,
+ int ff,
+ unsigned int ef,
+ int dofwd
+)
{
static char initfile[] = INITFILE;
char sbuf[MAXSTR];
@@ -118,6 +65,7 @@ int dofwd;
scompile("Ix=$16;Iy=$17;Iz=$18;", NULL, 0);
scompile("Jx=$19;Jy=$20;Jz=$21;", NULL, 0);
scompile("Kx=$22;Ky=$23;Kz=$24;", NULL, 0);
+ scompile("Lu=$26;Lv=$27;", NULL, 0);
funset("arg", 1, '=', l_arg);
funset("erf", 1, ':', l_erf);
funset("erfc", 1, ':', l_erfc);
@@ -185,12 +133,14 @@ toofew:
objerror(m, USER, "too few string arguments");
memerr:
error(SYSTEM, "out of memory in getfunc");
+ return NULL; /* pro forma return */
}
-void
-freefunc(m) /* free memory associated with modifier */
-OBJREC *m;
+extern void
+freefunc( /* free memory associated with modifier */
+ OBJREC *m
+)
{
register MFUNC *f;
register int i;
@@ -217,10 +167,11 @@ OBJREC *m;
}
-int
-setfunc(m, r) /* set channels for function call */
-OBJREC *m;
-register RAY *r;
+extern int
+setfunc( /* set channels for function call */
+ OBJREC *m,
+ register RAY *r
+)
{
static unsigned long lastrno = ~0;
register MFUNC *f;
@@ -239,22 +190,23 @@ register RAY *r;
funcxf.sca = r->rox->b.sca * f->b->sca;
multmat4(funcxf.xfm, r->rox->b.xfm, f->b->xfm);
} else
- copystruct(&funcxf, &r->rox->b);
+ funcxf = r->rox->b;
else
- copystruct(&funcxf, f->b);
+ funcxf = *(f->b);
lastrno = r->rno;
eclock++; /* notify expression evaluator */
return(1);
}
-void
-loadfunc(fname) /* load definition file */
-char *fname;
+extern void
+loadfunc( /* load definition file */
+ char *fname
+)
{
char *ffname;
- if ((ffname = getpath(fname, getlibpath(), R_OK)) == NULL) {
+ if ((ffname = getpath(fname, getrlibpath(), R_OK)) == NULL) {
sprintf(errmsg, "cannot find function file \"%s\"", fname);
error(USER, errmsg);
}
@@ -263,7 +215,7 @@ char *fname;
static double
-l_arg() /* return nth real argument */
+l_arg(char *nm) /* return nth real argument */
{
register int n;
@@ -284,26 +236,23 @@ l_arg() /* return nth real argument */
static double
-l_erf() /* error function */
+l_erf(char *nm) /* error function */
{
- extern double erf();
-
return(erf(argument(1)));
}
static double
-l_erfc() /* cumulative error function */
+l_erfc(char *nm) /* cumulative error function */
{
- extern double erfc();
-
return(erfc(argument(1)));
}
-double
-chanvalue(n) /* return channel n to calcomp */
-register int n;
+extern double
+chanvalue( /* return channel n to calcomp */
+ register int n
+)
{
if (fray == NULL)
syntax("ray parameter used in constant expression");
@@ -311,21 +260,21 @@ register int n;
if (--n < 0)
goto badchan;
- if (n < 3) /* ray direction */
+ if (n <= 2) /* ray direction */
return( ( fray->rdir[0]*funcxf.xfm[0][n] +
fray->rdir[1]*funcxf.xfm[1][n] +
fray->rdir[2]*funcxf.xfm[2][n] )
/ funcxf.sca );
- if (n < 6) /* surface normal */
+ if (n <= 5) /* surface normal */
return( ( fray->ron[0]*funcxf.xfm[0][n-3] +
fray->ron[1]*funcxf.xfm[1][n-3] +
fray->ron[2]*funcxf.xfm[2][n-3] )
/ funcxf.sca );
- if (n < 9) /* intersection */
+ if (n <= 8) /* intersection */
return( fray->rop[0]*funcxf.xfm[0][n-6] +
fray->rop[1]*funcxf.xfm[1][n-6] +
@@ -343,20 +292,24 @@ register int n;
if (n == 11) /* scale */
return(funcxf.sca);
- if (n < 15) /* origin */
+ if (n <= 14) /* origin */
return(funcxf.xfm[3][n-12]);
- if (n < 18) /* i unit vector */
+ if (n <= 17) /* i unit vector */
return(funcxf.xfm[0][n-15] / funcxf.sca);
- if (n < 21) /* j unit vector */
- return(funcxf.xfm[1][n-15] / funcxf.sca);
+ if (n <= 20) /* j unit vector */
+ return(funcxf.xfm[1][n-18] / funcxf.sca);
- if (n < 24) /* k unit vector */
+ if (n <= 23) /* k unit vector */
return(funcxf.xfm[2][n-21] / funcxf.sca);
if (n == 24) /* single ray (shadow) distance */
return((fray->rot+raydist(fray->parent,SHADOW)) * funcxf.sca);
+
+ if (n <= 26) /* local (u,v) coordinates */
+ return(fray->uv[n-25]);
badchan:
error(USER, "illegal channel number");
+ return(0.0);
}