Project

General

Profile

« Previous | Next » 

Revision 6e3fcb91

Added by Leszek Koltunski over 2 years ago

Remove 3 out of 4 object icons.

View differences:

src/main/java/org/distorted/objects/RubikObject.java
30 30

  
31 31
public class RubikObject
32 32
{
33
  private static final int NUM = 4;
34

  
35 33
  private final String mName;
36 34
  private final int mNumScramble;
37 35
  private final int mOrdinal;
38 36
  private final int mJsonID, mMeshID;
39
  private final int[] mIconID;
37
  private final int mIconID;
40 38
  private final String[][] mPatterns;
41 39

  
42 40
  private int mMeshState;
......
45 43

  
46 44
  RubikObject(ObjectType type)
47 45
    {
48
    mIconID = new int[NUM];
49
    for(int i=0; i<NUM; i++) mIconID[i] = type.getIconID(i);
50

  
46
    mIconID      = type.getIconID();
51 47
    mName        = type.name();
52 48
    mNumScramble = type.getNumScramble();
53 49
    mOrdinal     = type.ordinal();
......
84 80

  
85 81
///////////////////////////////////////////////////////////////////////////////////////////////////
86 82

  
87
  public int getIconID(int size)
83
  public int getIconID()
88 84
    {
89
    return size>=0 && size<NUM ? mIconID[size] : 0;
85
    return mIconID;
90 86
    }
91 87

  
92 88
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff