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

Comparing src/px/pinterp.c (file contents):
Revision 2.40 by schorsch, Fri Jan 2 12:47:01 2004 UTC vs.
Revision 2.42 by greg, Tue Jan 18 03:59:41 2005 UTC

# Line 68 | Line 68 | char   *progname;
68  
69   int     fillo = F_FORE|F_BACK;          /* selected fill options */
70   int     fillsamp = 0;                   /* sample separation (0 == inf) */
71 – extern int      backfill(), rcalfill(); /* fill functions */
72 – int     (*fillfunc)() = backfill;       /* selected fill function */
71   COLR    backcolr = BLKCOLR;             /* background color */
72   COLOR   backcolor = BLKCOLOR;           /* background color (float) */
73   double  backz = 0.0;                    /* background z value */
# Line 92 | Line 90 | unsigned short queue[PACKSIZ][2];      /* pending pixels */
90   int     packsiz;                        /* actual packet size */
91   int     queuesiz = 0;                   /* number of pixels pending */
92  
93 < extern double   movepixel();
93 > typedef void fillfunc_t(int x, int y);
94  
95   static gethfunc headline;
96 + static int nextview(FILE *fp);
97 + static void compavgview(void);
98 + static void addpicture(char *pfile, char *zspec);
99 + static int pixform(MAT4 xfmat, VIEW *vw1, VIEW *vw2);
100 + static void addscanline(struct bound *xl, int y,
101 +        COLR *pline, float *zline, struct position *lasty);
102 + static void addpixel(struct position *p0, struct position *p1,
103 +        struct position *p2, COLR pix, double w, double z);
104 + static double movepixel(FVECT pos);
105 + static int getperim(struct bound *xl, struct bound *yl, float *zline, int zfd);
106 + static void backpicture(fillfunc_t *fill, int samp);
107 + static void fillpicture(fillfunc_t *fill);
108 + static int clipaft(void);
109 + static int addblur(void);
110 + static void writepicture(void);
111 + static void writedistance(char *fname);
112 + static fillfunc_t backfill;
113 + static fillfunc_t rcalfill;
114 + static void calstart(char *prog, char *args);
115 + static void caldone(void);
116 + static void clearqueue(void);
117 + static void syserror(char *s);
118  
119 + fillfunc_t *fillfunc = backfill;        /* selected fill function */
120  
121 < main(argc, argv)                        /* interpolate pictures */
122 < int     argc;
123 < char    *argv[];
121 > int
122 > main(                   /* interpolate pictures */
123 >        int     argc,
124 >        char    *argv[]
125 > )
126   {
127   #define  check(ol,al)           if (argv[an][ol] || \
128                                  badarg(argc-an-1,argv+an+1,al)) \
# Line 361 | Line 384 | headline(                              /* process header string */
384   }
385  
386  
387 < nextview(fp)                            /* get and set next view */
388 < FILE    *fp;
387 > static int
388 > nextview(                               /* get and set next view */
389 >        FILE    *fp
390 > )
391   {
392          char    linebuf[256];
393          char    *err;
# Line 389 | Line 414 | FILE   *fp;
414                  avgview.vdir[i] += ourview.vdir[i];
415                  avgview.vup[i] += ourview.vup[i];
416          }
417 +        avgview.vdist += ourview.vdist;
418          avgview.horiz += ourview.horiz;
419          avgview.vert += ourview.vert;
420          avgview.hoff += ourview.hoff;
# Line 399 | Line 425 | FILE   *fp;
425   }
426  
427  
428 < compavgview()                           /* compute average view */
428 > static void
429 > compavgview(void)                               /* compute average view */
430   {
431          register int    i;
432          double  f;
# Line 412 | Line 439 | compavgview()                          /* compute average view */
439                  avgview.vdir[i] *= f;
440                  avgview.vup[i] *= f;
441          }
442 +        avgview.vdist *= f;
443          avgview.horiz *= f;
444          avgview.vert *= f;
445          avgview.hoff *= f;
# Line 424 | Line 452 | compavgview()                          /* compute average view */
452   }
453  
454  
455 < addpicture(pfile, zspec)                /* add picture to output */
456 < char    *pfile, *zspec;
455 > static void
456 > addpicture(             /* add picture to output */
457 >        char    *pfile,
458 >        char    *zspec
459 > )
460   {
461          FILE    *pfp;
462          int     zfd;
# Line 522 | Line 553 | char   *pfile, *zspec;
553   }
554  
555  
556 < pixform(xfmat, vw1, vw2)                /* compute view1 to view2 matrix */
557 < register MAT4   xfmat;
558 < register VIEW   *vw1, *vw2;
556 > static int
557 > pixform(                /* compute view1 to view2 matrix */
558 >        register MAT4   xfmat,
559 >        register VIEW   *vw1,
560 >        register VIEW   *vw2
561 > )
562   {
563          double  m4t[4][4];
564  
# Line 563 | Line 597 | register VIEW  *vw1, *vw2;
597   }
598  
599  
600 < addscanline(xl, y, pline, zline, lasty) /* add scanline to output */
601 < struct bound    *xl;
602 < int     y;
603 < COLR    *pline;
604 < float   *zline;
605 < struct position *lasty;         /* input/output */
600 > static void
601 > addscanline(    /* add scanline to output */
602 >        struct bound    *xl,
603 >        int     y,
604 >        COLR    *pline,
605 >        float   *zline,
606 >        struct position *lasty          /* input/output */
607 > )
608   {
609          FVECT   pos;
610          struct position lastx, newpos;
# Line 595 | Line 631 | struct position        *lasty;         /* input/output */
631   }
632  
633  
634 < addpixel(p0, p1, p2, pix, w, z)         /* fill in pixel parallelogram */
635 < struct position *p0, *p1, *p2;
636 < COLR    pix;
637 < double  w;
638 < double  z;
634 > static void
635 > addpixel(               /* fill in pixel parallelogram */
636 >        struct position *p0,
637 >        struct position *p1,
638 >        struct position *p2,
639 >        COLR    pix,
640 >        double  w,
641 >        double  z
642 > )
643   {
644          double  zt = 2.*zeps*p0->z;             /* threshold */
645          COLOR   pval;                           /* converted+weighted pixel */
# Line 672 | Line 712 | double z;
712   }
713  
714  
715 < double
716 < movepixel(pos)                          /* reposition image point */
717 < register FVECT  pos;
715 > static double
716 > movepixel(                              /* reposition image point */
717 >        register FVECT  pos
718 > )
719   {
720          FVECT   pt, tdir, odir;
721          double  d;
# Line 737 | Line 778 | register FVECT pos;
778   }
779  
780  
781 < getperim(xl, yl, zline, zfd)            /* compute overlapping image area */
782 < register struct bound   *xl;
783 < struct bound    *yl;
784 < float   *zline;
785 < int     zfd;
781 > static int
782 > getperim(               /* compute overlapping image area */
783 >        register struct bound   *xl,
784 >        struct bound    *yl,
785 >        float   *zline,
786 >        int     zfd
787 > )
788   {
789          int     step;
790          FVECT   pos;
# Line 821 | Line 864 | int    zfd;
864   }
865  
866  
867 < backpicture(fill, samp)                 /* background fill algorithm */
868 < int     (*fill)();
869 < int     samp;
867 > static void
868 > backpicture(                    /* background fill algorithm */
869 >        fillfunc_t *fill,
870 >        int     samp
871 > )
872   {
873          int     *yback, xback;
874          int     y;
# Line 929 | Line 974 | int    samp;
974   }
975  
976  
977 < fillpicture(fill)               /* paint in empty pixels using fill */
978 < int     (*fill)();
977 > static void
978 > fillpicture(            /* paint in empty pixels using fill */
979 >        fillfunc_t *fill
980 > )
981   {
982          register int    x, y;
983  
# Line 943 | Line 990 | int    (*fill)();
990   }
991  
992  
993 < clipaft()                       /* perform aft clipping as indicated */
993 > static int
994 > clipaft(void)                   /* perform aft clipping as indicated */
995   {
996          register int    x, y;
997          int     adjtest = (ourview.type == VT_PER) & zisnorm;
# Line 979 | Line 1027 | clipaft()                      /* perform aft clipping as indicated */
1027   }
1028  
1029  
1030 < addblur()                               /* add to blurred picture */
1030 > static int
1031 > addblur(void)                           /* add to blurred picture */
1032   {
1033          COLOR   cval;
1034          double  d;
# Line 1019 | Line 1068 | addblur()                              /* add to blurred picture */
1068   }
1069  
1070  
1071 < writepicture()                          /* write out picture (alters buffer) */
1071 > static void
1072 > writepicture(void)                              /* write out picture (alters buffer) */
1073   {
1074          int     y;
1075          register int    x;
# Line 1050 | Line 1100 | writepicture()                         /* write out picture (alters buffer)
1100   }
1101  
1102  
1103 < writedistance(fname)                    /* write out z file (alters buffer) */
1104 < char    *fname;
1103 > static void
1104 > writedistance(                  /* write out z file (alters buffer) */
1105 >        char    *fname
1106 > )
1107   {
1108          int     donorm = normdist & !zisnorm ? 1 :
1109                          (ourview.type == VT_PER) & !normdist & zisnorm ? -1 : 0;
# Line 1083 | Line 1135 | char   *fname;
1135   }
1136  
1137  
1138 < backfill(x, y)                          /* fill pixel with background */
1139 < int     x, y;
1138 > static void
1139 > backfill(                               /* fill pixel with background */
1140 >        int     x,
1141 >        int     y
1142 > )
1143   {
1144          if (averaging) {
1145                  copycolor(sscan(y)[x], backcolor);
# Line 1095 | Line 1150 | int    x, y;
1150   }
1151  
1152  
1153 < calstart(prog, args)                    /* start fill calculation */
1154 < char    *prog, *args;
1153 > static void
1154 > calstart(                    /* start fill calculation */
1155 >        char    *prog,
1156 >        char    *args
1157 > )
1158   {
1159          char    combuf[512];
1160          char    *argv[64];
# Line 1135 | Line 1193 | char   *prog, *args;
1193   }
1194  
1195  
1196 < caldone()                               /* done with calculation */
1196 > static void
1197 > caldone(void)                               /* done with calculation */
1198   {
1199          if (!PDesc.running)
1200                  return;
# Line 1144 | Line 1203 | caldone()                               /* done with c
1203   }
1204  
1205  
1206 < rcalfill(x, y)                          /* fill with ray-calculated pixel */
1207 < int     x, y;
1206 > static void
1207 > rcalfill(                               /* fill with ray-calculated pixel */
1208 >        int     x,
1209 >        int     y
1210 > )
1211   {
1212          if (queuesiz >= packsiz)        /* flush queue if needed */
1213                  clearqueue();
# Line 1156 | Line 1218 | int    x, y;
1218   }
1219  
1220  
1221 < clearqueue()                            /* process queue */
1221 > static void
1222 > clearqueue(void)                                /* process queue */
1223   {
1224          FVECT   orig, dir;
1225          float   fbuf[6*(PACKSIZ+1)];
# Line 1212 | Line 1275 | clearqueue()                           /* process queue */
1275   }
1276  
1277  
1278 < syserror(s)                     /* report error and exit */
1279 < char    *s;
1278 > static void
1279 > syserror(                       /* report error and exit */
1280 >        char    *s
1281 > )
1282   {
1283          perror(s);
1284          exit(1);

Diff Legend

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