Project

General

Profile

« Previous | Next » 

Revision 7dab2aea

Added by Leszek Koltunski over 2 years ago

Progress with cuboids.

View differences:

src/main/java/org/distorted/objectlib/main/ObjectType.java
72 72
  CU_122 ( new int[] {1,2,2}      , 20, R.drawable.s_cube_3, R.drawable.m_cube_3, R.drawable.b_cube_3, R.drawable.h_cube_3),
73 73
  CU_321 ( new int[] {3,2,1}      , 20, R.drawable.s_cube_3, R.drawable.m_cube_3, R.drawable.b_cube_3, R.drawable.h_cube_3),
74 74
  CU_111 ( new int[] {1,1,1}      , 20, R.drawable.s_cube_3, R.drawable.m_cube_3, R.drawable.b_cube_3, R.drawable.h_cube_3),
75
  CU_141 ( new int[] {1,4,1}      , 20, R.drawable.s_cube_3, R.drawable.m_cube_3, R.drawable.b_cube_3, R.drawable.h_cube_3),
76

  
75 77
  ;
76 78

  
77 79
  public static final int NUM_OBJECTS = values().length;
......
172 174

  
173 175
    switch(ord)
174 176
      {
177
      case 32:
178
      case 33:
179
      case 34:
180
      case 35:
181
      case 36:
182
      case 37:
183

  
175 184
      case  0:
176 185
      case  1:
177 186
      case  2:
......
204 213
      case 29: return new TwistySquare2       (numL, quat, move, texture, mesh, effects, res, scrWidth);
205 214
      case 30:
206 215
      case 31: return new TwistyMirror        (numL, quat, move, texture, mesh, effects, res, scrWidth);
207

  
208
      case 32:
209
      case 33:
210
      case 34:
211
      case 35:
212
      case 36: return new TwistyCube          (numL, quat, move, texture, mesh, effects, res, scrWidth);
213 216
      }
214 217

  
215 218
    return null;
src/main/java/org/distorted/objectlib/objects/TwistyCube.java
128 128
    }
129 129

  
130 130
///////////////////////////////////////////////////////////////////////////////////////////////////
131
// TODO
132 131

  
133 132
  protected int getResource(int[] numLayers)
134 133
    {
135
    switch(numLayers[0])
134
    int x = numLayers[0];
135
    int y = numLayers[1];
136
    int z = numLayers[2];
137

  
138
    if( x==y && x==z )
136 139
      {
137
      case 2: return R.raw.cube2;
138
      case 3: return R.raw.cube3;
139
      case 4: return R.raw.cube4;
140
      case 5: return R.raw.cube5;
140
      switch(x)
141
        {
142
        case 2: return R.raw.cube2;
143
        case 3: return R.raw.cube3;
144
        case 4: return R.raw.cube4;
145
        case 5: return R.raw.cube5;
146
        }
141 147
      }
142 148

  
143 149
    return 0;

Also available in: Unified diff