Project

General

Profile

« Previous | Next » 

Revision f557ecc4

Added by Leszek Koltunski about 2 years ago

Improvement

View differences:

src/main/java/org/distorted/objectlib/effects/fastscramble/FastScrambleEffect.java
61 61
  private int mPhase;
62 62
  private final Random mRnd;
63 63
  private final Object mLock;
64
  int mNumScrambles;
65
  int[][] mScrambles;
64
  private int mNumScrambles;
65
  private int[][] mScrambles;
66 66

  
67 67
  ObjectPreRender mPre;
68 68
  TwistyObject mObject;
src/main/java/org/distorted/objectlib/main/ObjectPreRender.java
49 49
  private boolean mScramblingAndSolvingBlocked, mRotationBlocked, mIsSolved;
50 50
  private long mRotationFinishedID;
51 51
  private final long[] mEffectID;
52
  private int[][] mNextMoves;
52
  private int[][] mInitMoves, mScraMoves;
53 53
  private int mScrambleObjectNum, mScrambleObjectDuration;
54 54
  private int mAddRotationAxis, mAddRotationRowBitmap, mAddRotationAngle;
55 55
  private long mAddRotationDuration;
......
345 345
  private void initializeObjectNow()
346 346
    {
347 347
    mInitializeObject = false;
348
    mNewObject.initializeObject(mNextMoves);
348
    mNewObject.initializeObject(mInitMoves);
349 349
    }
350 350

  
351 351
///////////////////////////////////////////////////////////////////////////////////////////////////
......
353 353
  private void applyScramblesNow()
354 354
    {
355 355
    mApplyScrambles = false;
356
    mNewObject.applyScrambles(mNextMoves);
356
    mNewObject.applyScrambles(mScraMoves);
357 357
    }
358 358

  
359 359
///////////////////////////////////////////////////////////////////////////////////////////////////
......
651 651
  public void initializeObject(int[][] moves)
652 652
    {
653 653
    mInitializeObject = true;
654
    mNextMoves = moves;
654
    mInitMoves = moves;
655 655
    }
656 656

  
657 657
///////////////////////////////////////////////////////////////////////////////////////////////////
......
659 659
  public void applyScrambles(int[][] moves)
660 660
    {
661 661
    mApplyScrambles = true;
662
    mNextMoves = moves;
662
    mScraMoves = moves;
663 663
    }
664 664

  
665 665
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/objectlib/main/TwistyObject.java
1777 1777

  
1778 1778
  public synchronized void solve()
1779 1779
    {
1780
    for(int i=0; i<mNumCubits; i++)
1781
      {
1782
      mCubits[i].solve();
1783
      }
1780
    for(int i=0; i<mNumCubits; i++) mCubits[i].solve();
1784 1781

  
1785 1782
    recomputeFaceOffsets();
1786 1783

  

Also available in: Unified diff