Revision 3103c3c8
Added by Leszek Koltunski about 1 year ago
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 15 | 15 |
import java.util.Random; |
| 16 | 16 |
|
| 17 | 17 |
import android.content.SharedPreferences; |
| 18 |
import android.content.res.Resources; |
|
| 19 | 18 |
import android.graphics.Bitmap; |
| 20 | 19 |
import android.graphics.Canvas; |
| 21 | 20 |
import android.graphics.Paint; |
| ... | ... | |
| 50 | 49 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| 51 | 50 |
import org.distorted.objectlib.helpers.ObjectStickerOverride; |
| 52 | 51 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 52 |
import org.distorted.objectlib.helpers.OperatingSystemInterface; |
|
| 53 | 53 |
import org.distorted.objectlib.helpers.QuatGroupGenerator; |
| 54 | 54 |
import org.distorted.objectlib.scrambling.ObjectScrambler; |
| 55 | 55 |
import org.distorted.objectlib.json.JsonReader; |
| ... | ... | |
| 246 | 246 |
int[][] edges = getScrambleEdges(); |
| 247 | 247 |
int[][] algorithms = getScrambleAlgorithms(); |
| 248 | 248 |
|
| 249 |
Resources res = asset==null ? null : asset.getResources();
|
|
| 250 |
TablebasesAbstract tablebase = res!=null ? getTablebase(res) : null;
|
|
| 249 |
OperatingSystemInterface os = asset==null ? null : asset.getOS();
|
|
| 250 |
TablebasesAbstract tablebase = os!=null ? getTablebase(os) : null;
|
|
| 251 | 251 |
mScrambler = new ObjectScrambler(scramblingType,mNumAxis,mNumLayers,algorithms,edges,tablebase); |
| 252 | 252 |
|
| 253 | 253 |
boolean bandaged=false; |
| ... | ... | |
| 301 | 301 |
|
| 302 | 302 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 303 | 303 |
|
| 304 |
private TablebasesAbstract getTablebase(Resources res)
|
|
| 304 |
private TablebasesAbstract getTablebase(OperatingSystemInterface os)
|
|
| 305 | 305 |
{
|
| 306 | 306 |
ObjectSignature signature = getSignature(); |
| 307 | 307 |
long[] array = signature.getArray(); |
| 308 | 308 |
int len = array.length; |
| 309 | 309 |
int sig = (int)array[len-1]; |
| 310 | 310 |
|
| 311 |
return ImplementedTablebasesList.createPacked(res,sig);
|
|
| 311 |
return ImplementedTablebasesList.createPacked(os,sig);
|
|
| 312 | 312 |
} |
| 313 | 313 |
|
| 314 | 314 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Move opening local files to the OSInterface