Revision eaf46415
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/main/RubikActivity.java | ||
|---|---|---|
| 39 | 39 |
import org.distorted.library.main.DistortedScreen; |
| 40 | 40 |
import org.distorted.library.type.Static4D; |
| 41 | 41 |
|
| 42 |
import org.distorted.objectlib.main.ObjectPreRender; |
|
| 42 | 43 |
import org.distorted.objectlib.main.TwistyObject; |
| 43 | 44 |
import org.distorted.objectlib.main.ObjectType; |
| 44 | 45 |
import org.distorted.objectlib.helpers.BlockController; |
| 45 |
import org.distorted.objectlib.helpers.TwistyPreRender; |
|
| 46 | 46 |
|
| 47 | 47 |
import org.distorted.dialogs.RubikDialogError; |
| 48 | 48 |
import org.distorted.dialogs.RubikDialogPrivacy; |
| ... | ... | |
| 405 | 405 |
public TwistyObject getObject() |
| 406 | 406 |
{
|
| 407 | 407 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 408 |
RubikPreRender pre = view.getPreRender();
|
|
| 408 |
ObjectPreRender pre = view.getPreRender();
|
|
| 409 | 409 |
return pre.getObject(); |
| 410 | 410 |
} |
| 411 | 411 |
|
| ... | ... | |
| 420 | 420 |
|
| 421 | 421 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 422 | 422 |
|
| 423 |
public RubikPreRender getPreRender() |
|
| 424 |
{
|
|
| 425 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
|
| 426 |
return view.getPreRender(); |
|
| 427 |
} |
|
| 428 |
|
|
| 429 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 430 |
|
|
| 431 |
public TwistyPreRender getTwistyPreRender() |
|
| 423 |
public ObjectPreRender getPreRender() |
|
| 432 | 424 |
{
|
| 433 | 425 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 434 | 426 |
return view.getPreRender(); |
| ... | ... | |
| 460 | 452 |
public void changeObject(ObjectType newObject, boolean reportChange) |
| 461 | 453 |
{
|
| 462 | 454 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 463 |
RubikPreRender pre = view.getPreRender();
|
|
| 455 |
ObjectPreRender pre = view.getPreRender();
|
|
| 464 | 456 |
|
| 465 | 457 |
if( reportChange ) |
| 466 | 458 |
{
|
| ... | ... | |
| 518 | 510 |
public void setupObject(ObjectType object, int[][] moves) |
| 519 | 511 |
{
|
| 520 | 512 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 521 |
RubikPreRender pre = view.getPreRender();
|
|
| 513 |
ObjectPreRender pre = view.getPreRender();
|
|
| 522 | 514 |
pre.setupObject(object,moves); |
| 523 | 515 |
} |
| 524 | 516 |
|
| ... | ... | |
| 612 | 604 |
{
|
| 613 | 605 |
setLock(); |
| 614 | 606 |
|
| 615 |
TwistyPreRender pre = getPreRender();
|
|
| 607 |
ObjectPreRender pre = getPreRender();
|
|
| 616 | 608 |
pre.blockEverything(place); |
| 617 | 609 |
|
| 618 | 610 |
RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass(); |
| ... | ... | |
| 625 | 617 |
{
|
| 626 | 618 |
unsetLock(); |
| 627 | 619 |
|
| 628 |
TwistyPreRender pre = getPreRender();
|
|
| 620 |
ObjectPreRender pre = getPreRender();
|
|
| 629 | 621 |
pre.unblockEverything(); |
| 630 | 622 |
|
| 631 | 623 |
RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass(); |
Also available in: Unified diff
Move PreRender to objectlib.
This code is now shared betweeen the Rubik and Tutorial activities.