ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/color.h
(Generate patch)

Comparing ray/src/common/color.h (file contents):
Revision 1.4 by greg, Fri Oct 20 20:35:21 1989 UTC vs.
Revision 1.8 by greg, Fri Dec 14 16:28:20 1990 UTC

# Line 40 | Line 40 | typedef float  COLOR[3];       /* red, green, blue */
40  
41   #define  multcolor(c1,c2)       ((c1)[0]*=(c2)[0],(c1)[1]*=(c2)[1],(c1)[2]*=(c2)[2])
42  
43 < #define  bright(col)            (.30*(col)[RED]+.59*(col)[GRN]+.11*(col)[BLU])
43 > #ifdef  NTSC
44 > #define  bright(col)            (.295*(col)[RED]+.636*(col)[GRN]+.070*(col)[BLU])
45 > #define  normbright(c)          (int)((74L*(c)[RED]+164L*(c)[GRN]+18L*(c)[BLU])/256)
46 > #else
47 > #define  bright(col)            (.263*(col)[RED]+.655*(col)[GRN]+.082*(col)[BLU])
48 > #define  normbright(c)          (int)((67L*(c)[RED]+168L*(c)[GRN]+21L*(c)[BLU])/256)
49 > #endif
50  
51   #define  intens(col)            ( (col)[0] > (col)[1] \
52                                  ? (col)[0] > (col)[2] ? (col)[0] : (col)[2] \
# Line 50 | Line 56 | typedef float  COLOR[3];       /* red, green, blue */
56                                  ldexp((c)[p]+.5,(int)(c)[EXP]-(COLXS+8)) : \
57                                  0. )
58  
53 #define  normbright(c)          (int)((77L*(c)[RED]+151L*(c)[GRN]+28L*(c)[BLU])/256)
54
59   #define  WHTCOLOR               {1.0,1.0,1.0}
60   #define  BLKCOLOR               {0.0,0.0,0.0}
61   #define  WHTCOLR                {128,128,128,COLXS+1}
# Line 62 | Line 66 | typedef float  COLOR[3];       /* red, green, blue */
66   #define  YDECR                  2
67   #define  YMAJOR                 4
68  
69 < extern double  ldexp();
69 >                                /* macros for exposures */
70 > #define  EXPOSSTR               "EXPOSURE="
71 > #define  EXPOSSTRL              9
72 > #define  isexpos(hl)            (!strncmp(hl,EXPOSSTR,EXPOSSTRL))
73 > #define  exposval(hl)           atof((hl)+EXPOSSTRL)
74 > #define  fputexpos(ex,fp)       fprintf(fp,"%s%e\n",EXPOSSTR,ex)
75 >
76 >                                /* macros for pixel aspect ratios */
77 > #define  ASPECTSTR              "PIXASPECT="
78 > #define  ASPECTSTRL             10
79 > #define  isaspect(hl)           (!strncmp(hl,ASPECTSTR,ASPECTSTRL))
80 > #define  aspectval(hl)          atof((hl)+ASPECTSTRL)
81 > #define  fputaspect(pa,fp)      fprintf(fp,"%s%f\n",ASPECTSTR,pa)
82 >
83 >                                /* macros for color correction */
84 > #define  COLCORSTR              "COLORCORR="
85 > #define  COLCORSTRL             10
86 > #define  iscolcor(hl)           (!strncmp(hl,COLCORSTR,COLCORSTRL))
87 > #define  colcorval(cc,hl)       sscanf(hl+COLCORSTRL,"%f %f %f", \
88 >                                        &(cc)[RED],&(cc)[GRN],&(cc)[BLU])
89 > #define  fputcolcor(cc,fp)      fprintf(fp,"%s %f %f %f\n",COLCORSTR, \
90 >                                        (cc)[RED],(cc)[GRN],(cc)[BLU])
91 >
92 > extern double  ldexp(), atof();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines