ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/func.c
(Generate patch)

Comparing ray/src/rt/func.c (file contents):
Revision 1.1 by greg, Thu Feb 2 10:41:23 1989 UTC vs.
Revision 1.3 by greg, Tue Mar 14 10:41:21 1989 UTC

# Line 16 | Line 16 | static char SCCSid[] = "$SunId$ LBL";
16  
17  
18   typedef struct {
19 –        double  sca;                    /* scalefactor */
19          double  xfm[4][4];              /* transform matrix */
20 +        double  sca;                    /* scalefactor */
21   }  XF;
22  
23   static OBJREC  *fobj;           /* current function object */
# Line 25 | Line 25 | static RAY  *fray;             /* current function ray */
25   static XF  fxf;                 /* current transformation */
26  
27  
28 < setmap(m, r, sca, xfm)          /* set channels for function call */
28 > setmap(m, r, xfm, sca)          /* set channels for function call */
29   OBJREC  *m;
30   register RAY  *r;
31 – double  sca;
31   double  xfm[4][4];
32 + double  sca;
33   {
34          extern double  l_noise3(), l_noise3a(), l_noise3b(), l_noise3c();
35          extern double  l_hermite(), l_fnoise3(), l_arg();
# Line 63 | Line 63 | setfunc(m, r)                          /* simplified interface to setmap */
63   register OBJREC  *m;
64   RAY  *r;
65   {
66 < #define  mxf    ((XF *)m->os)
66 >        register XF  *mxf;
67  
68 <        if (mxf == NULL) {
68 >        if ((mxf = (XF *)m->os) == NULL) {
69                  register int  n = m->oargs.nsargs;
70                  register char  **sa = m->oargs.sarg;
71  
# Line 82 | Line 82 | RAY  *r;
82                          objerror(m, USER, "bad transform");
83                  if (mxf->sca < 0.0)
84                          mxf->sca = -mxf->sca;
85 +                m->os = (char *)mxf;
86          }
87 <        setmap(m, r, mxf->sca, mxf->xfm);
87 >        setmap(m, r, mxf->xfm, mxf->sca);
88          return;
89   memerr:
90          error(SYSTEM, "out of memory in setfunc");

Diff Legend

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