Revision 50e6c5d6
Added by Leszek Koltunski about 1 year ago
| src/main/java/org/distorted/main/RubikActivity.java | ||
|---|---|---|
| 40 | 40 |
|
| 41 | 41 |
import org.distorted.library.main.DistortedScreen; |
| 42 | 42 |
import org.distorted.messaging.RubikInAppMessanging; |
| 43 |
import org.distorted.objectlib.main.InitAssets; |
|
| 43 | 44 |
import org.distorted.objectlib.main.ObjectControl; |
| 44 | 45 |
import org.distorted.objectlib.main.TwistyObject; |
| 45 | 46 |
import org.distorted.objectlib.effects.BaseEffect; |
| ... | ... | |
| 612 | 613 |
InputStream jsonStream = object==null ? null : object.getObjectStream(this); |
| 613 | 614 |
InputStream meshStream = object==null ? null : object.getMeshStream(this); |
| 614 | 615 |
String name = object==null ? "NULL" : object.getUpperName(); |
| 616 |
InitAssets asset = new InitAssets(jsonStream,meshStream); |
|
| 615 | 617 |
|
| 616 |
control.changeIfDifferent(ordinal,name,meshState,iconMode,jsonStream,meshStream);
|
|
| 618 |
control.changeIfDifferent(ordinal,name,meshState,iconMode,asset);
|
|
| 617 | 619 |
} |
| 618 | 620 |
|
| 619 | 621 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 734 | 736 |
int iconMode = TwistyObject.MODE_NORM; |
| 735 | 737 |
InputStream jsonStream = object.getObjectStream(this); |
| 736 | 738 |
InputStream meshStream = object.getMeshStream(this); |
| 739 |
InitAssets asset = new InitAssets(jsonStream,meshStream); |
|
| 737 | 740 |
ObjectControl control = getControl(); |
| 738 |
control.changeObject(-1,meshState,iconMode,jsonStream,meshStream);
|
|
| 741 |
control.changeObject(-1,meshState,iconMode,asset);
|
|
| 739 | 742 |
} |
| 740 | 743 |
} |
| 741 | 744 |
} |
Also available in: Unified diff
Introduce InitAssets. We'll use this later to pass on references to the tablebase file to the TwistyObject (so that it can use this for perfect scrambling)