Revision 62054004
Added by Leszek Koltunski 5 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.signature.ObjectConstants; |
|
16 | 15 |
import org.distorted.objectlib.main.TwistyObject; |
17 | 16 |
|
18 | 17 |
import org.distorted.main.R; |
18 |
import org.distorted.objectlib.metadata.MetadataCUBE_2; |
|
19 |
import org.distorted.objectlib.metadata.MetadataCUBE_3; |
|
20 |
import org.distorted.objectlib.metadata.MetadataCU_232; |
|
21 |
import org.distorted.objectlib.metadata.MetadataCU_323; |
|
22 |
import org.distorted.objectlib.metadata.MetadataDIAM_2; |
|
23 |
import org.distorted.objectlib.metadata.MetadataDIN4_3; |
|
24 |
import org.distorted.objectlib.metadata.MetadataDINO_3; |
|
25 |
import org.distorted.objectlib.metadata.MetadataIVY_2; |
|
26 |
import org.distorted.objectlib.metadata.MetadataJING_2; |
|
27 |
import org.distorted.objectlib.metadata.MetadataPDIA_3; |
|
28 |
import org.distorted.objectlib.metadata.MetadataPDUO_2; |
|
29 |
import org.distorted.objectlib.metadata.MetadataPYRA_3; |
|
30 |
import org.distorted.objectlib.metadata.MetadataSKEW_2; |
|
19 | 31 |
import org.distorted.solverui.ScreenList; |
20 | 32 |
import org.distorted.solverui.ScreenSolver; |
21 | 33 |
|
... | ... | |
47 | 59 |
|
48 | 60 |
public static int cubitIsLocked(int object, int cubit) |
49 | 61 |
{ |
50 |
if( object == ObjectConstants.CUBE_3 )
|
|
62 |
if( object == MetadataCUBE_3.INDEX )
|
|
51 | 63 |
{ |
52 | 64 |
if( cubit==20 ) return 0; // center of the right face |
53 | 65 |
if( cubit==21 ) return 1; // center of the left face |
... | ... | |
74 | 86 |
{ |
75 | 87 |
ScreenSolver screen = (ScreenSolver) ScreenList.SVER.getScreenClass(); |
76 | 88 |
|
77 |
if( mSignature==ObjectConstants.CUBE_3 )
|
|
89 |
if( mSignature == MetadataCUBE_3.INDEX )
|
|
78 | 90 |
{ |
79 | 91 |
SolverCube3 solver = new SolverCube3(mOS,mRes,mObject); |
80 | 92 |
solver.solve(screen); |
81 | 93 |
} |
82 |
else if( mSignature==ObjectConstants.PDUO_2 )
|
|
94 |
else if( mSignature == MetadataPDUO_2.INDEX )
|
|
83 | 95 |
{ |
84 | 96 |
SolverTablebase solver = new SolverPyraminxDuo(mOS,mRes,mObject); |
85 | 97 |
solver.solve(screen); |
86 | 98 |
} |
87 |
else if( mSignature==ObjectConstants.IVY_2 )
|
|
99 |
else if( mSignature == MetadataIVY_2.INDEX )
|
|
88 | 100 |
{ |
89 | 101 |
SolverTablebase solver = new SolverIvyCube(mOS,mRes,mObject); |
90 | 102 |
solver.solve(screen); |
91 | 103 |
} |
92 |
else if( mSignature==ObjectConstants.CU_232 )
|
|
104 |
else if( mSignature == MetadataCU_232.INDEX )
|
|
93 | 105 |
{ |
94 | 106 |
SolverTablebase solver = new SolverCuboid232(mOS,mRes,mObject); |
95 | 107 |
solver.solve(screen); |
96 | 108 |
} |
97 |
else if( mSignature==ObjectConstants.CU_323 )
|
|
109 |
else if( mSignature == MetadataCU_323.INDEX )
|
|
98 | 110 |
{ |
99 | 111 |
SolverTablebase solver = new SolverCuboid323(mOS,mRes,mObject); |
100 | 112 |
solver.solve(screen); |
101 | 113 |
} |
102 |
else if( mSignature==ObjectConstants.PYRA_3 )
|
|
114 |
else if( mSignature == MetadataPYRA_3.INDEX )
|
|
103 | 115 |
{ |
104 | 116 |
SolverTablebase solver = new SolverPyraminx(mOS,mRes,mObject); |
105 | 117 |
solver.solve(screen); |
106 | 118 |
} |
107 |
else if( mSignature==ObjectConstants.DIAM_2 )
|
|
119 |
else if( mSignature == MetadataDIAM_2.INDEX )
|
|
108 | 120 |
{ |
109 | 121 |
SolverTablebase solver = new SolverSkewbDiamond(mOS,mRes,mObject); |
110 | 122 |
solver.solve(screen); |
111 | 123 |
} |
112 |
else if( mSignature==ObjectConstants.CUBE_2 )
|
|
124 |
else if( mSignature == MetadataCUBE_2.INDEX )
|
|
113 | 125 |
{ |
114 | 126 |
SolverTablebase solver = new SolverCube2(mOS,mRes,mObject); |
115 | 127 |
solver.solve(screen); |
116 | 128 |
} |
117 |
else if( mSignature==ObjectConstants.JING_2 )
|
|
129 |
else if( mSignature == MetadataJING_2.INDEX )
|
|
118 | 130 |
{ |
119 | 131 |
SolverTablebase solver = new SolverJing(mOS,mRes,mObject); |
120 | 132 |
solver.solve(screen); |
121 | 133 |
} |
122 |
else if( mSignature==ObjectConstants.SKEW_2 )
|
|
134 |
else if( mSignature == MetadataSKEW_2.INDEX )
|
|
123 | 135 |
{ |
124 | 136 |
SolverTablebase solver = new SolverSkewb(mOS,mRes,mObject); |
125 | 137 |
solver.solve(screen); |
126 | 138 |
} |
127 |
else if( mSignature==ObjectConstants.DINO_3 )
|
|
139 |
else if( mSignature == MetadataDINO_3.INDEX )
|
|
128 | 140 |
{ |
129 | 141 |
SolverTablebase solver = new SolverDino6(mOS,mRes,mObject); |
130 | 142 |
solver.solve(screen); |
131 | 143 |
} |
132 |
else if( mSignature==ObjectConstants.DIN4_3 )
|
|
144 |
else if( mSignature == MetadataDIN4_3.INDEX )
|
|
133 | 145 |
{ |
134 | 146 |
SolverTablebase solver = new SolverDino4(mOS,mRes,mObject); |
135 | 147 |
solver.solve(screen); |
136 | 148 |
} |
137 |
else if( mSignature==ObjectConstants.PDIA_3 )
|
|
149 |
else if( mSignature == MetadataPDIA_3.INDEX )
|
|
138 | 150 |
{ |
139 | 151 |
SolverTablebase solver = new SolverPyraminxDiamond(mOS,mRes,mObject); |
140 | 152 |
solver.solve(screen); |
Also available in: Unified diff
Move signatures and ObjectConstants to Metadata.