Project

General

Profile

« Previous | Next » 

Revision da681e7e

Added by Leszek Koltunski over 5 years ago

Some simplifications in Meshes. Hide stuff inside MeshBase.

View differences:

src/main/java/org/distorted/library/main/DistortedEffects.java
426 426
  private void displayNormals(MeshBase mesh)
427 427
    {
428 428
    int num = mesh.getNumVertices();
429
    int tfo = mesh.getTFO();
429 430

  
430
    GLES31.glBindBufferBase(GLES31.GL_TRANSFORM_FEEDBACK_BUFFER, 0, mesh.getTFO() );
431
    GLES31.glBindBufferBase(GLES31.GL_TRANSFORM_FEEDBACK_BUFFER, 0, tfo );
431 432
    GLES31.glBeginTransformFeedback( GLES31.GL_POINTS);
432 433
    DistortedRenderState.switchOffDrawing();
433 434
    GLES31.glDrawArrays( GLES31.GL_POINTS, 0, num );
......
437 438

  
438 439
    mNormalProgram.useProgram();
439 440
    GLES31.glUniformMatrix4fv(mNormalMVPMatrixH, 1, false, mM.getMVP() , 0);
440
    GLES31.glBindBuffer(GLES31.GL_ARRAY_BUFFER, mesh.getTFO() );
441
    GLES31.glVertexAttribPointer(mNormalProgram.mAttribute[0], MeshBase.POS_DATA_SIZE, GLES31.GL_FLOAT, false, 0, 0);
442
    GLES31.glBindBuffer(GLES31.GL_ARRAY_BUFFER, 0);
441
    mesh.bindTransformAttribs(mNormalProgram);
443 442
    GLES31.glLineWidth(8.0f);
444 443
    GLES31.glDrawArrays(GLES31.GL_LINES, 0, 2*num);
445 444
    }
......
470 469
    GLES31.glUniform2ui(mMainOITSizeH, surface.mWidth, surface.mHeight);
471 470
    GLES31.glUniform1ui(mMainOITNumRecordsH, (int)(mBufferSize*surface.mWidth*surface.mHeight) );
472 471

  
473
    GLES31.glBindBuffer(GLES31.GL_ARRAY_BUFFER, mesh.getVBO() );
474
    GLES31.glVertexAttribPointer(mMainOITProgram.mAttribute[0], MeshBase.POS_DATA_SIZE, GLES31.GL_FLOAT, false, MeshBase.VERTSIZE, MeshBase.OFFSET0);
475
    GLES31.glVertexAttribPointer(mMainOITProgram.mAttribute[1], MeshBase.NOR_DATA_SIZE, GLES31.GL_FLOAT, false, MeshBase.VERTSIZE, MeshBase.OFFSET1);
476
    GLES31.glVertexAttribPointer(mMainOITProgram.mAttribute[2], MeshBase.TEX_DATA_SIZE, GLES31.GL_FLOAT, false, MeshBase.VERTSIZE, MeshBase.OFFSET2);
477
    GLES31.glBindBuffer(GLES31.GL_ARRAY_BUFFER, 0);
472
    mesh.bindVertexAttribs(mMainOITProgram);
478 473

  
479 474
    mM.send(surface,halfW,halfH,halfZ,0,1);
480 475
    mV.send(1);
......
508 503
    mMainProgram.useProgram();
509 504
    GLES31.glUniform1i(mMainTextureH, 0);
510 505

  
511
    GLES31.glBindBuffer(GLES31.GL_ARRAY_BUFFER, mesh.getVBO() );
512
    GLES31.glVertexAttribPointer(mMainProgram.mAttribute[0], MeshBase.POS_DATA_SIZE, GLES31.GL_FLOAT, false, MeshBase.VERTSIZE, MeshBase.OFFSET0);
513
    GLES31.glVertexAttribPointer(mMainProgram.mAttribute[1], MeshBase.NOR_DATA_SIZE, GLES31.GL_FLOAT, false, MeshBase.VERTSIZE, MeshBase.OFFSET1);
514
    GLES31.glVertexAttribPointer(mMainProgram.mAttribute[2], MeshBase.TEX_DATA_SIZE, GLES31.GL_FLOAT, false, MeshBase.VERTSIZE, MeshBase.OFFSET2);
515
    GLES31.glBindBuffer(GLES31.GL_ARRAY_BUFFER, 0);
506
    mesh.bindVertexAttribs(mMainProgram);
516 507

  
517 508
    mM.send(surface,halfW,halfH,halfZ,0,0);
518 509
    mV.send(0);

Also available in: Unified diff