Project

General

Profile

« Previous | Next » 

Revision 420836fc

Added by Leszek Koltunski about 7 years ago

Some corrections so that most apps still work on the Android emulator (OpenGL ES 2.0-based)

View differences:

src/main/java/org/distorted/library/DistortedEffects.java
259 259 
    surface.setAsOutput(currTime);
260 260 
    GLES30.glUniform1i(mMainTextureH, 0);
261 261 

  		




  262
  
  
    
    GLES30.glBindBuffer(GLES30.GL_ARRAY_BUFFER, mesh.mAttVBO[0]);


  		




  263
  
  
    
    GLES30.glVertexAttribPointer(mMainProgram.mAttribute[0], MeshObject.POS_DATA_SIZE, GLES30.GL_FLOAT, false, MeshObject.VERTSIZE, MeshObject.OFFSET0);


  		




  264
  
  
    
    GLES30.glVertexAttribPointer(mMainProgram.mAttribute[1], MeshObject.NOR_DATA_SIZE, GLES30.GL_FLOAT, false, MeshObject.VERTSIZE, MeshObject.OFFSET1);


  		




  265
  
  
    
    GLES30.glVertexAttribPointer(mMainProgram.mAttribute[2], MeshObject.TEX_DATA_SIZE, GLES30.GL_FLOAT, false, MeshObject.VERTSIZE, MeshObject.OFFSET2);


  		




  266
  
  
    
    GLES30.glBindBuffer(GLES30.GL_ARRAY_BUFFER, 0 );


  		




  
  262
  
    
    if( Distorted.GLSL >= 300 )


  		




  
  263
  
    
      {


  		




  
  264
  
    
      GLES30.glBindBuffer(GLES30.GL_ARRAY_BUFFER, mesh.mAttVBO[0]);


  		




  
  265
  
    
      GLES30.glVertexAttribPointer(mMainProgram.mAttribute[0], MeshObject.POS_DATA_SIZE, GLES30.GL_FLOAT, false, MeshObject.VERTSIZE, MeshObject.OFFSET0);


  		




  
  266
  
    
      GLES30.glVertexAttribPointer(mMainProgram.mAttribute[1], MeshObject.NOR_DATA_SIZE, GLES30.GL_FLOAT, false, MeshObject.VERTSIZE, MeshObject.OFFSET1);


  		




  
  267
  
    
      GLES30.glVertexAttribPointer(mMainProgram.mAttribute[2], MeshObject.TEX_DATA_SIZE, GLES30.GL_FLOAT, false, MeshObject.VERTSIZE, MeshObject.OFFSET2);


  		




  
  268
  
    
      GLES30.glBindBuffer(GLES30.GL_ARRAY_BUFFER, 0);


  		




  
  269
  
    
      }


  		




  
  270
  
    
    else


  		




  
  271
  
    
      {


  		




  
  272
  
    
      mesh.mVertAttribs.position(0);


  		




  
  273
  
    
      GLES30.glVertexAttribPointer(mMainProgram.mAttribute[0], MeshObject.POS_DATA_SIZE, GLES30.GL_FLOAT, false, MeshObject.VERTSIZE, mesh.mVertAttribs);


  		




  
  274
  
    
      mesh.mVertAttribs.position(MeshObject.POS_DATA_SIZE);


  		




  
  275
  
    
      GLES30.glVertexAttribPointer(mMainProgram.mAttribute[1], MeshObject.NOR_DATA_SIZE, GLES30.GL_FLOAT, false, MeshObject.VERTSIZE, mesh.mVertAttribs);


  		




  
  276
  
    
      mesh.mVertAttribs.position(MeshObject.POS_DATA_SIZE+MeshObject.NOR_DATA_SIZE);


  		




  
  277
  
    
      GLES30.glVertexAttribPointer(mMainProgram.mAttribute[2], MeshObject.TEX_DATA_SIZE, GLES30.GL_FLOAT, false, MeshObject.VERTSIZE, mesh.mVertAttribs);


  		




  
  278
  
    
      }


  		




  267
  279
  
    

  		




  268
  280
  
    
    mM.send(surface,halfW,halfH,halfZ);


  		




  269
  281
  
    
    mV.send(halfW,halfH,halfZ);


  		












Also available in:  Unified diff