Revision 47d838ca
Added by Leszek Koltunski about 7 years ago
src/main/java/org/distorted/library/Distorted.java | ||
---|---|---|
137 | 137 |
final InputStream mainVertexStream = resources.openRawResource(R.raw.main_vertex_shader); |
138 | 138 |
final InputStream mainFragmentStream = resources.openRawResource(R.raw.main_fragment_shader); |
139 | 139 |
|
140 |
DistortedProgram mainProgram = new DistortedProgram(mainVertexStream,mainFragmentStream); |
|
140 |
String mainVertexHeader= ("#version 100\n#define NUM_VERTEX " + DistortedEffects.getMaxVertex()+"\n"); |
|
141 |
|
|
142 |
for(EffectNames name: EffectNames.values() ) |
|
143 |
{ |
|
144 |
if( name.getType()== EffectTypes.VERTEX) |
|
145 |
mainVertexHeader += ("#define "+name.name()+" "+name.ordinal()+"\n"); |
|
146 |
} |
|
147 |
|
|
148 |
String mainFragmentHeader= ("#version 100\n#define NUM_FRAGMENT " + DistortedEffects.getMaxFragment()+"\n"); |
|
149 |
|
|
150 |
for(EffectNames name: EffectNames.values() ) |
|
151 |
{ |
|
152 |
if( name.getType()== EffectTypes.FRAGMENT) |
|
153 |
mainFragmentHeader += ("#define "+name.name()+" "+name.ordinal()+"\n"); |
|
154 |
} |
|
155 |
|
|
156 |
DistortedProgram mainProgram = new DistortedProgram(mainVertexStream,mainFragmentStream, mainVertexHeader, mainFragmentHeader); |
|
141 | 157 |
mainProgramH = mainProgram.getProgramHandle(); |
142 | 158 |
GLES20.glUseProgram(mainProgramH); |
143 | 159 |
mainProgram.bindAndEnableAttributes(); |
... | ... | |
158 | 174 |
final InputStream postVertexStream = resources.openRawResource(R.raw.post_vertex_shader); |
159 | 175 |
final InputStream postFragmentStream = resources.openRawResource(R.raw.post_fragment_shader); |
160 | 176 |
|
161 |
DistortedProgram postProgram = new DistortedProgram(postVertexStream,postFragmentStream); |
|
177 |
String postFragmentHeader= ("#version 100\n#define NUM_POSTPROCESS " + DistortedEffects.getMaxPostprocess()+"\n"); |
|
178 |
|
|
179 |
for(EffectNames name: EffectNames.values() ) |
|
180 |
{ |
|
181 |
if( name.getType()== EffectTypes.POSTPROCESS) |
|
182 |
postFragmentHeader += ("#define "+name.name()+" "+name.ordinal()+"\n"); |
|
183 |
} |
|
184 |
|
|
185 |
DistortedProgram postProgram = new DistortedProgram(postVertexStream,postFragmentStream, "", postFragmentHeader); |
|
162 | 186 |
postProgramH = postProgram.getProgramHandle(); |
163 | 187 |
GLES20.glUseProgram(postProgramH); |
164 | 188 |
postProgram.bindAndEnableAttributes(); |
Also available in: Unified diff
NUM_POSTPROCESS corectly #defined now.