Revision de697069
Added by Leszek Koltunski 9 months ago
| src/main/java/org/distorted/screens/RubikScreenSolver.java | ||
|---|---|---|
| 26 | 26 |
import android.widget.LinearLayout; |
| 27 | 27 |
|
| 28 | 28 |
import org.distorted.objectlib.main.ObjectControl; |
| 29 |
import org.distorted.objectlib.main.ObjectSignatures;
|
|
| 29 |
import org.distorted.objectlib.signature.ObjectConstants;
|
|
| 30 | 30 |
import org.distorted.objectlib.main.TwistyObject; |
| 31 | 31 |
|
| 32 | 32 |
import org.distorted.dialogs.RubikDialogSolverError; |
| ... | ... | |
| 144 | 144 |
{
|
| 145 | 145 |
mColorMode = MODE_NORMAL; |
| 146 | 146 |
|
| 147 |
if( object== ObjectSignatures.PYRA_3 ||
|
|
| 148 |
object== ObjectSignatures.PYRA_4 ||
|
|
| 149 |
object== ObjectSignatures.PYRA_5 ||
|
|
| 150 |
object== ObjectSignatures.PDUO_2 ||
|
|
| 151 |
object== ObjectSignatures.JING_2 ||
|
|
| 152 |
object== ObjectSignatures.MORP_2 ||
|
|
| 153 |
object== ObjectSignatures.MORP_3 ||
|
|
| 154 |
object== ObjectSignatures.MORP_4 )
|
|
| 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 )
|
|
| 155 | 155 |
{
|
| 156 | 156 |
mNumColors = ShapeTetrahedron.NUM_FACES; |
| 157 | 157 |
mFaceColors = ShapeTetrahedron.FACE_COLORS; |
| 158 | 158 |
} |
| 159 |
else if( object== ObjectSignatures.DIAM_2 ||
|
|
| 160 |
object== ObjectSignatures.DIAM_3 ||
|
|
| 161 |
object== ObjectSignatures.DIAM_4 ||
|
|
| 162 |
object== ObjectSignatures.TRAJ_3 ||
|
|
| 163 |
object== ObjectSignatures.TRAJ_4 ||
|
|
| 164 |
object== ObjectSignatures.PDIA_3 )
|
|
| 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 )
|
|
| 165 | 165 |
{
|
| 166 | 166 |
mNumColors = ShapeOctahedron.NUM_FACES; |
| 167 | 167 |
mFaceColors = ShapeOctahedron.FACE_COLORS; |
| 168 | 168 |
} |
| 169 |
else if( object== ObjectSignatures.CRYS_3 ||
|
|
| 170 |
object== ObjectSignatures.STAR_3 ||
|
|
| 171 |
object== ObjectSignatures.PENT_2 ||
|
|
| 172 |
object== ObjectSignatures.KILO_3 ||
|
|
| 173 |
object== ObjectSignatures.KILO_5 ||
|
|
| 174 |
object== ObjectSignatures.MEGA_3 ||
|
|
| 175 |
object== ObjectSignatures.MEGA_5 )
|
|
| 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 )
|
|
| 176 | 176 |
{
|
| 177 | 177 |
mNumColors = ShapeDodecahedron.NUM_FACES; |
| 178 | 178 |
mFaceColors = ShapeDodecahedron.FACE_COLORS; |
| 179 | 179 |
} |
| 180 |
else if( object== ObjectSignatures.BALL_4 )
|
|
| 180 |
else if( object== ObjectConstants.BALL_4 )
|
|
| 181 | 181 |
{
|
| 182 | 182 |
mNumColors = ShapeDiamond.NUM_FACES; |
| 183 | 183 |
mFaceColors = ShapeDiamond.FACE_COLORS; |
| 184 | 184 |
} |
| 185 |
else if( object== ObjectSignatures.ICOS_2 )
|
|
| 185 |
else if( object== ObjectConstants.ICOS_2 )
|
|
| 186 | 186 |
{
|
| 187 | 187 |
mNumColors = ShapeIcosahedron.NUM_FACES; |
| 188 | 188 |
mFaceColors = ShapeIcosahedron.FACE_COLORS; |
| 189 | 189 |
} |
| 190 |
else if( object== ObjectSignatures.DIN4_3 )
|
|
| 190 |
else if( object== ObjectConstants.DIN4_3 )
|
|
| 191 | 191 |
{
|
| 192 | 192 |
mNumColors = 4; |
| 193 | 193 |
mFaceColors = new int[] { COLOR_YELLOW, COLOR_RED, COLOR_BLUE, COLOR_WHITE };
|
Also available in: Unified diff
separate ObjectSiguature into its own package and separate the BandagedSignatures out of it.