Revision 82eb152a
Added by Leszek Koltunski over 2 years ago
src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java | ||
---|---|---|
22 | 22 |
import static org.distorted.objectlib.main.Movement.MOVEMENT_OCTAHEDRON; |
23 | 23 |
import static org.distorted.objectlib.main.Movement.TYPE_NOT_SPLIT; |
24 | 24 |
|
25 |
import android.content.res.Resources;
|
|
25 |
import java.io.InputStream;
|
|
26 | 26 |
|
27 | 27 |
import org.distorted.library.type.Static3D; |
28 | 28 |
import org.distorted.library.type.Static4D; |
29 | 29 |
|
30 |
import org.distorted.objectlib.R; |
|
31 | 30 |
import org.distorted.objectlib.main.Movement8; |
32 | 31 |
import org.distorted.objectlib.main.ObjectControl; |
33 | 32 |
import org.distorted.objectlib.main.ObjectType; |
... | ... | |
59 | 58 |
|
60 | 59 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
61 | 60 |
|
62 |
public TwistyDiamond(int[] numL, Static4D quat, Static3D move, Resources res)
|
|
61 |
public TwistyDiamond(int[] numL, Static4D quat, Static3D move, InputStream stream)
|
|
63 | 62 |
{ |
64 |
super(numL, numL[0], quat, move, res);
|
|
63 |
super(numL, numL[0], quat, move, stream);
|
|
65 | 64 |
} |
66 | 65 |
|
67 | 66 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
90 | 89 |
return mStates; |
91 | 90 |
} |
92 | 91 |
|
93 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
94 |
|
|
95 |
protected int getResource(int[] numLayers) |
|
96 |
{ |
|
97 |
switch(numLayers[0]) |
|
98 |
{ |
|
99 |
case 2: return R.raw.diam_2; |
|
100 |
case 3: return R.raw.diam_3; |
|
101 |
case 4: return R.raw.diam_4; |
|
102 |
} |
|
103 |
|
|
104 |
return 0; |
|
105 |
} |
|
106 |
|
|
107 | 92 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
108 | 93 |
|
109 | 94 |
private void initializeQuats() |
Also available in: Unified diff
JsonReader (?) finished: the creator app can now read objects from JSON files.