Revision 50e6c5d6
Added by Leszek Koltunski about 1 year ago
| src/main/java/org/distorted/bandaged/BandagedPlayActivity.java | ||
|---|---|---|
| 26 | 26 |
import org.distorted.external.RubikFiles; |
| 27 | 27 |
import org.distorted.library.main.DistortedLibrary; |
| 28 | 28 |
import org.distorted.main.R; |
| 29 |
import org.distorted.objectlib.main.InitAssets; |
|
| 29 | 30 |
import org.distorted.objectlib.main.ObjectControl; |
| 30 | 31 |
import org.distorted.objectlib.main.TwistyObject; |
| 31 | 32 |
|
| ... | ... | |
| 242 | 243 |
InputStream jsonStream = files.openFile(this,name+"_object.json"); |
| 243 | 244 |
InputStream meshStream = null; |
| 244 | 245 |
int ordinal = 0; // if jsonStream!=null, this doesn't matter |
| 246 |
InitAssets asset = new InitAssets(jsonStream,meshStream); |
|
| 245 | 247 |
|
| 246 |
control.changeIfDifferent(ordinal,name,meshState,iconMode,jsonStream,meshStream);
|
|
| 248 |
control.changeIfDifferent(ordinal,name,meshState,iconMode,asset);
|
|
| 247 | 249 |
} |
| 248 | 250 |
|
| 249 | 251 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
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)