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.6 by greg, Thu Jun 25 12:05:10 1992 UTC vs.
Revision 2.20 by greg, Sat Feb 22 02:07:29 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1991 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   *  text.c - functions for text patterns and mixtures.
6 + */
7 +
8 + /* ====================================================================
9 + * The Radiance Software License, Version 1.0
10   *
11 < *     11/12/86
11 > * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 > * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 > *
14 > * Redistribution and use in source and binary forms, with or without
15 > * modification, are permitted provided that the following conditions
16 > * are met:
17 > *
18 > * 1. Redistributions of source code must retain the above copyright
19 > *         notice, this list of conditions and the following disclaimer.
20 > *
21 > * 2. Redistributions in binary form must reproduce the above copyright
22 > *       notice, this list of conditions and the following disclaimer in
23 > *       the documentation and/or other materials provided with the
24 > *       distribution.
25 > *
26 > * 3. The end-user documentation included with the redistribution,
27 > *           if any, must include the following acknowledgment:
28 > *             "This product includes Radiance software
29 > *                 (http://radsite.lbl.gov/)
30 > *                 developed by the Lawrence Berkeley National Laboratory
31 > *               (http://www.lbl.gov/)."
32 > *       Alternately, this acknowledgment may appear in the software itself,
33 > *       if and wherever such third-party acknowledgments normally appear.
34 > *
35 > * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 > *       and "The Regents of the University of California" must
37 > *       not be used to endorse or promote products derived from this
38 > *       software without prior written permission. For written
39 > *       permission, please contact [email protected].
40 > *
41 > * 5. Products derived from this software may not be called "Radiance",
42 > *       nor may "Radiance" appear in their name, without prior written
43 > *       permission of Lawrence Berkeley National Laboratory.
44 > *
45 > * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 > * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 > * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 > * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 > * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 > * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 > * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 > * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 > * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 > * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 > * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 > * SUCH DAMAGE.
57 > * ====================================================================
58 > *
59 > * This software consists of voluntary contributions made by many
60 > * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 > * information on Lawrence Berkeley National Laboratory, please see
62 > * <http://www.lbl.gov/>.
63   */
64  
65   #include  "ray.h"
# Line 45 | Line 97 | static char SCCSid[] = "$SunId$ LBL";
97   *              [spacing]
98   *
99   *  Colortext is identical, except colors are given rather than
100 < *  brightnesses.  Mixtext has foreground and background modifiers:
100 > *  brightnesses.
101   *
102 + *  Mixtext has foreground and background modifiers:
103 + *
104   *      modifier mixtext id
105   *      4+ foremod backmod fontfile text..
106   *      0
# Line 77 | Line 131 | typedef struct {
131          TLINE  tl;                      /* line list */
132   }  TEXT;
133  
80 extern char  *libpath;
81
82 extern char  *fgetword();
83
134   TEXT  *gettext();
135  
136   TLINE  *tlalloc();
137  
138  
139 < text(m, r)
139 > do_text(m, r)
140   register OBJREC  *m;
141   RAY  *r;
142   {
# Line 105 | Line 155 | RAY  *r;
155                  char  *modname = m->oargs.sarg[foreground ? 0 : 1];
156                  if (!strcmp(modname, VOIDID))
157                          omod = OVOID;
158 <                else if ((omod = modifier(modname)) == OVOID) {
158 >                else if ((omod = lastmod(objndx(m), modname)) == OVOID) {
159                          sprintf(errmsg, "undefined modifier \"%s\"", modname);
160                          objerror(m, USER, errmsg);
161                  }
162 <                raytexture(r, omod);
162 >                if (rayshade(r, omod)) {
163 >                        if (m->omod != OVOID)
164 >                                objerror(m, USER, "inappropriate modifier");
165 >                        return(1);
166 >                }
167          } else if (m->otype == PAT_BTEXT) {
168                  if (foreground)
169                          scalecolor(r->pcol, m->oargs.farg[9]);
# Line 127 | Line 181 | RAY  *r;
181                                          m->oargs.farg[14]);
182                  multcolor(r->pcol, cval);
183          }
184 +        return(0);
185   }
186  
187  
# Line 134 | Line 189 | TLINE *
189   tlalloc(s)                      /* allocate and assign text line */
190   char  *s;
191   {
137        extern char  *strcpy();
192          register int  siz;
193          register TLINE  *tl;
194  
# Line 142 | Line 196 | char  *s;
196          if ((tl=(TLINE *)malloc(sizeof(TLINE)+siz)) == NULL ||
197                          (tl->spc=(short *)malloc(siz*sizeof(short))) == NULL)
198                  error(SYSTEM, "out of memory in tlalloc");
145        tl->spc = NULL;
199          tl->next = NULL;
200          strcpy(TLSTR(tl), s);
201          return(tl);
# Line 155 | Line 208 | register OBJREC  *tm;
208   {
209   #define  R      (tm->oargs.farg+3)
210   #define  D      (tm->oargs.farg+6)
158        extern char  *strcpy(), *fgets();
211          FVECT  DxR;
212          double  d;
213          FILE  *fp;
# Line 171 | Line 223 | register OBJREC  *tm;
223          if (tm->oargs.nsargs - tndx(tm) < 1 || tm->oargs.nfargs < sndx(tm))
224                  objerror(tm, USER, "bad # arguments");
225          if ((t = (TEXT *)malloc(sizeof(TEXT))) == NULL)
226 <                goto memerr;
226 >                error(SYSTEM, "out of memory in gettext");
227                                                  /* compute vectors */
228          fcross(DxR, D, R);
229          fcross(t->right, DxR, D);
230 <        d = DOT(D,D)/DOT(t->right,t->right);
230 >        d = DOT(t->right,t->right);
231 >        if (d <= FTINY*FTINY*FTINY*FTINY)
232 >                objerror(tm, USER, "illegal motion vector");
233 >        d = DOT(D,D)/d;
234          for (i = 0; i < 3; i++)
235                  t->right[i] *= d;
236          fcross(t->down, R, DxR);
# Line 196 | Line 251 | register OBJREC  *tm;
251                  tlp = tlp->next;
252          } else {                                /* text file */
253                  if ((s = getpath(tm->oargs.sarg[tndx(tm)],
254 <                                libpath, R_OK)) == NULL) {
254 >                                getlibpath(), R_OK)) == NULL) {
255                          sprintf(errmsg, "cannot find text file \"%s\"",
256                                          tm->oargs.sarg[tndx(tm)]);
257                          error(USER, errmsg);
# Line 220 | Line 275 | register OBJREC  *tm;
275                                                  /* compute character spacing */
276          i = sndx(tm);
277          d = i < tm->oargs.nfargs ? tm->oargs.farg[i] : 0.0;
278 <        i = d * 256.0;
278 >        i = d * 255.0;
279          t->tl.width = 0;
280          for (tlp = t->tl.next; tlp != NULL; tlp = tlp->next) {
226                if ((tlp->spc = (short *)malloc(
227                                (strlen(TLSTR(tlp))+1)*sizeof(short))) == NULL)
228                        goto memerr;
281                  if (i < 0)
282                          tlp->width = squeeztext(tlp->spc, TLSTR(tlp), t->f, -i);
283                  else if (i > 0)
# Line 238 | Line 290 | register OBJREC  *tm;
290                                                  /* we're done */
291          tm->os = (char *)t;
292          return(t);
241 memerr:
242        error(SYSTEM, "out of memory in gettext");
293   #undef  R
294   #undef  D
295   }
# Line 254 | Line 304 | OBJREC  *m;
304          tp = (TEXT *)m->os;
305          if (tp == NULL)
306                  return;
307 <        for (tlp = tp->tl.next; tlp != NULL; tlp = tlp->next) {
308 <                free((char *)tlp->spc);
309 <                free((char *)tlp);
307 >        while ((tlp = tp->tl.next) != NULL) {
308 >                tp->tl.next = tlp->next;
309 >                free((void *)tlp->spc);
310 >                free((void *)tlp);
311          }
312 <        free((char *)tp);
312 >        freefont(tp->f);        /* release font reference */
313 >        free((void *)tp);
314          m->os = NULL;
315   }
316  
# Line 267 | Line 319 | intext(p, m)                   /* check to see if p is in text glyph *
319   FVECT  p;
320   OBJREC  *m;
321   {
270        extern double  fabs();
322          register TEXT  *tp;
323          register TLINE  *tlp;
324          FVECT  v;
# Line 281 | Line 332 | OBJREC  *m;
332          x = DOT(v, tp->right);
333          i = sndx(m);
334          if (i < m->oargs.nfargs)
335 <                x *= tp->f->mwidth + 256.*fabs(m->oargs.farg[i]);
335 >                x *= tp->f->mwidth + 255.*fabs(m->oargs.farg[i]);
336          else
337 <                x *= 256.;
337 >                x *= 255.;
338          h = x;
339          i = y = DOT(v, tp->down);
340          if (x < 0.0 || y < 0.0)
341                  return(0);
342          x -= (double)h;
343 <        y = ((i+1) - y)*256.;
343 >        y = ((i+1) - y)*255.;
344                                  /* find the line position */
345          for (tlp = tp->tl.next; tlp != NULL; tlp = tlp->next)
346                  if (--i < 0)
# Line 297 | Line 348 | OBJREC  *m;
348          if (tlp == NULL || h >= tlp->width)
349                  return(0);
350          for (i = 0; (h -= tlp->spc[i]) >= 0; i++)
351 <                if (h < 256 && inglyph(h+x, y,
351 >                if (h < 255 && inglyph(h+x, y,
352                                  tp->f->fg[TLSTR(tlp)[i]&0xff]))
353                          return(1);
354          return(0);
# Line 305 | Line 356 | OBJREC  *m;
356  
357  
358   inglyph(x, y, gl)               /* (x,y) within font glyph gl? */
359 < double  x, y;           /* real coordinates in range [0,256) */
359 > double  x, y;           /* real coordinates in range [0,255) */
360   register GLYPH  *gl;
361   {
362          int  n, ncross;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines