Project

General

Profile

« Previous | Next » 

Revision 2dffaf22

Added by Leszek Koltunski over 1 year ago

- add the Pyraminx Duo solver to the list
- make the signature of an object independent of its location in the ObjectType enum

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyCuboid.java
21 21 
import org.distorted.objectlib.helpers.ObjectFaceShape;
22 22 
import org.distorted.objectlib.helpers.ObjectSignature;
23 23 
import org.distorted.objectlib.helpers.ObjectVertexEffects;
24 
import org.distorted.objectlib.main.ObjectSignatures;
24 25 
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator;
25 26 
import org.distorted.objectlib.main.InitData;
26 27 
import org.distorted.objectlib.touchcontrol.TouchControlCuboids;
......
620 621 
      {
621 622 
      case 2: switch(y)
622 623 
                {
623 
                case 2: return new ObjectSignature(ObjectType.CUBE_2);
624 
                case 3: return new ObjectSignature(ObjectType.CU_232);
624 
                case 2: return new ObjectSignature(ObjectSignatures.CUBE_2);
625 
                case 3: return new ObjectSignature(ObjectSignatures.CU_232);
625 626 
                }
626 627 
      case 3: switch(y)
627 628 
                {
628 
                case 2: return new ObjectSignature(ObjectType.CU_323);
629 
                case 3: return new ObjectSignature(ObjectType.CUBE_3);
630 
                case 4: return new ObjectSignature(ObjectType.CU_343);
629 
                case 2: return new ObjectSignature(ObjectSignatures.CU_323);
630 
                case 3: return new ObjectSignature(ObjectSignatures.CUBE_3);
631 
                case 4: return new ObjectSignature(ObjectSignatures.CU_343);
631 632 
                }
632 
      case 4: return new ObjectSignature(ObjectType.CUBE_4);
633 
      case 5: return new ObjectSignature(ObjectType.CUBE_5);
634 
      case 6: return new ObjectSignature(ObjectType.CUBE_6);
635 
      case 7: return new ObjectSignature(ObjectType.CUBE_7);
633 
      case 4: return new ObjectSignature(ObjectSignatures.CUBE_4);
634 
      case 5: return new ObjectSignature(ObjectSignatures.CUBE_5);
635 
      case 6: return new ObjectSignature(ObjectSignatures.CUBE_6);
636 
      case 7: return new ObjectSignature(ObjectSignatures.CUBE_7);
636 637 
      }
637 638 

  		




  638
  639
  
    
    return null;


  		












Also available in:  Unified diff