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.15 by greg, Tue Dec 5 20:21:39 1995 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 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 225 | Line 224 | register OBJREC  *tm;
224                                                  /* compute character spacing */
225          i = sndx(tm);
226          d = i < tm->oargs.nfargs ? tm->oargs.farg[i] : 0.0;
227 <        i = d * 256.0;
227 >        i = d * 255.0;
228          t->tl.width = 0;
229          for (tlp = t->tl.next; tlp != NULL; tlp = tlp->next) {
230                  if (i < 0)
# Line 281 | Line 280 | OBJREC  *m;
280          x = DOT(v, tp->right);
281          i = sndx(m);
282          if (i < m->oargs.nfargs)
283 <                x *= tp->f->mwidth + 256.*fabs(m->oargs.farg[i]);
283 >                x *= tp->f->mwidth + 255.*fabs(m->oargs.farg[i]);
284          else
285 <                x *= 256.;
285 >                x *= 255.;
286          h = x;
287          i = y = DOT(v, tp->down);
288          if (x < 0.0 || y < 0.0)
289                  return(0);
290          x -= (double)h;
291 <        y = ((i+1) - y)*256.;
291 >        y = ((i+1) - y)*255.;
292                                  /* find the line position */
293          for (tlp = tp->tl.next; tlp != NULL; tlp = tlp->next)
294                  if (--i < 0)
# Line 297 | Line 296 | OBJREC  *m;
296          if (tlp == NULL || h >= tlp->width)
297                  return(0);
298          for (i = 0; (h -= tlp->spc[i]) >= 0; i++)
299 <                if (h < 256 && inglyph(h+x, y,
299 >                if (h < 255 && inglyph(h+x, y,
300                                  tp->f->fg[TLSTR(tlp)[i]&0xff]))
301                          return(1);
302          return(0);
# Line 305 | Line 304 | OBJREC  *m;
304  
305  
306   inglyph(x, y, gl)               /* (x,y) within font glyph gl? */
307 < double  x, y;           /* real coordinates in range [0,256) */
307 > double  x, y;           /* real coordinates in range [0,255) */
308   register GLYPH  *gl;
309   {
310          int  n, ncross;

Diff Legend

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