Revision 82eb152a
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/objects/TwistyHelicopter.java | ||
|---|---|---|
| 22 | 22 |
import static org.distorted.objectlib.main.Movement.MOVEMENT_HEXAHEDRON; |
| 23 | 23 |
import static org.distorted.objectlib.main.Movement.TYPE_SPLIT_EDGE; |
| 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.Movement6; |
| 32 | 31 |
import org.distorted.objectlib.main.ObjectControl; |
| 33 | 32 |
import org.distorted.objectlib.main.ObjectType; |
| ... | ... | |
| 62 | 61 |
|
| 63 | 62 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 64 | 63 |
|
| 65 |
public TwistyHelicopter(int[] numL, Static4D quat, Static3D move,Resources res)
|
|
| 64 |
public TwistyHelicopter(int[] numL, Static4D quat, Static3D move, InputStream stream)
|
|
| 66 | 65 |
{
|
| 67 |
super(numL, numL[0], quat, move, res);
|
|
| 66 |
super(numL, numL[0], quat, move, stream);
|
|
| 68 | 67 |
} |
| 69 | 68 |
|
| 70 | 69 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 94 | 93 |
return mStates; |
| 95 | 94 |
} |
| 96 | 95 |
|
| 97 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 98 |
|
|
| 99 |
protected int getResource(int[] numLayers) |
|
| 100 |
{
|
|
| 101 |
return R.raw.heli_3; |
|
| 102 |
} |
|
| 103 |
|
|
| 104 | 96 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 105 | 97 |
|
| 106 | 98 |
private void initializeQuats() |
Also available in: Unified diff
JsonReader (?) finished: the creator app can now read objects from JSON files.