Project

General

Profile

« Previous | Next » 

Revision 86c352e0

Added by Leszek Koltunski almost 6 years ago

Some progress with not-postprocessed OIT.

View differences:

src/main/java/org/distorted/library/main/DistortedEffects.java
169 169
      }
170 170

  
171 171
    int mainProgramH = mMainProgram.getProgramHandle();
172
    EffectQueueFragment.getUniforms(mainProgramH);
173
    EffectQueueVertex.getUniforms(mainProgramH);
174
    EffectQueueMatrix.getUniforms(mainProgramH);
172
    EffectQueueFragment.getUniforms(mainProgramH,0);
173
    EffectQueueVertex.getUniforms(mainProgramH,0);
174
    EffectQueueMatrix.getUniforms(mainProgramH,0);
175 175
    mMainTextureH= GLES31.glGetUniformLocation( mainProgramH, "u_Texture");
176 176

  
177 177
    // BLIT PROGRAM ////////////////////////////////////
......
254 254
    try
255 255
      {
256 256
      mMainOITProgram = new DistortedProgram(mainVertStream, mainFragStream, mainVertHeader, mainFragHeader,
257
          enabledEffectV, enabledEffectF, Distorted.GLSL, null);
257
                                             enabledEffectV, enabledEffectF, Distorted.GLSL, null);
258 258
      }
259 259
    catch(Exception e)
260 260
      {
......
263 263
      }
264 264

  
265 265
    int mainOITProgramH = mMainOITProgram.getProgramHandle();
266
    EffectQueueFragment.getUniformsOIT(mainOITProgramH);
267
    EffectQueueVertex.getUniformsOIT(mainOITProgramH);
268
    EffectQueueMatrix.getUniformsOIT(mainOITProgramH);
266
    EffectQueueFragment.getUniforms(mainOITProgramH,1);
267
    EffectQueueVertex.getUniforms(mainOITProgramH,1);
268
    EffectQueueMatrix.getUniforms(mainOITProgramH,1);
269 269
    mMainOITTextureH    = GLES31.glGetUniformLocation( mainOITProgramH, "u_Texture");
270 270
    mMainOITSizeH       = GLES31.glGetUniformLocation( mainOITProgramH, "u_Size");
271 271
    mMainOITNumRecordsH = GLES31.glGetUniformLocation( mainOITProgramH, "u_numRecords");
......
480 480
    GLES31.glVertexAttribPointer(mMainOITProgram.mAttribute[2], MeshObject.TEX_DATA_SIZE, GLES31.GL_FLOAT, false, MeshObject.VERTSIZE, MeshObject.OFFSET2);
481 481
    GLES31.glBindBuffer(GLES31.GL_ARRAY_BUFFER, 0);
482 482

  
483
    mM.sendOIT(surface,halfW,halfH,halfZ,marginInPixels);
484
    mV.sendOIT();
485
    mF.sendOIT();
483
    mM.send(surface,halfW,halfH,halfZ,marginInPixels,1);
484
    mV.send(1);
485
    mF.send(1);
486 486

  
487 487
    GLES31.glDrawArrays(GLES31.GL_TRIANGLE_STRIP, 0, mesh.numVertices);
488 488

  
......
511 511
    GLES31.glVertexAttribPointer(mMainProgram.mAttribute[2], MeshObject.TEX_DATA_SIZE, GLES31.GL_FLOAT, false, MeshObject.VERTSIZE, MeshObject.OFFSET2);
512 512
    GLES31.glBindBuffer(GLES31.GL_ARRAY_BUFFER, 0);
513 513

  
514
    mM.send(surface,halfW,halfH,halfZ,marginInPixels);
515
    mV.send();
516
    mF.send();
514
    mM.send(surface,halfW,halfH,halfZ,marginInPixels,0);
515
    mV.send(0);
516
    mF.send(0);
517 517

  
518 518
    GLES31.glDrawArrays(GLES31.GL_TRIANGLE_STRIP, 0, mesh.numVertices);
519 519

  

Also available in: Unified diff