Project

General

Profile

« Previous | Next » 

Revision 1bb09f88

Added by Leszek Koltunski over 2 years ago

Progress with serializing object to JSON: stickers, quats.

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyCuboid.java
494 494

  
495 495
///////////////////////////////////////////////////////////////////////////////////////////////////
496 496

  
497
  protected ObjectSticker retSticker(int face)
497
  public ObjectSticker retSticker(int sticker)
498 498
    {
499 499
    if( mStickers==null )
500 500
      {
......
520 520
      mStickers[0] = new ObjectSticker(STICKERS[0],null,radii,stroke );
521 521
      }
522 522

  
523
    return mStickers[face/NUM_FACE_COLORS];
523
    return mStickers[sticker];
524 524
    }
525 525

  
526 526
///////////////////////////////////////////////////////////////////////////////////////////////////
527 527

  
528
  protected Static4D[] getQuats()
528
  protected int getStickerIndex(int face)
529
    {
530
    return face/NUM_FACE_COLORS;
531
    }
532

  
533
///////////////////////////////////////////////////////////////////////////////////////////////////
534

  
535
  public Static4D[] getQuats()
529 536
    {
530 537
    if( mQuats ==null ) initializeQuats();
531 538
    return mQuats;
......
621 628

  
622 629
///////////////////////////////////////////////////////////////////////////////////////////////////
623 630

  
624
  protected int getNumStickerTypes(int[] numLayers)
631
  public int getNumStickerTypes(int[] numLayers)
625 632
    {
626 633
    return 1;
627 634
    }

Also available in: Unified diff