Revision 7ac0ee88
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/main/RubikPreRender.java | ||
|---|---|---|
| 61 | 61 |
private boolean mUIBlocked, mTouchBlocked; |
| 62 | 62 |
private boolean mIsSolved; |
| 63 | 63 |
private ObjectList mNextObject; |
| 64 |
private int mNextSize; |
|
| 65 | 64 |
private long mRotationFinishedID; |
| 66 | 65 |
private final long[] mEffectID; |
| 67 | 66 |
private boolean mIsNewRecord; |
| ... | ... | |
| 115 | 114 |
|
| 116 | 115 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 117 | 116 |
|
| 118 |
private void createObjectNow(ObjectList object, int size, int[][] moves)
|
|
| 117 |
private void createObjectNow(ObjectList object, int[][] moves) |
|
| 119 | 118 |
{
|
| 120 | 119 |
boolean firstTime = (mNewObject==null); |
| 121 | 120 |
|
| ... | ... | |
| 125 | 124 |
Context con = mView.getContext(); |
| 126 | 125 |
Resources res = con.getResources(); |
| 127 | 126 |
|
| 128 |
mNewObject = object.create(size, mView.getQuat(), moves, res, mScreenWidth);
|
|
| 127 |
mNewObject = object.create(mView.getQuat(), moves, res, mScreenWidth); |
|
| 129 | 128 |
|
| 130 | 129 |
if( mNewObject!=null ) |
| 131 | 130 |
{
|
| ... | ... | |
| 248 | 247 |
{
|
| 249 | 248 |
mChangeObject = false; |
| 250 | 249 |
|
| 251 |
if ( mNewObject==null || mNewObject.getObjectList()!=mNextObject || mNewObject.getNumLayers()!=mNextSize)
|
|
| 250 |
if ( mNewObject==null || mNewObject.getObjectList()!=mNextObject ) |
|
| 252 | 251 |
{
|
| 253 | 252 |
blockEverything(BlockController.RUBIK_PLACE_1); |
| 254 |
createObjectNow(mNextObject, mNextSize, null);
|
|
| 253 |
createObjectNow(mNextObject, null); |
|
| 255 | 254 |
doEffectNow( BaseEffect.Type.SIZECHANGE ); |
| 256 | 255 |
} |
| 257 | 256 |
} |
| ... | ... | |
| 262 | 261 |
{
|
| 263 | 262 |
mSetupObject = false; |
| 264 | 263 |
|
| 265 |
if ( mNewObject==null || mNewObject.getObjectList()!=mNextObject || mNewObject.getNumLayers()!=mNextSize)
|
|
| 264 |
if ( mNewObject==null || mNewObject.getObjectList()!=mNextObject) |
|
| 266 | 265 |
{
|
| 267 | 266 |
blockEverything(BlockController.RUBIK_PLACE_2); |
| 268 |
createObjectNow(mNextObject, mNextSize, mNextMoves);
|
|
| 267 |
createObjectNow(mNextObject, mNextMoves); |
|
| 269 | 268 |
doEffectNow( BaseEffect.Type.SIZECHANGE ); |
| 270 | 269 |
} |
| 271 | 270 |
else |
| ... | ... | |
| 344 | 343 |
RubikScores scores = RubikScores.getInstance(); |
| 345 | 344 |
|
| 346 | 345 |
int object = play.getObject(); |
| 347 |
int size = play.getSize(); |
|
| 348 | 346 |
int level = play.getLevel(); |
| 349 | 347 |
ObjectList list = ObjectList.getObject(object); |
| 350 | 348 |
String name = scores.getName(); |
| 351 | 349 |
|
| 352 |
String record = list.name()+"_"+size+" level "+level+" time "+mNewRecord+" isNew: "+mIsNewRecord+" scrambleNum: "+mScrambleObjectNum;
|
|
| 350 |
String record = list.name()+" level "+level+" time "+mNewRecord+" isNew: "+mIsNewRecord+" scrambleNum: "+mScrambleObjectNum; |
|
| 353 | 351 |
|
| 354 | 352 |
if( BuildConfig.DEBUG ) |
| 355 | 353 |
{
|
| ... | ... | |
| 499 | 497 |
|
| 500 | 498 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 501 | 499 |
|
| 502 |
void changeObject(ObjectList object, int size)
|
|
| 500 |
void changeObject(ObjectList object) |
|
| 503 | 501 |
{
|
| 504 |
if( size>0 ) |
|
| 505 |
{
|
|
| 506 |
mChangeObject = true; |
|
| 507 |
mNextObject = object; |
|
| 508 |
mNextSize = size; |
|
| 509 |
} |
|
| 502 |
mChangeObject = true; |
|
| 503 |
mNextObject = object; |
|
| 510 | 504 |
} |
| 511 | 505 |
|
| 512 | 506 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 513 | 507 |
|
| 514 |
void setupObject(ObjectList object, int size, int[][] moves)
|
|
| 508 |
void setupObject(ObjectList object, int[][] moves) |
|
| 515 | 509 |
{
|
| 516 |
if( size>0 ) |
|
| 517 |
{
|
|
| 518 |
mSetupObject= true; |
|
| 519 |
mNextObject = object; |
|
| 520 |
mNextSize = size; |
|
| 521 |
mNextMoves = moves; |
|
| 522 |
} |
|
| 510 |
mSetupObject= true; |
|
| 511 |
mNextObject = object; |
|
| 512 |
mNextMoves = moves; |
|
| 523 | 513 |
} |
| 524 | 514 |
|
| 525 | 515 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Simplify ObjectList: now there's just one object per size.