Project

General

Profile

« Previous | Next » 

Revision 1d581993

Added by Leszek Koltunski about 2 years ago

Introduce ObjectSignature that can incorporate 192-bit signatures (for 5x5x5 bandaged cubes).
ObjectScrambler does not fully work yet.

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyCuboid.java
28 28
import org.distorted.library.type.Static4D;
29 29

  
30 30
import org.distorted.objectlib.helpers.ObjectFaceShape;
31
import org.distorted.objectlib.helpers.ObjectSignature;
31 32
import org.distorted.objectlib.touchcontrol.TouchControlCuboids;
32 33
import org.distorted.objectlib.main.ObjectType;
33 34
import org.distorted.objectlib.helpers.ObjectShape;
......
679 680

  
680 681
///////////////////////////////////////////////////////////////////////////////////////////////////
681 682

  
682
  public long getSignature()
683
  public ObjectSignature getSignature()
683 684
    {
684 685
    int[] numLayers = getNumLayers();
685 686

  
......
690 691
      {
691 692
      case 2: switch(y)
692 693
                {
693
                case 2: return ObjectType.CUBE_2.ordinal();
694
                case 3: return ObjectType.CU_232.ordinal();
694
                case 2: return new ObjectSignature(ObjectType.CUBE_2);
695
                case 3: return new ObjectSignature(ObjectType.CU_232);
695 696
                }
696 697
      case 3: switch(y)
697 698
                {
698
                case 2: return ObjectType.CU_323.ordinal();
699
                case 3: return ObjectType.CUBE_3.ordinal();
700
                case 4: return ObjectType.CU_343.ordinal();
699
                case 2: return new ObjectSignature(ObjectType.CU_323);
700
                case 3: return new ObjectSignature(ObjectType.CUBE_3);
701
                case 4: return new ObjectSignature(ObjectType.CU_343);
701 702
                }
702
      case 4: return ObjectType.CUBE_4.ordinal();
703
      case 5: return ObjectType.CUBE_5.ordinal();
704
      case 6: return ObjectType.CUBE_6.ordinal();
705
      case 7: return ObjectType.CUBE_7.ordinal();
703
      case 4: return new ObjectSignature(ObjectType.CUBE_4);
704
      case 5: return new ObjectSignature(ObjectType.CUBE_5);
705
      case 6: return new ObjectSignature(ObjectType.CUBE_6);
706
      case 7: return new ObjectSignature(ObjectType.CUBE_7);
706 707
      }
707 708

  
708
    return ObjectType.CUBE_3.ordinal();
709
    return null;
709 710
    }
710 711

  
711 712
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff