Project

General

Profile

« Previous | Next » 

Revision 962b8ff6

Added by Leszek Koltunski 2 months ago

progress with configurable stickers

View differences:

src/main/java/org/distorted/objectlib/json/JsonReader.java
82 82
  private float mSize;
83 83
  private int mScrambleType, mNumScrambles;
84 84
  private int mPrice;
85
  private int[] mColor;
85
  private int[] mColorTable;
86 86
  private int mInternalColor;
87 87
  private boolean mResetMaps;
88 88
  private String mTutorialObject;
......
848 848
    {
849 849
    mNumFaceColors = object.length()-1;
850 850

  
851
    mColor = new int[mNumFaceColors];
852
    for(int i=0; i<mNumFaceColors; i++) mColor[i] = object.getInt(i);
851
    mColorTable = new int[mNumFaceColors];
852
    for(int i=0; i<mNumFaceColors; i++) mColorTable[i] = object.getInt(i);
853 853

  
854 854
    mInternalColor = object.getInt(mNumFaceColors);
855 855
    }
......
1302 1302
    return mNumFaces;
1303 1303
    }
1304 1304

  
1305
///////////////////////////////////////////////////////////////////////////////////////////////////
1306

  
1307
  public int getNumFaceColors()
1308
    {
1309
    return mNumFaceColors;
1310
    }
1311

  
1312 1305
///////////////////////////////////////////////////////////////////////////////////////////////////
1313 1306

  
1314 1307
  public int[] getNumLayers()
......
1325 1318

  
1326 1319
///////////////////////////////////////////////////////////////////////////////////////////////////
1327 1320

  
1328
  public int getColor(int face)
1321
  public int[] getColorTable()
1329 1322
    {
1330
    return mColor[face];
1323
    return mColorTable;
1331 1324
    }
1332 1325

  
1333 1326
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff