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.11 by schorsch, Thu Jun 26 00:58:09 2003 UTC vs.
Revision 2.16 by greg, Sat Aug 21 11:54:06 2004 UTC

# Line 17 | Line 17 | static const char RCSid[] = "$Id$";
17  
18   #include  "standard.h"
19  
20 + #include  "paths.h"
21 + #include  "resolu.h"
22 + #include  "rterror.h"
23 + #include  "calcomp.h"
24 +
25   char  XNAME[] =         "X`SYS";                /* x function name */
26   char  YNAME[] =         "Y`SYS";                /* y function name */
27   char  ZNAME[] =         "Z`SYS";                /* z function name */
# Line 48 | Line 53 | struct {
53          RREAL   *data;                  /* the data itself, s major sort */
54   } datarec;                      /* our recorded data */
55  
56 + /* XXX this is redundant with rt/noise3.c, should go to a library */
57   double  l_hermite(), l_bezier(), l_bspline(), l_dataval();
52 – extern double  funvalue(), argument();
58  
59   typedef struct {
60          int  valid;     /* point is valid (vertex number) */
# Line 59 | Line 64 | typedef struct {
64   } POINT;
65  
66  
67 + void loaddata(char *file, int m, int n, int pointsize);
68 + double l_dataval(char *nam);
69 + void putobjrow(POINT *rp, int n);
70 + void putsquare(POINT *p0, POINT *p1, POINT *p2, POINT *p3);
71 + void comprow(double s, POINT *row, int siz);
72 + void compnorms(POINT *r0, POINT *r1, POINT *r2, int siz);
73 + int norminterp(FVECT resmat[4], POINT *p0, POINT *p1, POINT *p2, POINT *p3);
74 +
75 +
76 + int
77   main(argc, argv)
78   int  argc;
79   char  *argv[];
80   {
66 –        extern long     eclock;
81          POINT  *row0, *row1, *row2, *rp;
82          int  i, j, m, n;
83          char  stmp[256];
# Line 124 | Line 138 | char  *argv[];
138          }
139          row0++; row1++; row2++;
140                                                  /* print header */
141 <        printhead(argc, argv);
141 >        fputs("# ", stdout);
142 >        printargs(argc, argv, stdout);
143          eclock = 0;
144                                                  /* initialize */
145          comprow(-1.0/m, row0, n);
# Line 163 | Line 178 | char  *argv[];
178                  }
179          }
180  
181 <        quit(0);
181 >        return 0;
182  
183   userror:
184          fprintf(stderr, "Usage: %s material name ", argv[0]);
185          fprintf(stderr, "x(s,t) y(s,t) z(s,t) m n [-s][-e expr][-f file]\n");
186 <        quit(1);
186 >        return 1;
187   }
188  
189  
190 < loaddata(file, m, n, pointsize)         /* load point data from file */
191 < char  *file;
192 < int  m, n;
193 < int  pointsize;
190 > void
191 > loaddata(               /* load point data from file */
192 >        char  *file,
193 >        int  m,
194 >        int  n,
195 >        int  pointsize
196 > )
197   {
198          FILE  *fp;
199          char  word[64];
# Line 231 | Line 249 | int  pointsize;
249  
250  
251   double
252 < l_dataval(nam)                          /* return recorded data value */
253 < char  *nam;
252 > l_dataval(                              /* return recorded data value */
253 >        char  *nam
254 > )
255   {
256          double  u, v;
257          register int  i, j;
# Line 272 | Line 291 | char  *nam;
291   }
292  
293  
294 < putobjrow(rp, n)                        /* output vertex row to .OBJ */
295 < register POINT  *rp;
296 < int  n;
294 > void
295 > putobjrow(                      /* output vertex row to .OBJ */
296 >        register POINT  *rp,
297 >        int  n
298 > )
299   {
300          static int      nverts = 0;
301  
# Line 292 | Line 313 | int  n;
313   }
314  
315  
316 < putsquare(p0, p1, p2, p3)               /* put out a square */
317 < POINT  *p0, *p1, *p2, *p3;
316 > void
317 > putsquare(              /* put out a square */
318 >        POINT *p0,
319 >        POINT *p1,
320 >        POINT *p2,
321 >        POINT *p3
322 > )
323   {
324          static int  nout = 0;
325          FVECT  norm[4];
# Line 417 | Line 443 | POINT  *p0, *p1, *p2, *p3;
443   }
444  
445  
446 < comprow(s, row, siz)                    /* compute row of values */
447 < double  s;
448 < register POINT  *row;
449 < int  siz;
446 > void
447 > comprow(                        /* compute row of values */
448 >        double  s,
449 >        register POINT  *row,
450 >        int  siz
451 > )
452   {
453          double  st[2];
454          int  end;
# Line 457 | Line 485 | int  siz;
485   }
486  
487  
488 < compnorms(r0, r1, r2, siz)              /* compute row of averaged normals */
489 < register POINT  *r0, *r1, *r2;
490 < int  siz;
488 > void
489 > compnorms(              /* compute row of averaged normals */
490 >        register POINT  *r0,
491 >        register POINT  *r1,
492 >        register POINT  *r2,
493 >        int  siz
494 > )
495   {
496          FVECT  v1, v2;
497  
# Line 497 | Line 529 | int  siz;
529  
530  
531   int
532 < norminterp(resmat, p0, p1, p2, p3)      /* compute normal interpolation */
533 < register FVECT  resmat[4];
534 < POINT  *p0, *p1, *p2, *p3;
532 > norminterp(     /* compute normal interpolation */
533 >        register FVECT  resmat[4],
534 >        POINT  *p0,
535 >        POINT  *p1,
536 >        POINT  *p2,
537 >        POINT  *p3
538 > )
539   {
540   #define u  ((ax+1)%3)
541   #define v  ((ax+2)%3)
# Line 552 | Line 588 | POINT  *p0, *p1, *p2, *p3;
588   }
589  
590  
555 – void
556 – eputs(msg)
557 – char  *msg;
558 – {
559 –        fputs(msg, stderr);
560 – }
561 –
562 –
563 – void
564 – wputs(msg)
565 – char  *msg;
566 – {
567 –        eputs(msg);
568 – }
569 –
570 –
571 – void
572 – quit(code)
573 – int  code;
574 – {
575 –        exit(code);
576 – }
577 –
578 –
579 – printhead(ac, av)               /* print command header */
580 – register int  ac;
581 – register char  **av;
582 – {
583 –        putchar('#');
584 –        while (ac--) {
585 –                putchar(' ');
586 –                fputs(*av++, stdout);
587 –        }
588 –        putchar('\n');
589 – }
590 –
591 –
591   double
592 < l_hermite()                    
592 > l_hermite(char *nm)
593   {
594          double  t;
595          
# Line 603 | Line 602 | l_hermite()                    
602  
603  
604   double
605 < l_bezier()
605 > l_bezier(char *nm)
606   {
607          double  t;
608  
# Line 616 | Line 615 | l_bezier()
615  
616  
617   double
618 < l_bspline()
618 > l_bspline(char *nm)
619   {
620          double  t;
621  

Diff Legend

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