Revision 50e6c5d6
Added by Leszek Koltunski about 1 year ago
| src/main/java/org/distorted/config/ConfigActivity.java | ||
|---|---|---|
| 21 | 21 |
import androidx.appcompat.app.AppCompatActivity; |
| 22 | 22 |
|
| 23 | 23 |
import org.distorted.library.main.DistortedLibrary; |
| 24 |
import org.distorted.objectlib.main.InitAssets; |
|
| 24 | 25 |
import org.distorted.objectlib.main.ObjectControl; |
| 25 | 26 |
import org.distorted.main.R; |
| 26 | 27 |
import org.distorted.dialogs.RubikDialogError; |
| ... | ... | |
| 194 | 195 |
InputStream jsonStream = object.getObjectStream(this); |
| 195 | 196 |
InputStream meshStream = object.getMeshStream(this); |
| 196 | 197 |
String name = object.getUpperName(); |
| 197 |
|
|
| 198 |
control.changeIfDifferent(ordinal,name,meshState,iconMode,jsonStream,meshStream);
|
|
| 198 |
InitAssets asset = new InitAssets(jsonStream,meshStream); |
|
| 199 |
control.changeIfDifferent(ordinal,name,meshState,iconMode,asset);
|
|
| 199 | 200 |
} |
| 200 | 201 |
} |
| 201 | 202 |
|
| ... | ... | |
| 225 | 226 |
int iconMode = TwistyObject.MODE_NORM; |
| 226 | 227 |
InputStream jsonStream = object.getObjectStream(this); |
| 227 | 228 |
InputStream meshStream = object.getMeshStream(this); |
| 229 |
InitAssets asset = new InitAssets(jsonStream,meshStream); |
|
| 228 | 230 |
|
| 229 |
control.changeObject(ordinal,meshState,iconMode,jsonStream,meshStream);
|
|
| 231 |
control.changeObject(ordinal,meshState,iconMode,asset);
|
|
| 230 | 232 |
} |
| 231 | 233 |
} |
| 232 | 234 |
|
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)