Revision 7ac0ee88
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/main/RubikActivity.java | ||
|---|---|---|
| 276 | 276 |
boolean success = false; |
| 277 | 277 |
RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass(); |
| 278 | 278 |
int object = play.getObject(); |
| 279 |
int size = play.getSize(); |
|
| 280 | 279 |
|
| 281 | 280 |
if( object>=0 && object< ObjectList.NUM_OBJECTS ) |
| 282 | 281 |
{
|
| 283 |
ObjectList obj = ObjectList.getObject(object); |
|
| 284 |
int[] sizes = obj.getSizes(); |
|
| 285 |
int sizeIndex = ObjectList.getSizeIndex(object,size); |
|
| 286 |
|
|
| 287 |
if( sizeIndex>=0 && sizeIndex<sizes.length ) |
|
| 288 |
{
|
|
| 289 |
success = true; |
|
| 290 |
view.getPreRender().changeObject(obj,size); |
|
| 291 |
} |
|
| 282 |
success = true; |
|
| 283 |
ObjectList nextObj = ObjectList.values()[object]; |
|
| 284 |
view.getPreRender().changeObject(nextObj); |
|
| 292 | 285 |
} |
| 293 | 286 |
|
| 294 | 287 |
if( !success ) |
| 295 | 288 |
{
|
| 296 | 289 |
ObjectList obj = ObjectList.getObject(RubikScreenPlay.DEF_OBJECT); |
| 297 |
int s = RubikScreenPlay.DEF_SIZE; |
|
| 298 |
|
|
| 299 |
play.setObjectAndSize(this,obj,s); |
|
| 300 |
view.getPreRender().changeObject(obj,s); |
|
| 290 |
play.setObject(this,obj); |
|
| 291 |
view.getPreRender().changeObject(obj); |
|
| 301 | 292 |
} |
| 302 | 293 |
|
| 303 | 294 |
if( mIsChinese && !mPolicyAccepted ) PrivacyPolicy(); |
| ... | ... | |
| 466 | 457 |
|
| 467 | 458 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 468 | 459 |
|
| 469 |
public void changeObject(ObjectList newObject, int newSize, boolean reportChange)
|
|
| 460 |
public void changeObject(ObjectList newObject, boolean reportChange) |
|
| 470 | 461 |
{
|
| 471 | 462 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 472 | 463 |
RubikPreRender pre = view.getPreRender(); |
| ... | ... | |
| 478 | 469 |
if( oldObject!=null ) |
| 479 | 470 |
{
|
| 480 | 471 |
ObjectList oldList = oldObject.getObjectList(); |
| 481 |
int oldNum = oldObject.getNumLayers(); |
|
| 482 | 472 |
float fps = view.getRenderer().getFPS(); |
| 483 | 473 |
fps = (int)(fps+0.5f); |
| 484 | 474 |
StringBuilder name = new StringBuilder(); |
| 485 | 475 |
name.append(oldList.name()); |
| 486 |
name.append('_');
|
|
| 487 |
name.append(oldNum); |
|
| 488 | 476 |
name.append(' ');
|
| 489 | 477 |
name.append(fps); |
| 490 | 478 |
name.append(" --> ");
|
| 491 | 479 |
name.append(newObject.name()); |
| 492 |
name.append('_');
|
|
| 493 |
name.append(newSize); |
|
| 494 | 480 |
|
| 495 | 481 |
if( BuildConfig.DEBUG ) |
| 496 | 482 |
{
|
| ... | ... | |
| 510 | 496 |
} |
| 511 | 497 |
} |
| 512 | 498 |
|
| 513 |
pre.changeObject(newObject,newSize);
|
|
| 499 |
pre.changeObject(newObject); |
|
| 514 | 500 |
} |
| 515 | 501 |
|
| 516 | 502 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 517 | 503 |
|
| 518 |
public void setupObject(ObjectList object, int size, int[][] moves)
|
|
| 504 |
public void setupObject(ObjectList object, int[][] moves) |
|
| 519 | 505 |
{
|
| 520 | 506 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 521 | 507 |
RubikPreRender pre = view.getPreRender(); |
| 522 |
pre.setupObject(object,size,moves);
|
|
| 508 |
pre.setupObject(object,moves); |
|
| 523 | 509 |
} |
| 524 | 510 |
|
| 525 | 511 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 642 | 628 |
|
| 643 | 629 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 644 | 630 |
|
| 645 |
public void switchTutorial(String url, ObjectList object, int size)
|
|
| 631 |
public void switchTutorial(String url, ObjectList object) |
|
| 646 | 632 |
{
|
| 647 | 633 |
Intent myIntent = new Intent(this, TutorialActivity.class); |
| 648 | 634 |
myIntent.putExtra("url", url);
|
| 649 | 635 |
myIntent.putExtra("obj", object.ordinal());
|
| 650 |
myIntent.putExtra("siz", size);
|
|
| 651 | 636 |
startActivity(myIntent); |
| 652 | 637 |
} |
| 653 | 638 |
} |
Also available in: Unified diff
Simplify ObjectList: now there's just one object per size.