Revision 2876aeb6
Added by Leszek Koltunski about 1 year ago
src/main/java/org/distorted/main/RubikActivity.java | ||
---|---|---|
613 | 613 |
InputStream jsonStream = object==null ? null : object.getObjectStream(this); |
614 | 614 |
InputStream meshStream = object==null ? null : object.getMeshStream(this); |
615 | 615 |
String name = object==null ? "NULL" : object.getUpperName(); |
616 |
InitAssets asset = new InitAssets(jsonStream,meshStream); |
|
616 |
InitAssets asset = new InitAssets(jsonStream,meshStream,getResources());
|
|
617 | 617 |
|
618 | 618 |
control.changeIfDifferent(ordinal,name,meshState,iconMode,asset); |
619 | 619 |
} |
... | ... | |
736 | 736 |
int iconMode = TwistyObject.MODE_NORM; |
737 | 737 |
InputStream jsonStream = object.getObjectStream(this); |
738 | 738 |
InputStream meshStream = object.getMeshStream(this); |
739 |
InitAssets asset = new InitAssets(jsonStream,meshStream); |
|
739 |
InitAssets asset = new InitAssets(jsonStream,meshStream,getResources());
|
|
740 | 740 |
ObjectControl control = getControl(); |
741 | 741 |
control.changeObject(-1,meshState,iconMode,asset); |
742 | 742 |
} |
Also available in: Unified diff
Tablebase-based scrambling.