Revision cf93ea4e
Added by Leszek Koltunski about 1 year ago
src/main/java/org/distorted/objectlib/objects/TwistyMorphix.java | ||
---|---|---|
16 | 16 |
import org.distorted.objectlib.helpers.ObjectShape; |
17 | 17 |
import org.distorted.objectlib.helpers.ObjectSignature; |
18 | 18 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
19 |
import org.distorted.objectlib.main.InitAssets; |
|
19 | 20 |
import org.distorted.objectlib.main.InitData; |
20 | 21 |
import org.distorted.objectlib.main.ObjectSignatures; |
21 | 22 |
import org.distorted.objectlib.main.ObjectType; |
... | ... | |
23 | 24 |
import org.distorted.objectlib.shape.ShapeTetrahedron; |
24 | 25 |
import org.distorted.objectlib.touchcontrol.TouchControlTetrahedron; |
25 | 26 |
|
26 |
import java.io.InputStream; |
|
27 |
|
|
28 | 27 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_CHANGING_SHAPEMOD; |
29 | 28 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_NOT_SPLIT; |
30 | 29 |
|
... | ... | |
52 | 51 |
|
53 | 52 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
54 | 53 |
|
55 |
public TwistyMorphix(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
54 |
public TwistyMorphix(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
56 | 55 |
{ |
57 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
56 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
58 | 57 |
} |
59 | 58 |
|
60 | 59 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
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)