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

Comparing ray/src/rt/rtrace.c (file contents):
Revision 2.5 by greg, Thu Mar 12 09:46:19 1992 UTC vs.
Revision 2.6 by greg, Fri Jul 10 14:56:24 1992 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1986 Regents of the University of California */
1 > /* Copyright (c) 1992 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 30 | Line 30 | static char SCCSid[] = "$SunId$ LBL";
30  
31   #include  "otypes.h"
32  
33 + #include  "resolu.h"
34 +
35   int  dimlist[MAXDIM];                   /* sampling dimensions */
36   int  ndims = 0;                         /* number of sampling dimensions */
37   int  samplendx = 0;                     /* index for this sample */
# Line 88 | Line 90 | int  code;
90   }
91  
92  
93 + char *
94 + formstr(f)                              /* return format identifier */
95 + int  f;
96 + {
97 +        switch (f) {
98 +        case 'a': return("ascii");
99 +        case 'f': return("float");
100 +        case 'd': return("double");
101 +        case 'c': return(COLRFMT);
102 +        }
103 +        return("unknown");
104 + }
105 +
106 +
107   rtrace(fname)                           /* trace rays from file */
108   char  *fname;
109   {
# Line 108 | Line 124 | char  *fname;
124          case 'a': putreal = puta; break;
125          case 'f': putreal = putf; break;
126          case 'd': putreal = putd; break;
127 +        case 'c':
128 +                if (strcmp(outvals, "v"))
129 +                        error(USER, "color format with value output only");
130 +                break;
131 +        default:
132 +                error(CONSISTENCY, "botched output format");
133          }
134 +        fputformat(formstr(outform), stdout);
135 +        putchar('\n');
136 +        if (hresolu > 0 && vresolu > 0)
137 +                fprtresolu(hresolu, vresolu, stdout);
138                                          /* process file */
139          while (getvec(orig, inform, fp) == 0 &&
140                          getvec(direc, inform, fp) == 0) {
# Line 267 | Line 293 | FILE  *fp;
293                          return(-1);
294                  vec[0] = vd[0]; vec[1] = vd[1]; vec[2] = vd[2];
295                  break;
296 +        default:
297 +                error(CONSISTENCY, "botched input format");
298          }
299          return(0);
300   }
# Line 322 | Line 350 | static
350   oputv(r)                                /* print value */
351   register RAY  *r;
352   {
353 +        COLR  cout;
354 +        
355 +        if (outform == 'c') {
356 +                setcolr(cout,   colval(r->rcol,RED),
357 +                                colval(r->rcol,GRN),
358 +                                colval(r->rcol,BLU));
359 +                fwrite((char *)cout, sizeof(cout), 1, stdout);
360 +                return;
361 +        }
362          (*putreal)(colval(r->rcol,RED));
363          (*putreal)(colval(r->rcol,GRN));
364          (*putreal)(colval(r->rcol,BLU));

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)