Project

General

Profile

« Previous | Next » 

Revision e8d8c12a

Added by Leszek Koltunski over 1 year ago

Don't do slow scramblng if numScrambles>=50 - do a fast scramble instead.

View differences:

src/main/java/org/distorted/objectlib/main/ObjectPreRender.java
32 32

  
33 33
public class ObjectPreRender implements EffectListener
34 34
  {
35
  private static final int MAX_SLOW_SCRAMBLE = 50;
36

  
35 37
  private final ObjectControl mController;
36 38
  private InputStream mJsonStream, mMeshStream;
37 39
  private int mOrdinal;
......
273 275
    mScrambleObject = false;
274 276
    mIsSolved       = false;
275 277
    blockEverything(BlockController.PLACE_3);
276
    int duration = BaseEffect.Type.SCRAMBLE.getDuration();
277
    doEffectNow( BaseEffect.Type.SCRAMBLE, duration );
278

  
279
    if( mScrambleObjectNum<MAX_SLOW_SCRAMBLE )
280
      {
281
      int duration = BaseEffect.Type.SCRAMBLE.getDuration();
282
      doEffectNow( BaseEffect.Type.SCRAMBLE, duration );
283
      }
284
    else
285
      {
286
      int duration = BaseEffect.Type.FAST_SCRAMBLE.getDuration();
287
      doEffectNow( BaseEffect.Type.FAST_SCRAMBLE, duration );
288
      }
278 289
    }
279 290

  
280 291
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff