Revision 62054004
Added by Leszek Koltunski 5 months ago
| src/main/java/org/distorted/solverui/ScreenSolver.java | ||
|---|---|---|
| 34 | 34 |
import org.distorted.main.R; |
| 35 | 35 |
import org.distorted.objectlib.main.ObjectControl; |
| 36 | 36 |
import org.distorted.objectlib.main.TwistyObject; |
| 37 |
import org.distorted.objectlib.metadata.MetadataBALL_4; |
|
| 38 |
import org.distorted.objectlib.metadata.MetadataCRYS_3; |
|
| 39 |
import org.distorted.objectlib.metadata.MetadataDIAM_2; |
|
| 40 |
import org.distorted.objectlib.metadata.MetadataDIAM_3; |
|
| 41 |
import org.distorted.objectlib.metadata.MetadataDIAM_4; |
|
| 42 |
import org.distorted.objectlib.metadata.MetadataDIN4_3; |
|
| 43 |
import org.distorted.objectlib.metadata.MetadataICOS_2; |
|
| 44 |
import org.distorted.objectlib.metadata.MetadataJING_2; |
|
| 45 |
import org.distorted.objectlib.metadata.MetadataKILO_3; |
|
| 46 |
import org.distorted.objectlib.metadata.MetadataKILO_5; |
|
| 47 |
import org.distorted.objectlib.metadata.MetadataMEGA_3; |
|
| 48 |
import org.distorted.objectlib.metadata.MetadataMEGA_5; |
|
| 49 |
import org.distorted.objectlib.metadata.MetadataMORP_2; |
|
| 50 |
import org.distorted.objectlib.metadata.MetadataMORP_3; |
|
| 51 |
import org.distorted.objectlib.metadata.MetadataMORP_4; |
|
| 52 |
import org.distorted.objectlib.metadata.MetadataPDIA_3; |
|
| 53 |
import org.distorted.objectlib.metadata.MetadataPDUO_2; |
|
| 54 |
import org.distorted.objectlib.metadata.MetadataPENT_2; |
|
| 55 |
import org.distorted.objectlib.metadata.MetadataPYRA_3; |
|
| 56 |
import org.distorted.objectlib.metadata.MetadataPYRA_4; |
|
| 57 |
import org.distorted.objectlib.metadata.MetadataPYRA_5; |
|
| 58 |
import org.distorted.objectlib.metadata.MetadataSTAR_3; |
|
| 59 |
import org.distorted.objectlib.metadata.MetadataTRAJ_3; |
|
| 60 |
import org.distorted.objectlib.metadata.MetadataTRAJ_4; |
|
| 37 | 61 |
import org.distorted.objectlib.shape.ShapeDiamond; |
| 38 | 62 |
import org.distorted.objectlib.shape.ShapeDodecahedron; |
| 39 | 63 |
import org.distorted.objectlib.shape.ShapeHexahedron; |
| 40 | 64 |
import org.distorted.objectlib.shape.ShapeIcosahedron; |
| 41 | 65 |
import org.distorted.objectlib.shape.ShapeOctahedron; |
| 42 | 66 |
import org.distorted.objectlib.shape.ShapeTetrahedron; |
| 43 |
import org.distorted.objectlib.signature.ObjectConstants; |
|
| 44 | 67 |
import org.distorted.solvers.ImplementedSolversList; |
| 45 | 68 |
import org.distorted.solvers.SolverMain; |
| 46 | 69 |
|
| ... | ... | |
| 144 | 167 |
{
|
| 145 | 168 |
mColorMode = MODE_NORMAL; |
| 146 | 169 |
|
| 147 |
if( object== ObjectConstants.PYRA_3 ||
|
|
| 148 |
object== ObjectConstants.PYRA_4 ||
|
|
| 149 |
object== ObjectConstants.PYRA_5 ||
|
|
| 150 |
object== ObjectConstants.PDUO_2 ||
|
|
| 151 |
object== ObjectConstants.JING_2 ||
|
|
| 152 |
object== ObjectConstants.MORP_2 ||
|
|
| 153 |
object== ObjectConstants.MORP_3 ||
|
|
| 154 |
object== ObjectConstants.MORP_4 )
|
|
| 170 |
if( object==MetadataPYRA_3.INDEX ||
|
|
| 171 |
object==MetadataPYRA_4.INDEX ||
|
|
| 172 |
object==MetadataPYRA_5.INDEX ||
|
|
| 173 |
object==MetadataPDUO_2.INDEX ||
|
|
| 174 |
object==MetadataJING_2.INDEX ||
|
|
| 175 |
object==MetadataMORP_2.INDEX ||
|
|
| 176 |
object==MetadataMORP_3.INDEX ||
|
|
| 177 |
object==MetadataMORP_4.INDEX )
|
|
| 155 | 178 |
{
|
| 156 | 179 |
mNumColors = ShapeTetrahedron.NUM_FACES; |
| 157 | 180 |
mFaceColors = ShapeTetrahedron.FACE_COLORS; |
| 158 | 181 |
} |
| 159 |
else if( object== ObjectConstants.DIAM_2 ||
|
|
| 160 |
object== ObjectConstants.DIAM_3 ||
|
|
| 161 |
object== ObjectConstants.DIAM_4 ||
|
|
| 162 |
object== ObjectConstants.TRAJ_3 ||
|
|
| 163 |
object== ObjectConstants.TRAJ_4 ||
|
|
| 164 |
object== ObjectConstants.PDIA_3 )
|
|
| 182 |
else if( object==MetadataDIAM_2.INDEX ||
|
|
| 183 |
object==MetadataDIAM_3.INDEX ||
|
|
| 184 |
object==MetadataDIAM_4.INDEX ||
|
|
| 185 |
object==MetadataTRAJ_3.INDEX ||
|
|
| 186 |
object==MetadataTRAJ_4.INDEX ||
|
|
| 187 |
object==MetadataPDIA_3.INDEX )
|
|
| 165 | 188 |
{
|
| 166 | 189 |
mNumColors = ShapeOctahedron.NUM_FACES; |
| 167 | 190 |
mFaceColors = ShapeOctahedron.FACE_COLORS; |
| 168 | 191 |
} |
| 169 |
else if( object== ObjectConstants.CRYS_3 ||
|
|
| 170 |
object== ObjectConstants.STAR_3 ||
|
|
| 171 |
object== ObjectConstants.PENT_2 ||
|
|
| 172 |
object== ObjectConstants.KILO_3 ||
|
|
| 173 |
object== ObjectConstants.KILO_5 ||
|
|
| 174 |
object== ObjectConstants.MEGA_3 ||
|
|
| 175 |
object== ObjectConstants.MEGA_5 )
|
|
| 192 |
else if( object==MetadataCRYS_3.INDEX ||
|
|
| 193 |
object==MetadataSTAR_3.INDEX ||
|
|
| 194 |
object==MetadataPENT_2.INDEX ||
|
|
| 195 |
object==MetadataKILO_3.INDEX ||
|
|
| 196 |
object==MetadataKILO_5.INDEX ||
|
|
| 197 |
object==MetadataMEGA_3.INDEX ||
|
|
| 198 |
object==MetadataMEGA_5.INDEX )
|
|
| 176 | 199 |
{
|
| 177 | 200 |
mNumColors = ShapeDodecahedron.NUM_FACES; |
| 178 | 201 |
mFaceColors = ShapeDodecahedron.FACE_COLORS; |
| 179 | 202 |
} |
| 180 |
else if( object== ObjectConstants.BALL_4 )
|
|
| 203 |
else if( object==MetadataBALL_4.INDEX )
|
|
| 181 | 204 |
{
|
| 182 | 205 |
mNumColors = ShapeDiamond.NUM_FACES; |
| 183 | 206 |
mFaceColors = ShapeDiamond.FACE_COLORS; |
| 184 | 207 |
} |
| 185 |
else if( object== ObjectConstants.ICOS_2 )
|
|
| 208 |
else if( object==MetadataICOS_2.INDEX )
|
|
| 186 | 209 |
{
|
| 187 | 210 |
mNumColors = ShapeIcosahedron.NUM_FACES; |
| 188 | 211 |
mFaceColors = ShapeIcosahedron.FACE_COLORS; |
| 189 | 212 |
} |
| 190 |
else if( object== ObjectConstants.DIN4_3 )
|
|
| 213 |
else if( object==MetadataDIN4_3.INDEX )
|
|
| 191 | 214 |
{
|
| 192 | 215 |
mNumColors = 4; |
| 193 | 216 |
mFaceColors = new int[] { COLOR_YELLOW, COLOR_RED, COLOR_BLUE, COLOR_WHITE };
|
Also available in: Unified diff
Move signatures and ObjectConstants to Metadata.