Project

General

Profile

« Previous | Next » 

Revision 9e999930

Added by Leszek Koltunski almost 6 years ago

Start merging master and OIT.

View differences:

src/main/java/org/distorted/library/main/DistortedEffects.java
128 128 
    final InputStream blitVertStream = resources.openRawResource(R.raw.blit_vertex_shader);
129 129 
    final InputStream blitFragStream = resources.openRawResource(R.raw.blit_fragment_shader);
130 130 

  		




  131
  
  
    
    String blitVertHeader= (Distorted.GLSL_VERSION + "#define NUM_VERTEX 0\n"  );


  		




  132
  
  
    
    String blitFragHeader= (Distorted.GLSL_VERSION + "#define NUM_FRAGMENT 0\n");


  		




  133
  
  
    

  		




  134
  131
  
    
    try


  		




  135
  132
  
    
      {


  		




  136
  
  
    
      mBlitProgram = new DistortedProgram(blitVertStream,blitFragStream,blitVertHeader,blitFragHeader, Distorted.GLSL);


  		




  
  133
  
    
      mBlitProgram = new DistortedProgram(blitVertStream,blitFragStream,Distorted.GLSL_VERSION,Distorted.GLSL_VERSION, Distorted.GLSL);


  		




  137
  134
  
    
      }


  		




  138
  135
  
    
    catch(Exception e)


  		




  139
  136
  
    
      {


  		




  ......




  151
  148
  
    

  		




  152
  149
  
    
    try


  		




  153
  150
  
    
      {


  		




  154
  
  
    
      mBlitDepthProgram = new DistortedProgram(blitDepthVertStream,blitDepthFragStream,blitVertHeader,blitFragHeader, Distorted.GLSL);


  		




  
  151
  
    
      mBlitDepthProgram = new DistortedProgram(blitDepthVertStream,blitDepthFragStream,Distorted.GLSL_VERSION,Distorted.GLSL_VERSION, Distorted.GLSL);


  		




  155
  152
  
    
      }


  		




  156
  153
  
    
    catch(Exception e)


  		




  157
  154
  
    
      {


  		












Also available in:  Unified diff