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.9 by greg, Sat Jun 9 07:16:47 2012 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.
9	–	*
10	–	*     4/8/86
6		*/
7
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 28 | Line 27 | static char SCCSid[] = "$SunId$ LBL";
27		*  from the original coordinates to the current coordinates.
28		*/
29
31	–	typedef struct {
32	–	struct {
33	–	double  sca;            /* scale factor */
34	–	double  xfm[4][4];      /* transformation matrix */
35	–	}  fore, back;
36	–	}  XFORM;
30
31	<
32	<	t_func(m, r)                    /* compute texture for ray */
33	<	register OBJREC  *m;
34	<	register RAY  *r;
31	>	extern int
32	>	t_func(                 /* compute texture for ray */
33	>	register OBJREC  *m,
34	>	register RAY  *r
35	>	)
36		{
43	–	extern double  varvalue();
44	–	extern int  errno;
37		FVECT  disp;
38		double  d;
39	<	register XFORM  *mxf;
39	>	register MFUNC  *mf;
40		register int  i;
49	–	register char  **sa;
41
42		if (m->oargs.nsargs < 4)
43		objerror(m, USER, "bad # arguments");
44	<	sa = m->oargs.sarg;
45	<
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]);
44	>	mf = getfunc(m, 3, 0x7, 1);
45	>	setfunc(m, r);
46		errno = 0;
47	<	for (i = 0; i < 3; i++)
48	<	disp[i] = varvalue(sa[i]);
49	<	if (errno) {
50	<	objerror(m, WARNING, "compute error");
51	<	return;
47	>	for (i = 0; i < 3; i++) {
48	>	disp[i] = evalue(mf->ep[i]);
49	>	if (errno == EDOM || errno == ERANGE) {
50	>	objerror(m, WARNING, "compute error");
51	>	return(0);
52	>	}
53		}
54	<	multv3(disp, disp, mxf->fore.xfm);
55	<	multv3(disp, disp, r->rofx);
56	<	d = 1.0 / (mxf->fore.sca * r->rofs);
57	<	for (i = 0; i < 3; i++)
58	<	r->pert[i] += disp[i] * d;
59	<	return;
60	<	memerr:
61	<	error(SYSTEM, "out of memory in t_func");
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->fxp->sca * r->rox->f.sca);
59	>	} else
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)