Project

General

Profile

« Previous | Next » 

Revision b9d4aa3b

Added by Leszek Koltunski almost 3 years ago

Lots of changes :)

View differences:

src/main/java/org/distorted/control/RubikControlWhole.java
50 50
  private static final int D2 =  250; // finger press
51 51
  private static final int D3 =10000; // finger triangle
52 52
  private static final int D4 = 3000; // fingers approach
53
  private static final int D5 =10000; // fingers circle
53
  private static final int D5 = 8000; // fingers circle
54 54

  
55 55
  private static final int[] DUR = { D1, D2, D3, D2, D1/4, 3*D1/4, D1/4, D2, D4, D5, D4, D2, D1 };
56 56
  private static final int[] DYN = { 2, 1, 1, 1, 2, 2, 4, 2, 2, 2, 2, 2, 4};
......
826 826
      Bitmap bmpHand = openBitmap(act, R.drawable.ui_hand_pointer);
827 827

  
828 828
      mTextureCirc = new DistortedTexture();
829
      mTextureCirc.setTexture(bmpCirc);
830 829
      mTextureShad = new DistortedTexture();
831
      mTextureShad.setTexture(bmpShad);
832 830
      DistortedTexture textureHand = new DistortedTexture();
833
      textureHand.setTexture(bmpHand);
831

  
832
      if( bmpCirc!=null ) mTextureCirc.setTexture(bmpCirc);
833
      if( bmpShad!=null ) mTextureShad.setTexture(bmpShad);
834
      if( bmpHand!=null ) textureHand.setTexture(bmpHand);
834 835

  
835 836
      mNodes[0]= new DistortedNode(mTextureShad,mEffects[0],mQuad);
836 837
      mNodes[1]= new DistortedNode(mTextureShad,mEffects[1],mQuad);

Also available in: Unified diff