Revision cf93ea4e
Added by Leszek Koltunski about 1 year ago
| src/main/java/org/distorted/objectlib/main/ObjectControl.java | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
package org.distorted.objectlib.main; |
| 11 | 11 |
|
| 12 |
import java.io.InputStream; |
|
| 13 |
|
|
| 14 | 12 |
import android.app.Activity; |
| 15 | 13 |
import android.content.SharedPreferences; |
| 16 | 14 |
import android.util.DisplayMetrics; |
| ... | ... | |
| 696 | 694 |
|
| 697 | 695 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 698 | 696 |
|
| 699 |
public void changeObject(int ordinal, int meshState, int iconMode, InputStream jsonStream, InputStream meshStream)
|
|
| 697 |
public void changeObject(int ordinal, int meshState, int iconMode, InitAssets asset)
|
|
| 700 | 698 |
{
|
| 701 |
mPreRender.changeObject(ordinal, meshState, iconMode, jsonStream, meshStream);
|
|
| 699 |
mPreRender.changeObject(ordinal, meshState, iconMode, asset);
|
|
| 702 | 700 |
} |
| 703 | 701 |
|
| 704 | 702 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 705 | 703 |
|
| 706 |
public void changeIfDifferent(int ordinal, String newName, int meshState, int iconMode, InputStream jsonStream, InputStream meshStream)
|
|
| 704 |
public void changeIfDifferent(int ordinal, String newName, int meshState, int iconMode, InitAssets asset)
|
|
| 707 | 705 |
{
|
| 708 | 706 |
TwistyObject object = mPreRender.getObject(); |
| 709 | 707 |
String oldName = object==null ? "" : object.getShortName(); |
| ... | ... | |
| 712 | 710 |
{
|
| 713 | 711 |
mMeshState = meshState; |
| 714 | 712 |
mIconMode = iconMode; |
| 715 |
mPreRender.changeObject(ordinal, meshState, iconMode, jsonStream, meshStream);
|
|
| 713 |
mPreRender.changeObject(ordinal, meshState, iconMode, asset);
|
|
| 716 | 714 |
} |
| 717 | 715 |
} |
| 718 | 716 |
|
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)