Project

General

Profile

« Previous | Next » 

Revision fc699ab5

Added by Leszek Koltunski 1 day ago

corrections for glowing.

View differences:

src/main/java/org/distorted/phasedsolver/SolverLowerPane.java
109 109
      {
110 110
      mCurrPhase--;
111 111
      mNumMoves = mMoves[mCurrPhase]==null ? 0 : mMoves[mCurrPhase].length;
112
      mCurrMove = 0;
112 113
      int[][] moves = transformMoves(mMoves[mCurrPhase],0,mNumMoves, false);
113 114
      control.applyScrambles(moves);
114 115
      }
......
133 134

  
134 135
    if( mCurrPhase<mNumPhases-1 )
135 136
      {
137
      glowCubits(mCubitsNotInvolved[mCurrPhase]);
136 138
      int[][] moves = transformMoves(mMoves[mCurrPhase],mCurrMove,mNumMoves, true);
137 139
      control.applyScrambles(moves);
138 140
      mCurrPhase++;
139 141
      mNumMoves = mMoves[mCurrPhase]==null ? 0 : mMoves[mCurrPhase].length;
140 142
      mCurrMove = 0;
141
      glowCubits(mCubitsNotInvolved[mCurrPhase-1]);
142 143
      }
143 144
    else if( mCurrMove<mNumMoves )
144 145
      {
146
      glowCubits(mCubitsNotInvolved[mCurrPhase]);
145 147
      int[][] moves = transformMoves(mMoves[mCurrPhase],mCurrMove,mNumMoves, true);
146 148
      control.applyScrambles(moves);
147 149
      mCurrMove = mNumMoves;
148
      glowCubits(mCubitsNotInvolved[mCurrPhase]);
149 150
      }
150 151
    else
151 152
      {
......
353 354
        mCurrPhase--;
354 355
        mNumMoves = mMoves[mCurrPhase]==null ? 0 : mMoves[mCurrPhase].length;
355 356
        mCurrMove = mNumMoves;
357
        glowCubits(mCubitsNotInvolved[mCurrPhase]);
356 358
        }
357 359
      else
358 360
        {
......
362 364
        int[][] moves = transformMoves(mMoves, true);
363 365
        ObjectControl control = act.getControl();
364 366
        control.applyScrambles(moves);
367
        glowCubits(mCubitsNotInvolved[mCurrPhase]);
365 368
        }
366 369

  
367 370
      setText(act);
......
383 386
        ObjectControl control = act.getControl();
384 387
        control.blockTouch(MOVES_PLACE_1);
385 388
        control.addRotation(this, move[0], (1<<move[1]), move[2], MILLIS_PER_DEGREE);
386

  
387
        if( mCurrPhase==mNumPhases-1 && mCurrMove==mNumMoves )
388
          glowCubits(mCubitsNotInvolved[mCurrPhase]);
389
        if( mCurrMove==mNumMoves && mCurrPhase==mNumPhases-1 ) glowCubits(mCubitsNotInvolved[mCurrPhase]);
389 390
        }
390 391
      else if( mCurrPhase<mNumPhases-1 )
391 392
        {
392
        glowCubits(mCubitsNotInvolved[mCurrPhase]);
393 393
        mCurrPhase++;
394 394
        mNumMoves = mMoves[mCurrPhase]==null ? 0 : mMoves[mCurrPhase].length;
395 395
        mCurrMove = 0;
396
        glowCubits(mCubitsNotInvolved[mCurrPhase-1]);
396 397
        }
397 398
      else
398 399
        {

Also available in: Unified diff