ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/t_func.c

Comparing ray/src/rt/t_func.c (file contents):
Revision 1.6 by greg, Wed Apr 19 21:20:29 1989 UTC vs.
Revision 2.4 by greg, Sat Feb 22 02:07:29 2003 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1986 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char       RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		*  t_func.c - routine for procedural textures.
6	+	*/
7	+
8	+	/* ====================================================================
9	+	* The Radiance Software License, Version 1.0
10		*
11	<	*     4/8/86
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		*/
64
65		#include  "ray.h"
66
67	+	#include  "func.h"
68	+
69		/*
70		*      A procedural texture perturbs the surface normal
71		*  at the point of intersection with an object.  It has
#	Line 28 | Line 82 | static char SCCSid[] = "$SunId$ LBL";
82		*  from the original coordinates to the current coordinates.
83		*/
84
31	–	typedef struct {
32	–	struct {
33	–	double  sca;            /* scale factor */
34	–	double  xfm[4][4];      /* transformation matrix */
35	–	}  fore, back;
36	–	}  XFORM;
85
38	–
86		t_func(m, r)                    /* compute texture for ray */
87		register OBJREC  *m;
88		register RAY  *r;
89		{
43	–	extern double  varvalue();
44	–	extern int  errno;
90		FVECT  disp;
91		double  d;
92	<	register XFORM  *mxf;
92	>	register MFUNC  *mf;
93		register int  i;
49	–	register char  **sa;
94
95		if (m->oargs.nsargs < 4)
96		objerror(m, USER, "bad # arguments");
97	<	sa = m->oargs.sarg;
98	<
55	<	if ((mxf = (XFORM *)m->os) == NULL) {
56	<	mxf = (XFORM *)malloc(sizeof(XFORM));
57	<	if (mxf == NULL)
58	<	goto memerr;
59	<	mxf->fore.sca = 1.0;
60	<	setident4(mxf->fore.xfm);
61	<	if (xf(mxf->fore.xfm, &mxf->fore.sca,
62	<	m->oargs.nsargs-4, sa+4) != m->oargs.nsargs-4)
63	<	objerror(m, USER, "bad transform");
64	<	if (mxf->fore.sca < 0.0)
65	<	mxf->fore.sca = -mxf->fore.sca;
66	<	mxf->back.sca = 1.0;
67	<	setident4(mxf->back.xfm);
68	<	invxf(mxf->back.xfm, &mxf->back.sca,
69	<	m->oargs.nsargs-4, sa+4);
70	<	if (mxf->back.sca < 0.0)
71	<	mxf->back.sca = -mxf->back.sca;
72	<	m->os = (char *)mxf;
73	<	}
74	<
75	<	setmap(m, r, mxf->back.xfm, mxf->back.sca);
76	<
77	<	if (!vardefined(sa[0]))
78	<	loadfunc(sa[3]);
97	>	mf = getfunc(m, 3, 0x7, 1);
98	>	setfunc(m, r);
99		errno = 0;
100	<	for (i = 0; i < 3; i++)
101	<	disp[i] = varvalue(sa[i]);
102	<	if (errno) {
103	<	objerror(m, WARNING, "compute error");
104	<	return;
100	>	for (i = 0; i < 3; i++) {
101	>	disp[i] = evalue(mf->ep[i]);
102	>	if (errno) {
103	>	objerror(m, WARNING, "compute error");
104	>	return(0);
105	>	}
106		}
107	<	multv3(disp, disp, mxf->fore.xfm);
108	<	multv3(disp, disp, r->rofx);
109	<	d = 1.0 / (mxf->fore.sca * r->rofs);
107	>	if (mf->f != &unitxf)
108	>	multv3(disp, disp, mf->f->xfm);
109	>	if (r->rox != NULL) {
110	>	multv3(disp, disp, r->rox->f.xfm);
111	>	d = 1.0 / (mf->f->sca * r->rox->f.sca);
112	>	} else
113	>	d = 1.0 / mf->f->sca;
114		for (i = 0; i < 3; i++)
115		r->pert[i] += disp[i] * d;
116	<	return;
92	<	memerr:
93	<	error(SYSTEM, "out of memory in t_func");
116	>	return(0);
117		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)