--- ray/src/common/xf.c 1990/12/15 15:01:40 1.9 +++ ray/src/common/xf.c 2003/02/22 02:07:23 2.4 @@ -1,20 +1,74 @@ -/* Copyright (c) 1990 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: xf.c,v 2.4 2003/02/22 02:07:23 greg Exp $"; #endif - /* * xf.c - routines to convert transform arguments into 4X4 matrix. * - * 1/28/86 + * External symbols declared in standard.h */ +/* ==================================================================== + * 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 "standard.h" #define d2r(a) ((PI/180.)*(a)) -#define checkarg(a,n) if (av[i][a] || i+n >= ac) goto done +#define checkarg(a,l) if (av[i][a] || badarg(ac-i-1,av+i+1,l)) goto done int @@ -23,8 +77,7 @@ register XF *ret; int ac; char *av[]; { - double atof(), sin(), cos(); - double xfmat[4][4], m4[4][4]; + MAT4 xfmat, m4; double xfsca, dtmp; int i, icnt; @@ -42,7 +95,7 @@ char *av[]; switch (av[i][1]) { case 't': /* translate */ - checkarg(2,3); + checkarg(2,"fff"); m4[3][0] = atof(av[++i]); m4[3][1] = atof(av[++i]); m4[3][2] = atof(av[++i]); @@ -51,30 +104,30 @@ char *av[]; case 'r': /* rotate */ switch (av[i][2]) { case 'x': - checkarg(3,1); + checkarg(3,"f"); dtmp = d2r(atof(av[++i])); m4[1][1] = m4[2][2] = cos(dtmp); m4[2][1] = -(m4[1][2] = sin(dtmp)); break; case 'y': - checkarg(3,1); + checkarg(3,"f"); dtmp = d2r(atof(av[++i])); m4[0][0] = m4[2][2] = cos(dtmp); m4[0][2] = -(m4[2][0] = sin(dtmp)); break; case 'z': - checkarg(3,1); + checkarg(3,"f"); dtmp = d2r(atof(av[++i])); m4[0][0] = m4[1][1] = cos(dtmp); m4[1][0] = -(m4[0][1] = sin(dtmp)); break; default: - return(i); + goto done; } break; case 's': /* scale */ - checkarg(2,1); + checkarg(2,"f"); dtmp = atof(av[i+1]); if (dtmp == 0.0) goto done; i++; @@ -87,27 +140,27 @@ char *av[]; case 'm': /* mirror */ switch (av[i][2]) { case 'x': - checkarg(3,0); + checkarg(3,""); xfsca *= m4[0][0] = -1.0; break; case 'y': - checkarg(3,0); + checkarg(3,""); xfsca *= m4[1][1] = -1.0; break; case 'z': - checkarg(3,0); + checkarg(3,""); xfsca *= m4[2][2] = -1.0; break; default: - return(i); + goto done; } break; case 'i': /* iterate */ - checkarg(2,1); + checkarg(2,"i"); while (icnt-- > 0) { multmat4(ret->xfm, ret->xfm, xfmat); ret->sca *= xfsca; @@ -118,7 +171,7 @@ char *av[]; continue; default: - return(i); + goto done; } multmat4(xfmat, xfmat, m4); @@ -132,15 +185,13 @@ done: } -#ifdef INVXF int invxf(ret, ac, av) /* invert transform specification */ register XF *ret; int ac; char *av[]; { - double atof(), sin(), cos(); - double xfmat[4][4], m4[4][4]; + MAT4 xfmat, m4; double xfsca, dtmp; int i, icnt; @@ -158,7 +209,7 @@ char *av[]; switch (av[i][1]) { case 't': /* translate */ - checkarg(2,3); + checkarg(2,"fff"); m4[3][0] = -atof(av[++i]); m4[3][1] = -atof(av[++i]); m4[3][2] = -atof(av[++i]); @@ -167,30 +218,30 @@ char *av[]; case 'r': /* rotate */ switch (av[i][2]) { case 'x': - checkarg(3,1); + checkarg(3,"f"); dtmp = -d2r(atof(av[++i])); m4[1][1] = m4[2][2] = cos(dtmp); m4[2][1] = -(m4[1][2] = sin(dtmp)); break; case 'y': - checkarg(3,1); + checkarg(3,"f"); dtmp = -d2r(atof(av[++i])); m4[0][0] = m4[2][2] = cos(dtmp); m4[0][2] = -(m4[2][0] = sin(dtmp)); break; case 'z': - checkarg(3,1); + checkarg(3,"f"); dtmp = -d2r(atof(av[++i])); m4[0][0] = m4[1][1] = cos(dtmp); m4[1][0] = -(m4[0][1] = sin(dtmp)); break; default: - return(i); + goto done; } break; case 's': /* scale */ - checkarg(2,1); + checkarg(2,"f"); dtmp = atof(av[i+1]); if (dtmp == 0.0) goto done; i++; @@ -203,27 +254,27 @@ char *av[]; case 'm': /* mirror */ switch (av[i][2]) { case 'x': - checkarg(3,0); + checkarg(3,""); xfsca *= m4[0][0] = -1.0; break; case 'y': - checkarg(3,0); + checkarg(3,""); xfsca *= m4[1][1] = -1.0; break; case 'z': - checkarg(3,0); + checkarg(3,""); xfsca *= m4[2][2] = -1.0; break; default: - return(i); + goto done; } break; case 'i': /* iterate */ - checkarg(2,1); + checkarg(2,"i"); while (icnt-- > 0) { multmat4(ret->xfm, xfmat, ret->xfm); ret->sca *= xfsca; @@ -234,7 +285,7 @@ char *av[]; break; default: - return(i); + goto done; } multmat4(xfmat, m4, xfmat); /* left multiply */ @@ -257,4 +308,3 @@ char *av[]; xf(&fx->f, ac, av); return(invxf(&fx->b, ac, av)); } -#endif