Revision cf93ea4e
Added by Leszek Koltunski about 1 year ago
| src/main/java/org/distorted/objectlib/objects/TwistyMixup.java | ||
|---|---|---|
| 11 | 11 |
|
| 12 | 12 |
import org.distorted.library.type.Static3D; |
| 13 | 13 |
import org.distorted.library.type.Static4D; |
| 14 |
import org.distorted.objectlib.main.InitAssets; |
|
| 14 | 15 |
import org.distorted.objectlib.main.InitData; |
| 15 | 16 |
import org.distorted.objectlib.shape.ShapeHexahedron; |
| 16 | 17 |
import org.distorted.objectlib.touchcontrol.TouchControlHexahedron; |
| 17 | 18 |
|
| 18 |
import java.io.InputStream; |
|
| 19 |
|
|
| 20 | 19 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_HEXAHEDRON; |
| 21 | 20 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_NOT_SPLIT; |
| 22 | 21 |
|
| ... | ... | |
| 39 | 38 |
|
| 40 | 39 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 41 | 40 |
|
| 42 |
public TwistyMixup(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 41 |
public TwistyMixup(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 43 | 42 |
{
|
| 44 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 43 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 45 | 44 |
} |
| 46 | 45 |
|
| 47 | 46 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
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)