Project

General

Profile

« Previous | Next » 

Revision 4e1dc313

Added by Leszek Koltunski over 2 years ago

move the resourceIDs from ObjectList to individual object classes.

View differences:

src/main/java/org/distorted/objectlib/main/ObjectList.java
92 92 

  		




  93
  93
  
    
  CUBE (


  		




  94
  94
  
    
         new int[][] {


  		




  95
  
  
    
                       {2 , 12, 12, R.raw.cube2, R.drawable.ui_small_cube2, R.drawable.ui_medium_cube2, R.drawable.ui_big_cube2, R.drawable.ui_huge_cube2} ,


  		




  96
  
  
    
                       {3 , 16, 17, R.raw.cube3, R.drawable.ui_small_cube3, R.drawable.ui_medium_cube3, R.drawable.ui_big_cube3, R.drawable.ui_huge_cube3} ,


  		




  97
  
  
    
                       {4 , 20, 24, R.raw.cube4, R.drawable.ui_small_cube4, R.drawable.ui_medium_cube4, R.drawable.ui_big_cube4, R.drawable.ui_huge_cube4} ,


  		




  98
  
  
    
                       {5 , 24, 28, R.raw.cube5, R.drawable.ui_small_cube5, R.drawable.ui_medium_cube5, R.drawable.ui_big_cube5, R.drawable.ui_huge_cube5}


  		




  
  95
  
    
                       {2 , 12, 12, R.drawable.ui_small_cube2, R.drawable.ui_medium_cube2, R.drawable.ui_big_cube2, R.drawable.ui_huge_cube2} ,


  		




  
  96
  
    
                       {3 , 16, 17, R.drawable.ui_small_cube3, R.drawable.ui_medium_cube3, R.drawable.ui_big_cube3, R.drawable.ui_huge_cube3} ,


  		




  
  97
  
    
                       {4 , 20, 24, R.drawable.ui_small_cube4, R.drawable.ui_medium_cube4, R.drawable.ui_big_cube4, R.drawable.ui_huge_cube4} ,


  		




  
  98
  
    
                       {5 , 24, 28, R.drawable.ui_small_cube5, R.drawable.ui_medium_cube5, R.drawable.ui_big_cube5, R.drawable.ui_huge_cube5}


  		




  99
  99
  
    
                     },


  		




  100
  100
  
    
         0


  		




  101
  101
  
    
       ),


  		




  102
  102
  
    

  		




  103
  103
  
    
  JING (


  		




  104
  104
  
    
         new int[][] {


  		




  105
  
  
    
                       {2 , 11, 11, R.raw.jing, R.drawable.ui_small_jing2, R.drawable.ui_medium_jing2, R.drawable.ui_big_jing2, R.drawable.ui_huge_jing2} ,


  		




  
  105
  
    
                       {2 , 11, 11, R.drawable.ui_small_jing2, R.drawable.ui_medium_jing2, R.drawable.ui_big_jing2, R.drawable.ui_huge_jing2} ,


  		




  106
  106
  
    
                     },


  		




  107
  107
  
    
         1


  		




  108
  108
  
    
       ),


  		




  109
  109
  
    

  		




  110
  110
  
    
  PYRA (


  		




  111
  111
  
    
         new int[][] {


  		




  112
  
  
    
                       {3 , 10, 10, R.raw.pyra3, R.drawable.ui_small_pyra3, R.drawable.ui_medium_pyra3, R.drawable.ui_big_pyra3, R.drawable.ui_huge_pyra3} ,


  		




  113
  
  
    
                       {4 , 15, 17, R.raw.pyra4, R.drawable.ui_small_pyra4, R.drawable.ui_medium_pyra4, R.drawable.ui_big_pyra4, R.drawable.ui_huge_pyra4} ,


  		




  114
  
  
    
                       {5 , 20, 23, R.raw.pyra5, R.drawable.ui_small_pyra5, R.drawable.ui_medium_pyra5, R.drawable.ui_big_pyra5, R.drawable.ui_huge_pyra5}


  		




  
  112
  
    
                       {3 , 10, 10, R.drawable.ui_small_pyra3, R.drawable.ui_medium_pyra3, R.drawable.ui_big_pyra3, R.drawable.ui_huge_pyra3} ,


  		




  
  113
  
    
                       {4 , 15, 17, R.drawable.ui_small_pyra4, R.drawable.ui_medium_pyra4, R.drawable.ui_big_pyra4, R.drawable.ui_huge_pyra4} ,


  		




  
  114
  
    
                       {5 , 20, 23, R.drawable.ui_small_pyra5, R.drawable.ui_medium_pyra5, R.drawable.ui_big_pyra5, R.drawable.ui_huge_pyra5}


  		




  115
  115
  
    
                     },


  		




  116
  116
  
    
         1


  		




  117
  117
  
    
       ),


  		




  118
  118
  
    

  		




  119
  119
  
    
  KILO (


  		




  120
  120
  
    
         new int[][] {


  		




  121
  
  
    
                       {3 , 18, 18, R.raw.kilo3, R.drawable.ui_small_kilo3, R.drawable.ui_medium_kilo3, R.drawable.ui_big_kilo3, R.drawable.ui_huge_kilo3} ,


  		




  122
  
  
    
                       {5 , 33, 33, R.raw.kilo5, R.drawable.ui_small_kilo5, R.drawable.ui_medium_kilo5, R.drawable.ui_big_kilo5, R.drawable.ui_huge_kilo5} ,


  		




  
  121
  
    
                       {3 , 18, 18, R.drawable.ui_small_kilo3, R.drawable.ui_medium_kilo3, R.drawable.ui_big_kilo3, R.drawable.ui_huge_kilo3} ,


  		




  
  122
  
    
                       {5 , 33, 33, R.drawable.ui_small_kilo5, R.drawable.ui_medium_kilo5, R.drawable.ui_big_kilo5, R.drawable.ui_huge_kilo5} ,


  		




  123
  123
  
    
                     },


  		




  124
  124
  
    
         2


  		




  125
  125
  
    
       ),


  		




  126
  126
  
    

  		




  127
  127
  
    
  MEGA (


  		




  128
  128
  
    
         new int[][] {


  		




  129
  
  
    
                       {3 , 21, 21, R.raw.mega3, R.drawable.ui_small_mega3, R.drawable.ui_medium_mega3, R.drawable.ui_big_mega3, R.drawable.ui_huge_mega3} ,


  		




  130
  
  
    
                       {5 , 35, 37, R.raw.mega5, R.drawable.ui_small_mega5, R.drawable.ui_medium_mega5, R.drawable.ui_big_mega5, R.drawable.ui_huge_mega5} ,


  		




  
  129
  
    
                       {3 , 21, 21, R.drawable.ui_small_mega3, R.drawable.ui_medium_mega3, R.drawable.ui_big_mega3, R.drawable.ui_huge_mega3} ,


  		




  
  130
  
    
                       {5 , 35, 37, R.drawable.ui_small_mega5, R.drawable.ui_medium_mega5, R.drawable.ui_big_mega5, R.drawable.ui_huge_mega5} ,


  		




  131
  131
  
    
                     },


  		




  132
  132
  
    
         2


  		




  133
  133
  
    
       ),


  		




  134
  134
  
    

  		




  135
  135
  
    
  ULTI (


  		




  136
  136
  
    
         new int[][] {


  		




  137
  
  
    
                       {2 , 18, 18, R.raw.ulti, R.drawable.ui_small_ulti, R.drawable.ui_medium_ulti, R.drawable.ui_big_ulti, R.drawable.ui_huge_ulti} ,


  		




  
  137
  
    
                       {2 , 18, 18, R.drawable.ui_small_ulti, R.drawable.ui_medium_ulti, R.drawable.ui_big_ulti, R.drawable.ui_huge_ulti} ,


  		




  138
  138
  
    
                     },


  		




  139
  139
  
    
         3


  		




  140
  140
  
    
       ),


  		




  141
  141
  
    

  		




  142
  142
  
    
  DIAM (


  		




  143
  143
  
    
         new int[][] {


  		




  144
  
  
    
                       {2 , 10, 12, R.raw.diam2, R.drawable.ui_small_diam2, R.drawable.ui_medium_diam2, R.drawable.ui_big_diam2, R.drawable.ui_huge_diam2} ,


  		




  145
  
  
    
                       {3 , 18, 24, R.raw.diam3, R.drawable.ui_small_diam3, R.drawable.ui_medium_diam3, R.drawable.ui_big_diam3, R.drawable.ui_huge_diam3} ,


  		




  146
  
  
    
                       {4 , 32, 32, R.raw.diam4, R.drawable.ui_small_diam4, R.drawable.ui_medium_diam4, R.drawable.ui_big_diam4, R.drawable.ui_huge_diam4} ,


  		




  
  144
  
    
                       {2 , 10, 12, R.drawable.ui_small_diam2, R.drawable.ui_medium_diam2, R.drawable.ui_big_diam2, R.drawable.ui_huge_diam2} ,


  		




  
  145
  
    
                       {3 , 18, 24, R.drawable.ui_small_diam3, R.drawable.ui_medium_diam3, R.drawable.ui_big_diam3, R.drawable.ui_huge_diam3} ,


  		




  
  146
  
    
                       {4 , 32, 32, R.drawable.ui_small_diam4, R.drawable.ui_medium_diam4, R.drawable.ui_big_diam4, R.drawable.ui_huge_diam4} ,


  		




  147
  147
  
    
                     },


  		




  148
  148
  
    
         3


  		




  149
  149
  
    
       ),


  		




  150
  150
  
    

  		




  151
  151
  
    
  DINO (


  		




  152
  152
  
    
         new int[][] {


  		




  153
  
  
    
                       {3 , 10, 10, R.raw.dino, R.drawable.ui_small_dino, R.drawable.ui_medium_dino, R.drawable.ui_big_dino, R.drawable.ui_huge_dino} ,


  		




  
  153
  
    
                       {3 , 10, 10, R.drawable.ui_small_dino, R.drawable.ui_medium_dino, R.drawable.ui_big_dino, R.drawable.ui_huge_dino} ,


  		




  154
  154
  
    
                     },


  		




  155
  155
  
    
         4


  		




  156
  156
  
    
       ),


  		




  157
  157
  
    

  		




  158
  158
  
    
  DIN4 (


  		




  159
  159
  
    
         new int[][] {


  		




  160
  
  
    
                       {3 , 7, 7, R.raw.dino, R.drawable.ui_small_din4, R.drawable.ui_medium_din4, R.drawable.ui_big_din4, R.drawable.ui_huge_din4} ,


  		




  
  160
  
    
                       {3 , 7, 7, R.drawable.ui_small_din4, R.drawable.ui_medium_din4, R.drawable.ui_big_din4, R.drawable.ui_huge_din4} ,


  		




  161
  161
  
    
                     },


  		




  162
  162
  
    
         4


  		




  163
  163
  
    
       ),


  		




  164
  164
  
    

  		




  165
  165
  
    
  REDI (


  		




  166
  166
  
    
         new int[][] {


  		




  167
  
  
    
                       {3 , 14, 16, R.raw.redi, R.drawable.ui_small_redi, R.drawable.ui_medium_redi, R.drawable.ui_big_redi, R.drawable.ui_huge_redi} ,


  		




  
  167
  
    
                       {3 , 14, 16, R.drawable.ui_small_redi, R.drawable.ui_medium_redi, R.drawable.ui_big_redi, R.drawable.ui_huge_redi} ,


  		




  168
  168
  
    
                     },


  		




  169
  169
  
    
         4


  		




  170
  170
  
    
       ),


  		




  171
  171
  
    

  		




  172
  172
  
    
  HELI (


  		




  173
  173
  
    
         new int[][] {


  		




  174
  
  
    
                       {3 , 18, 20, R.raw.heli, R.drawable.ui_small_heli, R.drawable.ui_medium_heli, R.drawable.ui_big_heli, R.drawable.ui_huge_heli} ,


  		




  
  174
  
    
                       {3 , 18, 20, R.drawable.ui_small_heli, R.drawable.ui_medium_heli, R.drawable.ui_big_heli, R.drawable.ui_huge_heli} ,


  		




  175
  175
  
    
                     },


  		




  176
  176
  
    
         4


  		




  177
  177
  
    
       ),


  		




  178
  178
  
    

  		




  179
  179
  
    
  SKEW (


  		




  180
  180
  
    
         new int[][] {


  		




  181
  
  
    
                       {2 , 11, 11, R.raw.skew2, R.drawable.ui_small_skew2, R.drawable.ui_medium_skew2, R.drawable.ui_big_skew2, R.drawable.ui_huge_skew2} ,


  		




  182
  
  
    
                       {3 , 17, 21, R.raw.skew3, R.drawable.ui_small_skew3, R.drawable.ui_medium_skew3, R.drawable.ui_big_skew3, R.drawable.ui_huge_skew3} ,


  		




  
  181
  
    
                       {2 , 11, 11, R.drawable.ui_small_skew2, R.drawable.ui_medium_skew2, R.drawable.ui_big_skew2, R.drawable.ui_huge_skew2} ,


  		




  
  182
  
    
                       {3 , 17, 21, R.drawable.ui_small_skew3, R.drawable.ui_medium_skew3, R.drawable.ui_big_skew3, R.drawable.ui_huge_skew3} ,


  		




  183
  183
  
    
                     },


  		




  184
  184
  
    
         5


  		




  185
  185
  
    
       ),


  		




  186
  186
  
    

  		




  187
  187
  
    
  IVY  (


  		




  188
  188
  
    
         new int[][] {


  		




  189
  
  
    
                       {2 , 8, 8, R.raw.ivy, R.drawable.ui_small_ivy, R.drawable.ui_medium_ivy, R.drawable.ui_big_ivy, R.drawable.ui_huge_ivy} ,


  		




  
  189
  
    
                       {2 , 8, 8, R.drawable.ui_small_ivy, R.drawable.ui_medium_ivy, R.drawable.ui_big_ivy, R.drawable.ui_huge_ivy} ,


  		




  190
  190
  
    
                     },


  		




  191
  191
  
    
         5


  		




  192
  192
  
    
       ),


  		




  193
  193
  
    

  		




  194
  194
  
    
  REX  (


  		




  195
  195
  
    
         new int[][] {


  		




  196
  
  
    
                       {3 , 16, 19, R.raw.rex, R.drawable.ui_small_rex, R.drawable.ui_medium_rex, R.drawable.ui_big_rex, R.drawable.ui_huge_rex} ,


  		




  
  196
  
    
                       {3 , 16, 19, R.drawable.ui_small_rex, R.drawable.ui_medium_rex, R.drawable.ui_big_rex, R.drawable.ui_huge_rex} ,


  		




  197
  197
  
    
                     },


  		




  198
  198
  
    
         5


  		




  199
  199
  
    
       ),


  		




  200
  200
  
    

  		




  201
  201
  
    
  BAN1 (


  		




  202
  202
  
    
         new int[][] {


  		




  203
  
  
    
                       {3 , 16, 16, R.raw.ban1, R.drawable.ui_small_ban1, R.drawable.ui_medium_ban1, R.drawable.ui_big_ban1, R.drawable.ui_huge_ban1} ,


  		




  
  203
  
    
                       {3 , 16, 16, R.drawable.ui_small_ban1, R.drawable.ui_medium_ban1, R.drawable.ui_big_ban1, R.drawable.ui_huge_ban1} ,


  		




  204
  204
  
    
                     },


  		




  205
  205
  
    
         6


  		




  206
  206
  
    
       ),


  		




  207
  207
  
    

  		




  208
  208
  
    
  BAN2 (


  		




  209
  209
  
    
         new int[][] {


  		




  210
  
  
    
                       {3 , 16, 16, R.raw.ban2, R.drawable.ui_small_ban2, R.drawable.ui_medium_ban2, R.drawable.ui_big_ban2, R.drawable.ui_huge_ban2} ,


  		




  
  210
  
    
                       {3 , 16, 16, R.drawable.ui_small_ban2, R.drawable.ui_medium_ban2, R.drawable.ui_big_ban2, R.drawable.ui_huge_ban2} ,


  		




  211
  211
  
    
                     },


  		




  212
  212
  
    
         6


  		




  213
  213
  
    
       ),


  		




  214
  214
  
    

  		




  215
  215
  
    
  BAN3 (


  		




  216
  216
  
    
         new int[][] {


  		




  217
  
  
    
                       {3 , 16, 16, R.raw.ban3, R.drawable.ui_small_ban3, R.drawable.ui_medium_ban3, R.drawable.ui_big_ban3, R.drawable.ui_huge_ban3} ,


  		




  
  217
  
    
                       {3 , 16, 16, R.drawable.ui_small_ban3, R.drawable.ui_medium_ban3, R.drawable.ui_big_ban3, R.drawable.ui_huge_ban3} ,


  		




  218
  218
  
    
                     },


  		




  219
  219
  
    
         6


  		




  220
  220
  
    
       ),


  		




  221
  221
  
    

  		




  222
  222
  
    
  BAN4 (


  		




  223
  223
  
    
         new int[][] {


  		




  224
  
  
    
                       {3 , 16, 16, R.raw.ban4, R.drawable.ui_small_ban4, R.drawable.ui_medium_ban4, R.drawable.ui_big_ban4, R.drawable.ui_huge_ban4} ,


  		




  
  224
  
    
                       {3 , 16, 16, R.drawable.ui_small_ban4, R.drawable.ui_medium_ban4, R.drawable.ui_big_ban4, R.drawable.ui_huge_ban4} ,


  		




  225
  225
  
    
                     },


  		




  226
  226
  
    
         6


  		




  227
  227
  
    
       ),


  		




  228
  228
  
    

  		




  229
  229
  
    
  SQU1 (


  		




  230
  230
  
    
         new int[][] {


  		




  231
  
  
    
                       {3 , 24, 24, R.raw.squa1, R.drawable.ui_small_squa1, R.drawable.ui_medium_squa1, R.drawable.ui_big_squa1, R.drawable.ui_huge_squa1} ,


  		




  
  231
  
    
                       {3 , 24, 24, R.drawable.ui_small_squa1, R.drawable.ui_medium_squa1, R.drawable.ui_big_squa1, R.drawable.ui_huge_squa1} ,


  		




  232
  232
  
    
                     },


  		




  233
  233
  
    
         7


  		




  234
  234
  
    
       ),


  		




  235
  235
  
    

  		




  236
  236
  
    
  SQU2 (


  		




  237
  237
  
    
         new int[][] {


  		




  238
  
  
    
                       {3 , 24, 24, R.raw.squa2, R.drawable.ui_small_squa2, R.drawable.ui_medium_squa2, R.drawable.ui_big_squa2, R.drawable.ui_huge_squa2} ,


  		




  
  238
  
    
                       {3 , 24, 24, R.drawable.ui_small_squa2, R.drawable.ui_medium_squa2, R.drawable.ui_big_squa2, R.drawable.ui_huge_squa2} ,


  		




  239
  239
  
    
                     },


  		




  240
  240
  
    
         7


  		




  241
  241
  
    
       ),


  		




  242
  242
  
    

  		




  243
  243
  
    
  MIRR (


  		




  244
  244
  
    
         new int[][] {


  		




  245
  
  
    
                       {2 , 12, 12, R.raw.mirr2, R.drawable.ui_small_mirr2, R.drawable.ui_medium_mirr2, R.drawable.ui_big_mirr2, R.drawable.ui_huge_mirr2} ,


  		




  246
  
  
    
                       {3 , 16, 17, R.raw.mirr3, R.drawable.ui_small_mirr3, R.drawable.ui_medium_mirr3, R.drawable.ui_big_mirr3, R.drawable.ui_huge_mirr3} ,


  		




  
  245
  
    
                       {2 , 12, 12, R.drawable.ui_small_mirr2, R.drawable.ui_medium_mirr2, R.drawable.ui_big_mirr2, R.drawable.ui_huge_mirr2} ,


  		




  
  246
  
    
                       {3 , 16, 17, R.drawable.ui_small_mirr3, R.drawable.ui_medium_mirr3, R.drawable.ui_big_mirr3, R.drawable.ui_huge_mirr3} ,


  		




  247
  247
  
    
                     },


  		




  248
  248
  
    
         7


  		




  249
  249
  
    
       ),


  		




  ......




  255
  255
  
    
  public static final int MAX_SCRAMBLE;


  		




  256
  256
  
    
  public static final int MAX_OBJECT_SIZE;


  		




  257
  257
  
    

  		




  258
  
  
    
  private final int[] mObjectSizes, mDBLevels, mNumScrambles, mSmallIconIDs, mMediumIconIDs, mBigIconIDs, mHugeIconIDs, mResourceIDs;


  		




  
  258
  
    
  private final int[] mObjectSizes, mDBLevels, mNumScrambles, mSmallIconIDs, mMediumIconIDs, mBigIconIDs, mHugeIconIDs;


  		




  259
  259
  
    
  private final int mRow, mNumSizes;


  		




  260
  260
  
    

  		




  261
  261
  
    
  private static final ObjectList[] objects;


  		




  ......




  534
  534
  
    
    mObjectSizes  = new int[mNumSizes];


  		




  535
  535
  
    
    mDBLevels     = new int[mNumSizes];


  		




  536
  536
  
    
    mNumScrambles = new int[mNumSizes];


  		




  537
  
  
    
    mResourceIDs  = new int[mNumSizes];


  		




  538
  537
  
    
    mSmallIconIDs = new int[mNumSizes];


  		




  539
  538
  
    
    mMediumIconIDs= new int[mNumSizes];


  		




  540
  539
  
    
    mBigIconIDs   = new int[mNumSizes];


  		




  ......




  545
  544
  
    
      mObjectSizes[i]  = info[i][0];


  		




  546
  545
  
    
      mDBLevels[i]     = info[i][1];


  		




  547
  546
  
    
      mNumScrambles[i] = info[i][2];


  		




  548
  
  
    
      mResourceIDs[i]  = info[i][3];


  		




  549
  
  
    
      mSmallIconIDs[i] = info[i][4];


  		




  550
  
  
    
      mMediumIconIDs[i]= info[i][5];


  		




  551
  
  
    
      mBigIconIDs[i]   = info[i][6];


  		




  552
  
  
    
      mHugeIconIDs[i]  = info[i][7];


  		




  
  547
  
    
      mSmallIconIDs[i] = info[i][3];


  		




  
  548
  
    
      mMediumIconIDs[i]= info[i][4];


  		




  
  549
  
    
      mBigIconIDs[i]   = info[i][5];


  		




  
  550
  
    
      mHugeIconIDs[i]  = info[i][6];


  		




  553
  551
  
    
      }


  		




  554
  552
  
    

  		




  555
  553
  
    
    mRow  = row;


  		




  ......




  577
  575
  
    
    return mSmallIconIDs;


  		




  578
  576
  
    
    }


  		




  579
  577
  
    

  		




  580
  
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  581
  
  
    

  		




  582
  
  
    
  public int[] getResourceIDs()


  		




  583
  
  
    
    {


  		




  584
  
  
    
    return mResourceIDs;


  		




  585
  
  
    
    }


  		




  586
  
  
    

  		




  587
  578
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  588
  579
  
    

  		




  589
  580
  
    
  public TwistyObject create(int size, Static4D quat, int[][] moves, Resources res, int scrWidth)


  		












Also available in:  Unified diff