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

Comparing ray/src/rt/aed.c (file contents):
Revision 2.4 by greg, Tue Feb 25 02:47:22 2003 UTC vs.
Revision 2.6 by schorsch, Tue Mar 30 16:13:00 2004 UTC

# Line 9 | Line 9 | static const char      RCSid[] = "$Id$";
9  
10   #include  <stdio.h>
11  
12 + #include  "rterror.h"
13 + #include  "color.h"
14   #include  "driver.h"
15  
14 – #include  "color.h"
16  
16 –
17          /* AED command characters */
18  
19   #define AEDFMT  "1888N" /* Format string to send to AED */
# Line 53 | Line 53 | static const char      RCSid[] = "$Id$";
53   #define  COMHT          16              /* height of command line */
54   #define  COMCW          63              /* maximum chars on command line */
55  
56 < int  aed_close(), aed_clear(), aed_paintr(),
57 <                aed_getcur(), aed_comout(), aed_errout();
56 > static void aed_errout(char*);
57 > static void longwait(int t);
58 > static void aedgetcap(int  *xp, int *yp);
59 > static void aedsetcap(int  x, int y);
60 > static dr_newcolrf_t anewcolr;
61 > static void aedcoord(int  x, int y);
62  
63 + static dr_closef_t aed_close;
64 + static dr_clearf_t aed_clear;
65 + static dr_paintrf_t aed_paintr;
66 + static dr_getcurf_t aed_getcur;
67 + static dr_comoutf_t comout;
68 +
69   static struct driver  aed_driver = {
70          aed_close, aed_clear, aed_paintr, aed_getcur,
71          aed_comout, NULL, NULL,
# Line 95 | Line 105 | char  *name, *id;
105   }
106  
107  
108 < static
109 < aed_close()                                     /* close AED */
108 > static void
109 > aed_close(void)                                 /* close AED */
110   {
111          erract[USER].pf =                       /* reset error vector */
112          erract[SYSTEM].pf =
# Line 125 | Line 135 | int  x, y;
135   }
136  
137  
138 < static
138 > static void
139   aed_paintr(col, xmin, ymin, xmax, ymax)         /* paint a rectangle */
140   COLOR  col;
141   int  xmin, ymin, xmax, ymax;
142   {
133 –        extern int  anewcolr();
143          int  ndx;
144  
145          ndx = get_pixel(col, anewcolr);         /* calls anewcolr() */
# Line 158 | Line 167 | int  *xp, *yp;
167   }
168  
169  
170 < static
170 > static void
171   aed_comout(out)                         /* output to command line */
172   register char  *out;
173   {
# Line 201 | Line 210 | register char  *out;
210   }
211  
212  
213 < static
213 > static void
214   aed_errout(msg)                         /* print an error message */
215   char  *msg;
216   {
# Line 215 | Line 224 | char  *msg;
224   * aedsetcap - sets AED's current access pointer to (x, y).
225   */
226  
227 < static
227 > static void
228   aedsetcap(x, y)
229   register int  x, y;
230   {
# Line 227 | Line 236 | register int  x, y;
236   * aedcoord - puts out an (x, y) coordinate in AED 8 bit format.
237   */
238  
239 < static
239 > static void
240   aedcoord(x, y)
241   register int  x, y;
242   {
# Line 237 | Line 246 | register int  x, y;
246   }
247  
248  
249 < static
249 > static void
250   aedgetcap(xp, yp)               /* get cursor postion */
251   int  *xp, *yp;
252   {
# Line 253 | Line 262 | int  *xp, *yp;
262   }
263  
264  
265 < static
265 > static void
266   anewcolr(index, r, g, b)                /* enter a color into our table */
267   int  index;
268   int  r, g, b;
# Line 268 | Line 277 | int  r, g, b;
277   }
278  
279  
280 < static
280 > static void
281   longwait(t)             /* longer wait */
282   int  t;
283   {

Diff Legend

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