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

Comparing ray/src/gen/gensurf.c (file contents):
Revision 2.12 by greg, Mon Aug 4 22:37:53 2003 UTC vs.
Revision 2.13 by schorsch, Sun Nov 16 10:29:38 2003 UTC

# Line 15 | Line 15 | static const char RCSid[] = "$Id$";
15   *      4/16/02 Added conditional vertex output
16   */
17  
18 < #include  "standard.h"
18 > #include  "rtmath.h"
19 > #include  "rterror.h"
20 > #include  "rtio.h"
21 > #include  "calcomp.h"
22  
23   char  XNAME[] =         "X`SYS";                /* x function name */
24   char  YNAME[] =         "Y`SYS";                /* y function name */
# Line 48 | Line 51 | struct {
51          RREAL   *data;                  /* the data itself, s major sort */
52   } datarec;                      /* our recorded data */
53  
54 + /* XXX this is redundant with rt/noise3.c, should go to a library */
55   double  l_hermite(), l_bezier(), l_bspline(), l_dataval();
52 extern double  funvalue(), argument();
56  
57   typedef struct {
58          int  valid;     /* point is valid (vertex number) */
# Line 59 | Line 62 | typedef struct {
62   } POINT;
63  
64  
65 + void loaddata(char *file, int m, int n, int pointsize);
66 + double l_dataval(char *nam);
67 + void putobjrow(POINT *rp, int n);
68 + void putsquare(POINT *p0, POINT *p1, POINT *p2, POINT *p3);
69 + void comprow(double s, POINT *row, int siz);
70 + void compnorms(POINT *r0, POINT *r1, POINT *r2, int siz);
71 + int norminterp(FVECT resmat[4], POINT *p0, POINT *p1, POINT *p2, POINT *p3);
72 + void printhead(int ac, char **av);
73 +
74 +
75 + int
76   main(argc, argv)
77   int  argc;
78   char  *argv[];
79   {
66        extern long     eclock;
80          POINT  *row0, *row1, *row2, *rp;
81          int  i, j, m, n;
82          char  stmp[256];
# Line 163 | Line 176 | char  *argv[];
176                  }
177          }
178  
179 <        quit(0);
179 >        return 0;
180  
181   userror:
182          fprintf(stderr, "Usage: %s material name ", argv[0]);
183          fprintf(stderr, "x(s,t) y(s,t) z(s,t) m n [-s][-e expr][-f file]\n");
184 <        quit(1);
184 >        return 1;
185   }
186  
187  
188 < loaddata(file, m, n, pointsize)         /* load point data from file */
189 < char  *file;
190 < int  m, n;
191 < int  pointsize;
188 > void
189 > loaddata(               /* load point data from file */
190 >        char  *file,
191 >        int  m,
192 >        int  n,
193 >        int  pointsize
194 > )
195   {
196          FILE  *fp;
197          char  word[64];
# Line 231 | Line 247 | int  pointsize;
247  
248  
249   double
250 < l_dataval(nam)                          /* return recorded data value */
251 < char  *nam;
250 > l_dataval(                              /* return recorded data value */
251 >        char  *nam
252 > )
253   {
254          double  u, v;
255          register int  i, j;
# Line 272 | Line 289 | char  *nam;
289   }
290  
291  
292 < putobjrow(rp, n)                        /* output vertex row to .OBJ */
293 < register POINT  *rp;
294 < int  n;
292 > void
293 > putobjrow(                      /* output vertex row to .OBJ */
294 >        register POINT  *rp,
295 >        int  n
296 > )
297   {
298          static int      nverts = 0;
299  
# Line 292 | Line 311 | int  n;
311   }
312  
313  
314 < putsquare(p0, p1, p2, p3)               /* put out a square */
315 < POINT  *p0, *p1, *p2, *p3;
314 > void
315 > putsquare(              /* put out a square */
316 >        POINT *p0,
317 >        POINT *p1,
318 >        POINT *p2,
319 >        POINT *p3
320 > )
321   {
322          static int  nout = 0;
323          FVECT  norm[4];
# Line 417 | Line 441 | POINT  *p0, *p1, *p2, *p3;
441   }
442  
443  
444 < comprow(s, row, siz)                    /* compute row of values */
445 < double  s;
446 < register POINT  *row;
447 < int  siz;
444 > void
445 > comprow(                        /* compute row of values */
446 >        double  s,
447 >        register POINT  *row,
448 >        int  siz
449 > )
450   {
451          double  st[2];
452          int  end;
# Line 457 | Line 483 | int  siz;
483   }
484  
485  
486 < compnorms(r0, r1, r2, siz)              /* compute row of averaged normals */
487 < register POINT  *r0, *r1, *r2;
488 < int  siz;
486 > void
487 > compnorms(              /* compute row of averaged normals */
488 >        register POINT  *r0,
489 >        register POINT  *r1,
490 >        register POINT  *r2,
491 >        int  siz
492 > )
493   {
494          FVECT  v1, v2;
495  
# Line 497 | Line 527 | int  siz;
527  
528  
529   int
530 < norminterp(resmat, p0, p1, p2, p3)      /* compute normal interpolation */
531 < register FVECT  resmat[4];
532 < POINT  *p0, *p1, *p2, *p3;
530 > norminterp(     /* compute normal interpolation */
531 >        register FVECT  resmat[4],
532 >        POINT  *p0,
533 >        POINT  *p1,
534 >        POINT  *p2,
535 >        POINT  *p3
536 > )
537   {
538   #define u  ((ax+1)%3)
539   #define v  ((ax+2)%3)
# Line 576 | Line 610 | int  code;
610   }
611  
612  
613 < printhead(ac, av)               /* print command header */
614 < register int  ac;
615 < register char  **av;
613 > void
614 > printhead(              /* print command header */
615 >        register int  ac,
616 >        register char  **av
617 > )
618   {
619          putchar('#');
620          while (ac--) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines