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

Comparing ray/src/rt/text.c (file contents):
Revision 2.5 by greg, Fri Jun 19 14:20:22 1992 UTC vs.
Revision 2.6 by greg, Thu Jun 25 12:05:10 1992 UTC

# Line 221 | Line 221 | register OBJREC  *tm;
221          i = sndx(tm);
222          d = i < tm->oargs.nfargs ? tm->oargs.farg[i] : 0.0;
223          i = d * 256.0;
224 +        t->tl.width = 0;
225          for (tlp = t->tl.next; tlp != NULL; tlp = tlp->next) {
226                  if ((tlp->spc = (short *)malloc(
227                                  (strlen(TLSTR(tlp))+1)*sizeof(short))) == NULL)
# Line 231 | Line 232 | register OBJREC  *tm;
232                          tlp->width = proptext(tlp->spc, TLSTR(tlp), t->f, i, 3);
233                  else
234                          tlp->width = uniftext(tlp->spc, TLSTR(tlp), t->f);
235 +                if (tlp->width > t->tl.width)
236 +                        t->tl.width = tlp->width;
237          }
238                                                  /* we're done */
239          tm->os = (char *)t;
# Line 264 | Line 267 | intext(p, m)                   /* check to see if p is in text glyph *
267   FVECT  p;
268   OBJREC  *m;
269   {
270 +        extern double  fabs();
271          register TEXT  *tp;
272          register TLINE  *tlp;
273          FVECT  v;
# Line 274 | Line 278 | OBJREC  *m;
278          v[0] = p[0] - m->oargs.farg[0];
279          v[1] = p[1] - m->oargs.farg[1];
280          v[2] = p[2] - m->oargs.farg[2];
281 <        h = x = DOT(v, tp->right)*256.;
281 >        x = DOT(v, tp->right);
282 >        i = sndx(m);
283 >        if (i < m->oargs.nfargs)
284 >                x *= tp->f->mwidth + 256.*fabs(m->oargs.farg[i]);
285 >        else
286 >                x *= 256.;
287 >        h = x;
288          i = y = DOT(v, tp->down);
289          if (x < 0.0 || y < 0.0)
290                  return(0);

Diff Legend

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