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.13 by greg, Thu Apr 14 04:50:37 1994 UTC vs.
Revision 2.17 by gregl, Mon Nov 17 13:13:07 1997 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1992 Regents of the University of California */
1 > /* Copyright (c) 1995 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 6 | Line 6 | static char SCCSid[] = "$SunId$ LBL";
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 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)
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);
# Line 225 | Line 227 | register OBJREC  *tm;
227                                                  /* compute character spacing */
228          i = sndx(tm);
229          d = i < tm->oargs.nfargs ? tm->oargs.farg[i] : 0.0;
230 <        i = d * 256.0;
230 >        i = d * 255.0;
231          t->tl.width = 0;
232          for (tlp = t->tl.next; tlp != NULL; tlp = tlp->next) {
233                  if (i < 0)
# Line 281 | Line 283 | OBJREC  *m;
283          x = DOT(v, tp->right);
284          i = sndx(m);
285          if (i < m->oargs.nfargs)
286 <                x *= tp->f->mwidth + 256.*fabs(m->oargs.farg[i]);
286 >                x *= tp->f->mwidth + 255.*fabs(m->oargs.farg[i]);
287          else
288 <                x *= 256.;
288 >                x *= 255.;
289          h = x;
290          i = y = DOT(v, tp->down);
291          if (x < 0.0 || y < 0.0)
292                  return(0);
293          x -= (double)h;
294 <        y = ((i+1) - y)*256.;
294 >        y = ((i+1) - y)*255.;
295                                  /* find the line position */
296          for (tlp = tp->tl.next; tlp != NULL; tlp = tlp->next)
297                  if (--i < 0)
# Line 297 | Line 299 | OBJREC  *m;
299          if (tlp == NULL || h >= tlp->width)
300                  return(0);
301          for (i = 0; (h -= tlp->spc[i]) >= 0; i++)
302 <                if (h < 256 && inglyph(h+x, y,
302 >                if (h < 255 && inglyph(h+x, y,
303                                  tp->f->fg[TLSTR(tlp)[i]&0xff]))
304                          return(1);
305          return(0);
# Line 305 | Line 307 | OBJREC  *m;
307  
308  
309   inglyph(x, y, gl)               /* (x,y) within font glyph gl? */
310 < double  x, y;           /* real coordinates in range [0,256) */
310 > double  x, y;           /* real coordinates in range [0,255) */
311   register GLYPH  *gl;
312   {
313          int  n, ncross;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines