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.24 by greg, Thu Feb 12 18:55:50 2004 UTC vs.
Revision 2.25 by schorsch, Tue Mar 30 16:13:01 2004 UTC

# Line 8 | Line 8 | static const char      RCSid[] = "$Id$";
8   #include "copyright.h"
9  
10   #include  "ray.h"
11
11   #include  "paths.h"
13
12   #include  "otypes.h"
13 <
13 > #include  "rtotypes.h"
14   #include  "font.h"
15  
16   /*
# Line 78 | Line 76 | typedef struct {
76          TLINE  tl;                      /* line list */
77   }  TEXT;
78  
79 < TEXT  *gettext();
79 > static TLINE * tlalloc(char *s);
80 > static TEXT * gettext(OBJREC *tm);
81 > static int intext(FVECT p, OBJREC *m);
82 > static int inglyph(double x, double y, GLYPH *gl);
83  
83 TLINE  *tlalloc();
84  
85 <
86 < do_text(m, r)
87 < register OBJREC  *m;
88 < RAY  *r;
85 > extern int
86 > do_text(
87 >        register OBJREC  *m,
88 >        RAY  *r
89 > )
90   {
91          FVECT  v;
92          int  foreground;
# Line 132 | Line 133 | RAY  *r;
133   }
134  
135  
136 < TLINE *
137 < tlalloc(s)                      /* allocate and assign text line */
138 < char  *s;
136 > static TLINE *
137 > tlalloc(                        /* allocate and assign text line */
138 >        char  *s
139 > )
140   {
141          register int  siz;
142          register TLINE  *tl;
# Line 149 | Line 151 | char  *s;
151   }
152  
153  
154 < TEXT *
155 < gettext(tm)                     /* get text structure for material */
156 < register OBJREC  *tm;
154 > static TEXT *
155 > gettext(                        /* get text structure for material */
156 >        register OBJREC  *tm
157 > )
158   {
159   #define  R      (tm->oargs.farg+3)
160   #define  D      (tm->oargs.farg+6)
# Line 242 | Line 245 | register OBJREC  *tm;
245   }
246  
247  
248 < freetext(m)                     /* free text structures associated with m */
249 < OBJREC  *m;
248 > extern void
249 > freetext(                       /* free text structures associated with m */
250 >        OBJREC  *m
251 > )
252   {
253          register TEXT  *tp;
254          register TLINE  *tlp;
# Line 262 | Line 267 | OBJREC  *m;
267   }
268  
269  
270 < intext(p, m)                    /* check to see if p is in text glyph */
271 < FVECT  p;
272 < OBJREC  *m;
270 > static int
271 > intext(                 /* check to see if p is in text glyph */
272 >        FVECT  p,
273 >        OBJREC  *m
274 > )
275   {
276          register TEXT  *tp;
277          register TLINE  *tlp;
# Line 302 | Line 309 | OBJREC  *m;
309   }
310  
311  
312 < inglyph(x, y, gl)               /* (x,y) within font glyph gl? */
313 < double  x, y;           /* real coordinates in range [0,255) */
314 < register GLYPH  *gl;
312 > static int
313 > inglyph(                /* (x,y) within font glyph gl? */
314 >        double  x,              /* real coordinates in range [0,255) */
315 >        double  y,
316 >        register GLYPH  *gl
317 > )
318   {
319          int  n, ncross;
320          int  xlb, ylb;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines