Revision 09cf2a36
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/main/RubikActivity.java | ||
|---|---|---|
| 61 | 61 |
import org.distorted.screens.RubikScreenPlay; |
| 62 | 62 |
import org.distorted.tutorials.TutorialActivity; |
| 63 | 63 |
|
| 64 |
import static org.distorted.objectlib.main.TwistyObject.MESH_NICE; |
|
| 65 |
|
|
| 64 | 66 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 65 | 67 |
|
| 66 | 68 |
public class RubikActivity extends AppCompatActivity |
| ... | ... | |
| 485 | 487 |
|
| 486 | 488 |
public void changeIfDifferent(int ordinal, ObjectControl control) |
| 487 | 489 |
{
|
| 490 |
RubikObject object = RubikObjectList.getObject(ordinal); |
|
| 491 |
int meshState = object!=null ? object.getMeshState() : MESH_NICE; |
|
| 492 |
|
|
| 488 | 493 |
InputStream jsonStream = ObjectJson.getStream(this,ordinal); |
| 489 | 494 |
InputStream meshStream = ObjectMesh.getStream(this,ordinal); |
| 490 |
control.changeIfDifferent(ordinal,jsonStream,meshStream); |
|
| 495 |
control.changeIfDifferent(ordinal,meshState,jsonStream,meshStream);
|
|
| 491 | 496 |
} |
| 492 | 497 |
|
| 493 | 498 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Introduce 'Simple' and 'Nice' meshes.