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/TwistyMirror.java
382 382

  
383 383
///////////////////////////////////////////////////////////////////////////////////////////////////
384 384

  
385
  protected ObjectSticker retSticker(int face)
385
  public ObjectSticker retSticker(int sticker)
386 386
    {
387 387
    if( mStickers==null )
388 388
      {
......
409 409
        }
410 410
      }
411 411

  
412
    return mStickers[face/NUM_FACE_COLORS];
412
    return mStickers[sticker];
413 413
    }
414 414

  
415 415
///////////////////////////////////////////////////////////////////////////////////////////////////
416 416

  
417
  protected int getNumStickerTypes(int[] numLayers)
417
  protected int getStickerIndex(int face)
418
    {
419
    return face/NUM_FACE_COLORS;
420
    }
421

  
422
///////////////////////////////////////////////////////////////////////////////////////////////////
423

  
424
  public int getNumStickerTypes(int[] numLayers)
418 425
    {
419 426
    return numLayers[0]==2 ? SEQ2.length : SEQ3.length;
420 427
    }
......
542 549

  
543 550
///////////////////////////////////////////////////////////////////////////////////////////////////
544 551

  
545
  protected Static4D[] getQuats()
552
  public Static4D[] getQuats()
546 553
    {
547 554
    if( mQuats ==null ) initializeQuats();
548 555
    return mQuats;

Also available in: Unified diff