Revision 82eb152a
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/objects/TwistySquare2.java | ||
|---|---|---|
| 19 | 19 |
|
| 20 | 20 |
package org.distorted.objectlib.objects; |
| 21 | 21 |
|
| 22 |
import android.content.res.Resources;
|
|
| 22 |
import java.io.InputStream;
|
|
| 23 | 23 |
|
| 24 | 24 |
import org.distorted.library.type.Static3D; |
| 25 | 25 |
import org.distorted.library.type.Static4D; |
| 26 | 26 |
|
| 27 |
import org.distorted.objectlib.R; |
|
| 28 | 27 |
import org.distorted.objectlib.main.ObjectControl; |
| 29 | 28 |
import org.distorted.objectlib.main.ObjectType; |
| 30 | 29 |
import org.distorted.objectlib.helpers.ObjectShape; |
| ... | ... | |
| 46 | 45 |
|
| 47 | 46 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 48 | 47 |
|
| 49 |
public TwistySquare2(int[] numL, Static4D quat, Static3D move, Resources res)
|
|
| 48 |
public TwistySquare2(int[] numL, Static4D quat, Static3D move, InputStream stream)
|
|
| 50 | 49 |
{
|
| 51 |
super(numL, quat, move, res);
|
|
| 50 |
super(numL, quat, move, stream);
|
|
| 52 | 51 |
} |
| 53 | 52 |
|
| 54 | 53 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 76 | 75 |
return mStates; |
| 77 | 76 |
} |
| 78 | 77 |
|
| 79 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 80 |
|
|
| 81 |
protected int getResource(int[] numLayers) |
|
| 82 |
{
|
|
| 83 |
return R.raw.squ2_3; |
|
| 84 |
} |
|
| 85 |
|
|
| 86 | 78 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 87 | 79 |
|
| 88 | 80 |
public int[] getSolvedQuats(int cubit, int[] numLayers) |
Also available in: Unified diff
JsonReader (?) finished: the creator app can now read objects from JSON files.