Project

General

Profile

« Previous | Next » 

Revision 9f171eba

Added by Leszek Koltunski almost 3 years ago

Preparation for 'smart scrambling' : introduce the total number of scrambles to the 'randomizeNewScramble' function.

View differences:

src/main/java/org/distorted/objects/TwistyRex.java
599 599

  
600 600
///////////////////////////////////////////////////////////////////////////////////////////////////
601 601

  
602
  public void randomizeNewScramble(int[][] scramble, Random rnd, int num)
602
  public void randomizeNewScramble(int[][] scramble, Random rnd, int curr, int total)
603 603
    {
604
    if( num==0 )
604
    if( curr==0 )
605 605
      {
606
      scramble[num][0] = rnd.nextInt(NUM_AXIS);
606
      scramble[curr][0] = rnd.nextInt(NUM_AXIS);
607 607
      }
608 608
    else
609 609
      {
610 610
      int newVector = rnd.nextInt(NUM_AXIS -1);
611
      scramble[num][0] = (newVector>=scramble[num-1][0] ? newVector+1 : newVector);
611
      scramble[curr][0] = (newVector>=scramble[curr-1][0] ? newVector+1 : newVector);
612 612
      }
613 613

  
614
    scramble[num][1] = rnd.nextFloat()<=0.5f ? 0 : 2;
614
    scramble[curr][1] = rnd.nextFloat()<=0.5f ? 0 : 2;
615 615

  
616 616
    switch( rnd.nextInt(2) )
617 617
      {
618
      case 0: scramble[num][2] = -1; break;
619
      case 1: scramble[num][2] =  1; break;
618
      case 0: scramble[curr][2] = -1; break;
619
      case 1: scramble[curr][2] =  1; break;
620 620
      }
621 621
    }
622 622

  

Also available in: Unified diff