Project

General

Profile

« Previous | Next » 

Revision 35476762

Added by Leszek Koltunski about 4 years ago

Convert RubikCube to the new V&F center schema!

View differences:

src/main/java/org/distorted/library/effectqueue/EffectQueueMatrix.java
143 143

  
144 144
///////////////////////////////////////////////////////////////////////////////////////////////////
145 145

  
146
  void send(int width, int height, float distance, float mipmap, float[] projection, float halfX, float halfY, float halfZ, int variant)
146
  void send(float distance, float mipmap, float[] projection, float halfX, float halfY, float halfZ, int variant)
147 147
    {
148 148
    Matrix.setIdentityM(mViewMatrix, 0);
149
    //Matrix.translateM(mViewMatrix, 0, -width*0.5f, -height*0.5f, -distance);
150

  
151 149
    Matrix.translateM(mViewMatrix, 0, 0,0, -distance);
152 150

  
153 151
    if( mipmap!=1 ) Matrix.scaleM(mViewMatrix, 0, mipmap, mipmap, mipmap);
154 152

  
155 153
    for(int i=mNumEffects-1; i>=0; i--) ((MatrixEffect)mEffects[i]).apply(mViewMatrix,mUniforms,i);
156

  
157
  //  Matrix.translateM(mViewMatrix, 0, halfX,halfY,halfZ);
158 154
    Matrix.multiplyMM(mMVPMatrix, 0, projection, 0, mViewMatrix, 0);
159 155

  
160 156
    GLES31.glUniform3f( mObjDH[variant] , halfX, halfY, halfZ);

Also available in: Unified diff