Project

General

Profile

« Previous | Next » 

Revision 277eddbb

Added by Leszek Koltunski almost 4 years ago

Remove the MeshBase.{set/get}Stretch API altogether.

View differences:

src/main/java/org/distorted/library/effectqueue/EffectQueueMatrix.java
37 37
  private static float[] mMVPMatrix       = new float[16];
38 38
  private static float[] mModelViewMatrix = new float[16];
39 39

  
40
  private static int[] mStretchH   = new int[MAIN_VARIANTS];
41 40
  private static int[] mMVPMatrixH = new int[MAIN_VARIANTS];
42 41
  private static int[] mMVMatrixH  = new int[MAIN_VARIANTS];
43 42

  
......
52 51

  
53 52
  static void uniforms(int mProgramH, int variant)
54 53
    {
55
    mStretchH[variant]  = GLES30.glGetUniformLocation(mProgramH, "u_Stretch");
56 54
    mMVPMatrixH[variant]= GLES30.glGetUniformLocation(mProgramH, "u_MVPMatrix");
57 55
    mMVMatrixH[variant] = GLES30.glGetUniformLocation(mProgramH, "u_MVMatrix");
58 56
    }
......
101 99
    // combined Model-View-Projection matrix
102 100
    Matrix.multiplyMM(mMVPMatrix, 0, projection, 0, mModelViewMatrix, 0);
103 101

  
104
    GLES30.glUniform3f( mStretchH[variant]  , mesh.getStretchX() , mesh.getStretchY() , mesh.getStretchZ() );
105 102
    GLES30.glUniformMatrix4fv(mMVMatrixH[variant] , 1, false, mModelViewMatrix, 0);
106 103
    GLES30.glUniformMatrix4fv(mMVPMatrixH[variant], 1, false, mMVPMatrix      , 0);
107 104
    }

Also available in: Unified diff