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 2.3 by greg, Wed Jan 12 16:46:54 1994 UTC vs.
Revision 2.11 by greg, Tue Dec 3 19:36:58 2024 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1991 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.
9	–	*
10	–	*     4/8/86
6		*/
7
8	<	#include  "ray.h"
8	>	#include "copyright.h"
9
10	+	#include  "ray.h"
11		#include  "func.h"
12	+	#include  "rtotypes.h"
13
14		/*
15		*      A procedural texture perturbs the surface normal
#	Line 31 | Line 28 | static char SCCSid[] = "$SunId$ LBL";
28		*/
29
30
31	<	t_func(m, r)                    /* compute texture for ray */
32	<	register OBJREC  *m;
33	<	register RAY  *r;
31	>	int
32	>	t_func(                 /* compute texture for ray */
33	>	OBJREC  *m,
34	>	RAY  *r
35	>	)
36		{
37		FVECT  disp;
38		double  d;
39	<	register MFUNC  *mf;
40	<	register int  i;
39	>	MFUNC  *mf;
40	>	int  i;
41
42		if (m->oargs.nsargs < 4)
43		objerror(m, USER, "bad # arguments");
#	Line 47 | Line 46 | register RAY  *r;
46		errno = 0;
47		for (i = 0; i < 3; i++) {
48		disp[i] = evalue(mf->ep[i]);
49	<	if (errno) {
49	>	if ((errno == EDOM) | (errno == ERANGE)) {
50		objerror(m, WARNING, "compute error");
51		return(0);
52		}
53		}
54	<	if (mf->f != &unitxf)
55	<	multv3(disp, disp, mf->f->xfm);
54	>	if (mf->fxp != &unitxf)
55	>	multv3(disp, disp, mf->fxp->xfm);
56		if (r->rox != NULL) {
57		multv3(disp, disp, r->rox->f.xfm);
58	<	d = 1.0 / (mf->f->sca * r->rox->f.sca);
58	>	d = 1.0 / (mf->fxp->sca * r->rox->f.sca);
59		} else
60	<	d = 1.0 / mf->f->sca;
61	<	for (i = 0; i < 3; i++)
63	<	r->pert[i] += disp[i] * d;
60	>	d = 1.0 / mf->fxp->sca;
61	>	VSUM(r->pert, r->pert, disp, d);
62		return(0);
63		}

Diff Legend

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