Revision 318c0a7d
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/solvers/SolverMain.java | ||
|---|---|---|
| 21 | 21 |
|
| 22 | 22 |
import android.content.res.Resources; |
| 23 | 23 |
|
| 24 |
import org.distorted.objectlib.main.ObjectList;
|
|
| 24 |
import org.distorted.objectlib.main.ObjectType;
|
|
| 25 | 25 |
import org.distorted.objectlib.main.TwistyObject; |
| 26 | 26 |
|
| 27 | 27 |
import org.distorted.main.R; |
| ... | ... | |
| 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 cubit)
|
|
| 52 |
public static int cubitIsLocked(ObjectType object, int cubit)
|
|
| 53 | 53 |
{
|
| 54 |
if( object == ObjectList.CUBE_3 )
|
|
| 54 |
if( object == ObjectType.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_3 )
|
|
| 251 |
if( mObject.getObjectList()== ObjectType.CUBE_3 )
|
|
| 252 | 252 |
{
|
| 253 | 253 |
solveCube3(solver); |
| 254 | 254 |
} |
Also available in: Unified diff
Reename ObjectList to a more logical ObjectType.