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

Comparing ray/src/rt/text.c (file contents):
Revision 2.14 by greg, Thu May 25 15:13:43 1995 UTC vs.
Revision 2.19 by gwlarson, Thu May 20 13:51:19 1999 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1992 Regents of the University of California */
1 > /* Copyright (c) 1998 Silicon Graphics, Inc. */
2  
3   #ifndef lint
4 < static char SCCSid[] = "$SunId$ LBL";
4 > static char SCCSid[] = "$SunId$ SGI";
5   #endif
6  
7   /*
8   *  text.c - functions for text patterns and mixtures.
9 – *
10 – *     11/12/86
9   */
10  
11   #include  "ray.h"
# Line 45 | Line 43 | static char SCCSid[] = "$SunId$ LBL";
43   *              [spacing]
44   *
45   *  Colortext is identical, except colors are given rather than
46 < *  brightnesses.  Mixtext has foreground and background modifiers:
46 > *  brightnesses.
47   *
48 + *  Mixtext has foreground and background modifiers:
49 + *
50   *      modifier mixtext id
51   *      4+ foremod backmod fontfile text..
52   *      0
# Line 86 | Line 86 | TEXT  *gettext();
86   TLINE  *tlalloc();
87  
88  
89 < text(m, r)
89 > do_text(m, r)
90   register OBJREC  *m;
91   RAY  *r;
92   {
# Line 105 | Line 105 | RAY  *r;
105                  char  *modname = m->oargs.sarg[foreground ? 0 : 1];
106                  if (!strcmp(modname, VOIDID))
107                          omod = OVOID;
108 <                else if ((omod = modifier(modname)) == OVOID) {
108 >                else if ((omod = lastmod(objndx(m), modname)) == OVOID) {
109                          sprintf(errmsg, "undefined modifier \"%s\"", modname);
110                          objerror(m, USER, errmsg);
111                  }
# Line 114 | Line 114 | RAY  *r;
114                                  objerror(m, USER, "inappropriate modifier");
115                          return(1);
116                  }
117 <        }
118 <        if (m->otype == PAT_BTEXT) {
117 >        } else if (m->otype == PAT_BTEXT) {
118                  if (foreground)
119                          scalecolor(r->pcol, m->oargs.farg[9]);
120                  else
# Line 180 | Line 179 | register OBJREC  *tm;
179                                                  /* compute vectors */
180          fcross(DxR, D, R);
181          fcross(t->right, DxR, D);
182 <        d = DOT(D,D)/DOT(t->right,t->right);
182 >        d = DOT(t->right,t->right);
183 >        if (d <= FTINY*FTINY*FTINY*FTINY)
184 >                objerror(tm, USER, "illegal motion vector");
185 >        d = DOT(D,D)/d;
186          for (i = 0; i < 3; i++)
187                  t->right[i] *= d;
188          fcross(t->down, R, DxR);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines