Project

General

Profile

« Previous | Next » 

Revision 7ac0ee88

Added by Leszek Koltunski over 2 years ago

Simplify ObjectList: now there's just one object per size.

View differences:

src/main/java/org/distorted/solvers/SolverMain.java
49 49
// If a certain cubit is locked, return the color (index into it's FACE_COLORS array) it
50 50
// must have. Otherwise return -1.
51 51

  
52
  public static int cubitIsLocked(ObjectList object, int size, int cubit)
52
  public static int cubitIsLocked(ObjectList object, int cubit)
53 53
    {
54
    if( object == ObjectList.CUBE && size == 3)
54
    if( object == ObjectList.CUBE_3 )
55 55
      {
56 56
      if( cubit==21 ) return 0; // center of the right  face
57 57
      if( cubit== 4 ) return 1; // center of the left   face
......
248 248
    {
249 249
    RubikScreenSolver solver = (RubikScreenSolver) ScreenList.SVER.getScreenClass();
250 250

  
251
    if( mObject.getObjectList()==ObjectList.CUBE && mObject.getNumLayers()==3 )
251
    if( mObject.getObjectList()==ObjectList.CUBE_3 )
252 252
      {
253 253
      solveCube3(solver);
254 254
      }

Also available in: Unified diff