ViewVC Help

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

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

Comparing ray/src/rt/func.c (file contents):
Revision 1.12 by greg, Sat Dec 15 15:03:26 1990 UTC vs.
Revision 1.17 by greg, Mon Jun 17 08:51:33 1991 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1990 Regents of the University of California */
1	>	/* Copyright (c) 1991 Regents of the University of California */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
#	Line 15 | Line 15 | static char SCCSid[] = "$SunId$ LBL";
15		#include  "otypes.h"
16
17
18	+	XF  unitxf = {                  /* identity transform */
19	+	1.0, 0.0, 0.0, 0.0,
20	+	0.0, 1.0, 0.0, 0.0,
21	+	0.0, 0.0, 1.0, 0.0,
22	+	0.0, 0.0, 0.0, 1.0,
23	+	1.0
24	+	};
25	+
26		XF  funcxf;                     /* current transformation */
27		static OBJREC  *fobj = NULL;    /* current function object */
28		static RAY  *fray = NULL;       /* current function ray */
#	Line 25 | Line 33 | OBJREC  *m;
33		register RAY  *r;
34		XF  *bx;
35		{
36	<	extern double  l_noise3(), l_noise3a(), l_noise3b(), l_noise3c();
29	<	extern double  l_hermite(), l_fnoise3(), l_arg();
36	>	extern double  l_arg();
37		extern long  eclock;
38		static char  *initfile = "rayinit.cal";
39		static long  lastrno = -1;
40		/* check to see if already set */
41		if (m == fobj && r->rno == lastrno)
42	<	return;
42	>	return(0);
43		/* initialize if first call */
44		if (initfile != NULL) {
45		loadfunc(initfile);
#	Line 44 | Line 51 | XF  *bx;
51		scompile("Ix=$16;Iy=$17;Iz=$18;", NULL, 0);
52		scompile("Jx=$19;Jy=$20;Jz=$21;", NULL, 0);
53		scompile("Kx=$22;Ky=$23;Kz=$24;", NULL, 0);
54	<	funset("arg", 1, l_arg);
55	<	funset("noise3", 3, l_noise3);
49	<	funset("noise3a", 3, l_noise3a);
50	<	funset("noise3b", 3, l_noise3b);
51	<	funset("noise3c", 3, l_noise3c);
52	<	funset("hermite", 5, l_hermite);
53	<	funset("fnoise3", 3, l_fnoise3);
54	>	funset("arg", 1, '=', l_arg);
55	>	setnoisefuncs();
56		initfile = NULL;
57		}
58		fobj = m;
59		fray = r;
60	<	lastrno = r->rno;
61	<	if (r->rox != NULL) {
62	<	funcxf.sca = r->rox->b.sca * bx->sca;
63	<	multmat4(funcxf.xfm, r->rox->b.xfm, bx->xfm);
64	<	} else
60	>	if (r->rox != NULL)
61	>	if (bx != &unitxf) {
62	>	funcxf.sca = r->rox->b.sca * bx->sca;
63	>	multmat4(funcxf.xfm, r->rox->b.xfm, bx->xfm);
64	>	} else
65	>	copystruct(&funcxf, &r->rox->b);
66	>	else
67		copystruct(&funcxf, bx);
68	+	lastrno = r->rno;
69		eclock++;               /* notify expression evaluator */
70	+	return(1);
71		}
72
73
#	Line 78 | Line 84 | RAY  *r;
84		for (n = m->oargs.nsargs, sa = m->oargs.sarg;
85		n > 0 && **sa != '-'; n--, sa++)
86		;
87	<	mxf = (XF *)malloc(sizeof(XF));
88	<	if (mxf == NULL)
89	<	goto memerr;
90	<	if (invxf(mxf, n, sa) != n)
91	<	objerror(m, USER, "bad transform");
92	<	if (mxf->sca < 0.0)
93	<	mxf->sca = -mxf->sca;
87	>	if (n == 0)
88	>	mxf = &unitxf;
89	>	else {
90	>	mxf = (XF *)malloc(sizeof(XF));
91	>	if (mxf == NULL)
92	>	goto memerr;
93	>	if (invxf(mxf, n, sa) != n)
94	>	objerror(m, USER, "bad transform");
95	>	if (mxf->sca < 0.0)
96	>	mxf->sca = -mxf->sca;
97	>	}
98		m->os = (char *)mxf;
99		}
100	<	setmap(m, r, mxf);
91	<	return;
100	>	return(setmap(m, r, mxf));
101		memerr:
102		error(SYSTEM, "out of memory in setfunc");
103		}

Diff Legend

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