Revision de697069
Added by Leszek Koltunski 9 months ago
src/main/java/org/distorted/solvers/SolverMain.java | ||
---|---|---|
12 | 12 |
import android.content.res.Resources; |
13 | 13 |
|
14 | 14 |
import org.distorted.objectlib.helpers.OperatingSystemInterface; |
15 |
import org.distorted.objectlib.main.ObjectSignatures;
|
|
15 |
import org.distorted.objectlib.signature.ObjectConstants;
|
|
16 | 16 |
import org.distorted.objectlib.main.TwistyObject; |
17 | 17 |
|
18 | 18 |
import org.distorted.main.R; |
... | ... | |
47 | 47 |
|
48 | 48 |
public static int cubitIsLocked(int object, int cubit) |
49 | 49 |
{ |
50 |
if( object == ObjectSignatures.CUBE_3 )
|
|
50 |
if( object == ObjectConstants.CUBE_3 )
|
|
51 | 51 |
{ |
52 | 52 |
if( cubit==20 ) return 0; // center of the right face |
53 | 53 |
if( cubit==21 ) return 1; // center of the left face |
... | ... | |
74 | 74 |
{ |
75 | 75 |
RubikScreenSolver screen = (RubikScreenSolver) ScreenList.SVER.getScreenClass(); |
76 | 76 |
|
77 |
if( mSignature==ObjectSignatures.CUBE_3 )
|
|
77 |
if( mSignature==ObjectConstants.CUBE_3 )
|
|
78 | 78 |
{ |
79 | 79 |
SolverCube3 solver = new SolverCube3(mOS,mRes,mObject); |
80 | 80 |
solver.solve(screen); |
81 | 81 |
} |
82 |
else if( mSignature==ObjectSignatures.PDUO_2 )
|
|
82 |
else if( mSignature==ObjectConstants.PDUO_2 )
|
|
83 | 83 |
{ |
84 | 84 |
SolverTablebase solver = new SolverPyraminxDuo(mOS,mRes,mObject); |
85 | 85 |
solver.solve(screen); |
86 | 86 |
} |
87 |
else if( mSignature==ObjectSignatures.IVY_2 )
|
|
87 |
else if( mSignature==ObjectConstants.IVY_2 )
|
|
88 | 88 |
{ |
89 | 89 |
SolverTablebase solver = new SolverIvyCube(mOS,mRes,mObject); |
90 | 90 |
solver.solve(screen); |
91 | 91 |
} |
92 |
else if( mSignature==ObjectSignatures.CU_232 )
|
|
92 |
else if( mSignature==ObjectConstants.CU_232 )
|
|
93 | 93 |
{ |
94 | 94 |
SolverTablebase solver = new SolverCuboid232(mOS,mRes,mObject); |
95 | 95 |
solver.solve(screen); |
96 | 96 |
} |
97 |
else if( mSignature==ObjectSignatures.CU_323 )
|
|
97 |
else if( mSignature==ObjectConstants.CU_323 )
|
|
98 | 98 |
{ |
99 | 99 |
SolverTablebase solver = new SolverCuboid323(mOS,mRes,mObject); |
100 | 100 |
solver.solve(screen); |
101 | 101 |
} |
102 |
else if( mSignature==ObjectSignatures.PYRA_3 )
|
|
102 |
else if( mSignature==ObjectConstants.PYRA_3 )
|
|
103 | 103 |
{ |
104 | 104 |
SolverTablebase solver = new SolverPyraminx(mOS,mRes,mObject); |
105 | 105 |
solver.solve(screen); |
106 | 106 |
} |
107 |
else if( mSignature==ObjectSignatures.DIAM_2 )
|
|
107 |
else if( mSignature==ObjectConstants.DIAM_2 )
|
|
108 | 108 |
{ |
109 | 109 |
SolverTablebase solver = new SolverSkewbDiamond(mOS,mRes,mObject); |
110 | 110 |
solver.solve(screen); |
111 | 111 |
} |
112 |
else if( mSignature==ObjectSignatures.CUBE_2 )
|
|
112 |
else if( mSignature==ObjectConstants.CUBE_2 )
|
|
113 | 113 |
{ |
114 | 114 |
SolverTablebase solver = new SolverCube2(mOS,mRes,mObject); |
115 | 115 |
solver.solve(screen); |
116 | 116 |
} |
117 |
else if( mSignature==ObjectSignatures.JING_2 )
|
|
117 |
else if( mSignature==ObjectConstants.JING_2 )
|
|
118 | 118 |
{ |
119 | 119 |
SolverTablebase solver = new SolverJing(mOS,mRes,mObject); |
120 | 120 |
solver.solve(screen); |
121 | 121 |
} |
122 |
else if( mSignature==ObjectSignatures.SKEW_2 )
|
|
122 |
else if( mSignature==ObjectConstants.SKEW_2 )
|
|
123 | 123 |
{ |
124 | 124 |
SolverTablebase solver = new SolverSkewb(mOS,mRes,mObject); |
125 | 125 |
solver.solve(screen); |
126 | 126 |
} |
127 |
else if( mSignature==ObjectSignatures.DINO_3 )
|
|
127 |
else if( mSignature==ObjectConstants.DINO_3 )
|
|
128 | 128 |
{ |
129 | 129 |
SolverTablebase solver = new SolverDino6(mOS,mRes,mObject); |
130 | 130 |
solver.solve(screen); |
131 | 131 |
} |
132 |
else if( mSignature==ObjectSignatures.DIN4_3 )
|
|
132 |
else if( mSignature==ObjectConstants.DIN4_3 )
|
|
133 | 133 |
{ |
134 | 134 |
SolverTablebase solver = new SolverDino4(mOS,mRes,mObject); |
135 | 135 |
solver.solve(screen); |
136 | 136 |
} |
137 |
else if( mSignature==ObjectSignatures.PDIA_3 )
|
|
137 |
else if( mSignature==ObjectConstants.PDIA_3 )
|
|
138 | 138 |
{ |
139 | 139 |
SolverTablebase solver = new SolverPyraminxDiamond(mOS,mRes,mObject); |
140 | 140 |
solver.solve(screen); |
Also available in: Unified diff
separate ObjectSiguature into its own package and separate the BandagedSignatures out of it.