Project

General

Profile

« Previous | Next » 

Revision 15aa7d94

Added by Leszek Koltunski almost 7 years ago

Progress with support for Effect classes.

View differences:

src/main/res/raw/main_fragment_shader.glsl
38 38

  
39 39
#if NUM_FRAGMENT>0
40 40
uniform int fNumEffects;                // total number of fragment effects
41
uniform int fType[NUM_FRAGMENT];        // their types.
41
uniform int fName[NUM_FRAGMENT];        // their namess.
42 42
uniform vec4 fUniforms[2*NUM_FRAGMENT]; // i-th effect is 2 consecutive vec4's: [2*i], [2*i+1]. First vec4 is the Interpolated values,
43 43
                                        // next describes the Region, i.e. area over which the effect is active.
44 44

  
......
116 116
    pointDegree = max(0.0,1.0-dot(diff,diff));
117 117

  
118 118
#ifdef CHROMA
119
    if( fType[i]==CHROMA            ) chroma    (sign(pointDegree),j,pixel); else
119
    if( fName[i]==CHROMA            ) chroma    (sign(pointDegree),j,pixel); else
120 120
#endif
121 121
#ifdef SMOOTH_CHROMA
122
    if( fType[i]==SMOOTH_CHROMA     ) chroma    (     pointDegree ,j,pixel); else
122
    if( fName[i]==SMOOTH_CHROMA     ) chroma    (     pointDegree ,j,pixel); else
123 123
#endif
124 124
#ifdef ALPHA
125
    if( fType[i]==ALPHA             ) alpha     (sign(pointDegree),j,pixel); else
125
    if( fName[i]==ALPHA             ) alpha     (sign(pointDegree),j,pixel); else
126 126
#endif
127 127
#ifdef SMOOTH_ALPHA
128
    if( fType[i]==SMOOTH_ALPHA      ) alpha     (     pointDegree ,j,pixel); else
128
    if( fName[i]==SMOOTH_ALPHA      ) alpha     (     pointDegree ,j,pixel); else
129 129
#endif
130 130
#ifdef BRIGHTNESS
131
    if( fType[i]==BRIGHTNESS        ) brightness(sign(pointDegree),j,pixel); else
131
    if( fName[i]==BRIGHTNESS        ) brightness(sign(pointDegree),j,pixel); else
132 132
#endif
133 133
#ifdef SMOOTH_BRIGHTNESS
134
    if( fType[i]==SMOOTH_BRIGHTNESS ) brightness(     pointDegree ,j,pixel); else
134
    if( fName[i]==SMOOTH_BRIGHTNESS ) brightness(     pointDegree ,j,pixel); else
135 135
#endif
136 136
#ifdef CONTRAST
137
    if( fType[i]==CONTRAST          ) contrast  (sign(pointDegree),j,pixel); else
137
    if( fName[i]==CONTRAST          ) contrast  (sign(pointDegree),j,pixel); else
138 138
#endif
139 139
#ifdef SMOOTH_CONTRAST
140
    if( fType[i]==SMOOTH_CONTRAST   ) contrast  (     pointDegree ,j,pixel); else
140
    if( fName[i]==SMOOTH_CONTRAST   ) contrast  (     pointDegree ,j,pixel); else
141 141
#endif
142 142
#ifdef SATURATION
143
    if( fType[i]==SATURATION        ) saturation(sign(pointDegree),j,pixel); else
143
    if( fName[i]==SATURATION        ) saturation(sign(pointDegree),j,pixel); else
144 144
#endif
145 145
#ifdef SMOOTH_SATURATION
146
    if( fType[i]==SMOOTH_SATURATION ) saturation(     pointDegree ,j,pixel); else
146
    if( fName[i]==SMOOTH_SATURATION ) saturation(     pointDegree ,j,pixel); else
147 147
#endif
148 148
    {}
149 149

  

Also available in: Unified diff