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/TwistyPyraminx.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.TouchControlTetrahedron;
32 33
import org.distorted.objectlib.main.ObjectType;
33 34
import org.distorted.objectlib.helpers.ObjectShape;
......
386 387

  
387 388
///////////////////////////////////////////////////////////////////////////////////////////////////
388 389

  
389
  public long getSignature()
390
  public ObjectSignature getSignature()
390 391
    {
391 392
    switch(getNumLayers()[0])
392 393
      {
393
      case 3: return ObjectType.PYRA_3.ordinal();
394
      case 4: return ObjectType.PYRA_4.ordinal();
395
      case 5: return ObjectType.PYRA_5.ordinal();
394
      case 3: return new ObjectSignature(ObjectType.PYRA_3);
395
      case 4: return new ObjectSignature(ObjectType.PYRA_4);
396
      case 5: return new ObjectSignature(ObjectType.PYRA_5);
396 397
      }
397 398

  
398
    return ObjectType.PYRA_3.ordinal();
399
    return null;
399 400
    }
400 401

  
401 402
///////////////////////////////////////////////////////////////////////////////////////////////////
......
408 409
      case 4: return "Master Pyraminx";
409 410
      case 5: return "Professor's Pyraminx";
410 411
      }
411
    return "Pyraminx";
412
    return null;
412 413
    }
413 414

  
414 415
///////////////////////////////////////////////////////////////////////////////////////////////////
......
421 422
      case 4: return "Katsuhiko Okamoto";
422 423
      case 5: return "Timur Evbatyrov";
423 424
      }
424
    return "Uwe Meffert";
425
    return null;
425 426
    }
426 427

  
427 428
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff