Revision 318c0a7d
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/main/RubikPreRender.java | ||
|---|---|---|
| 35 | 35 |
import com.google.firebase.analytics.FirebaseAnalytics; |
| 36 | 36 |
|
| 37 | 37 |
import org.distorted.objectlib.main.TwistyObject; |
| 38 |
import org.distorted.objectlib.main.ObjectList;
|
|
| 38 |
import org.distorted.objectlib.main.ObjectType;
|
|
| 39 | 39 |
|
| 40 | 40 |
import org.distorted.dialogs.RubikDialogNewRecord; |
| 41 | 41 |
import org.distorted.dialogs.RubikDialogSolved; |
| ... | ... | |
| 60 | 60 |
mInitializeObject, mSetTextureMap, mResetAllTextureMaps, mSolve; |
| 61 | 61 |
private boolean mUIBlocked, mTouchBlocked; |
| 62 | 62 |
private boolean mIsSolved; |
| 63 |
private ObjectList mNextObject;
|
|
| 63 |
private ObjectType mNextObject;
|
|
| 64 | 64 |
private long mRotationFinishedID; |
| 65 | 65 |
private final long[] mEffectID; |
| 66 | 66 |
private boolean mIsNewRecord; |
| ... | ... | |
| 114 | 114 |
|
| 115 | 115 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 116 | 116 |
|
| 117 |
private void createObjectNow(ObjectList object, int[][] moves)
|
|
| 117 |
private void createObjectNow(ObjectType object, int[][] moves)
|
|
| 118 | 118 |
{
|
| 119 | 119 |
boolean firstTime = (mNewObject==null); |
| 120 | 120 |
|
| ... | ... | |
| 344 | 344 |
|
| 345 | 345 |
int object = play.getObject(); |
| 346 | 346 |
int level = play.getLevel(); |
| 347 |
ObjectList list = ObjectList.getObject(object);
|
|
| 347 |
ObjectType list = ObjectType.getObject(object);
|
|
| 348 | 348 |
String name = scores.getName(); |
| 349 | 349 |
|
| 350 | 350 |
String record = list.name()+" level "+level+" time "+mNewRecord+" isNew: "+mIsNewRecord+" scrambleNum: "+mScrambleObjectNum; |
| ... | ... | |
| 497 | 497 |
|
| 498 | 498 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 499 | 499 |
|
| 500 |
void changeObject(ObjectList object)
|
|
| 500 |
void changeObject(ObjectType object)
|
|
| 501 | 501 |
{
|
| 502 | 502 |
mChangeObject = true; |
| 503 | 503 |
mNextObject = object; |
| ... | ... | |
| 505 | 505 |
|
| 506 | 506 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 507 | 507 |
|
| 508 |
void setupObject(ObjectList object, int[][] moves)
|
|
| 508 |
void setupObject(ObjectType object, int[][] moves)
|
|
| 509 | 509 |
{
|
| 510 | 510 |
mSetupObject= true; |
| 511 | 511 |
mNextObject = object; |
Also available in: Unified diff
Reename ObjectList to a more logical ObjectType.