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/TwistyMirror.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.main.ObjectType;
32 33
import org.distorted.objectlib.helpers.ObjectShape;
33 34
import org.distorted.objectlib.scrambling.ScrambleState;
......
397 398

  
398 399
///////////////////////////////////////////////////////////////////////////////////////////////////
399 400

  
400
  public long getSignature()
401
  public ObjectSignature getSignature()
401 402
    {
402 403
    switch(getNumLayers()[0])
403 404
      {
404
      case 2: return ObjectType.MIRR_2.ordinal();
405
      case 3: return ObjectType.MIRR_3.ordinal();
406
      case 4: return ObjectType.MIRR_4.ordinal();
405
      case 2: return new ObjectSignature(ObjectType.MIRR_2);
406
      case 3: return new ObjectSignature(ObjectType.MIRR_3);
407
      case 4: return new ObjectSignature(ObjectType.MIRR_4);
407 408
      }
408 409

  
409
    return ObjectType.MIRR_2.ordinal();
410
    return null;
410 411
    }
411 412

  
412 413
///////////////////////////////////////////////////////////////////////////////////////////////////
......
419 420
      case 3: return "Mirror Cube";
420 421
      case 4: return "Master Mirror Blocks";
421 422
      }
422
    return "Pocket Mirror";
423
    return null;
423 424
    }
424 425

  
425 426
///////////////////////////////////////////////////////////////////////////////////////////////////
......
432 433
      case 3: return "Hidetoshi Takeji";
433 434
      case 4: return "Traiphum Prungtaengkit";
434 435
      }
435
    return "Hidetoshi Takeji";
436
    return null;
436 437
    }
437 438

  
438 439
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff