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/TwistyTrajber.java
23 23
import org.distorted.library.type.Static4D;
24 24
import org.distorted.objectlib.helpers.ObjectFaceShape;
25 25
import org.distorted.objectlib.helpers.ObjectShape;
26
import org.distorted.objectlib.helpers.ObjectSignature;
26 27
import org.distorted.objectlib.scrambling.ScrambleState;
27 28
import org.distorted.objectlib.main.ObjectType;
28 29
import org.distorted.objectlib.main.ShapeOctahedron;
......
611 612

  
612 613
///////////////////////////////////////////////////////////////////////////////////////////////////
613 614

  
614
  public long getSignature()
615
  public ObjectSignature getSignature()
615 616
    {
616 617
    int[] numLayers = getNumLayers();
617
    return numLayers[0]==3 ? ObjectType.TRAJ_3.ordinal() : ObjectType.TRAJ_4.ordinal();
618

  
619
    switch(numLayers[0])
620
      {
621
      case 3: return new ObjectSignature(ObjectType.TRAJ_3);
622
      case 4: return new ObjectSignature(ObjectType.TRAJ_4);
623
      }
624

  
625
    return null;
618 626
    }
619 627

  
620 628
///////////////////////////////////////////////////////////////////////////////////////////////////
......
622 630
  public String getObjectName()
623 631
    {
624 632
    int[] numLayers = getNumLayers();
625
    return numLayers[0]==3 ? "Trajber's Octahedron" : "Trajber 4x4";
633

  
634
    switch(numLayers[0])
635
      {
636
      case 3: return "Trajber's Octahedron";
637
      case 4: return "Trajber 4x4";
638
      }
639

  
640
    return null;
626 641
    }
627 642

  
628 643
///////////////////////////////////////////////////////////////////////////////////////////////////
......
630 645
  public String getInventor()
631 646
    {
632 647
    int[] numLayers = getNumLayers();
633
    return numLayers[0]==3 ? "Josef Trajber" : "Jürgen Brandt";
648

  
649
    switch(numLayers[0])
650
      {
651
      case 3: return "Josef Trajber";
652
      case 4: return "Jürgen Brandt";
653
      }
654

  
655
    return null;
634 656
    }
635 657

  
636 658
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff