Revision cf93ea4e
Added by Leszek Koltunski about 1 year ago
src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java | ||
---|---|---|
12 | 12 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_OCTAHEDRON; |
13 | 13 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_NOT_SPLIT; |
14 | 14 |
|
15 |
import java.io.InputStream; |
|
16 |
|
|
17 | 15 |
import org.distorted.library.type.Static3D; |
18 | 16 |
import org.distorted.library.type.Static4D; |
19 | 17 |
|
... | ... | |
21 | 19 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
22 | 20 |
import org.distorted.objectlib.helpers.ObjectSignature; |
23 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
22 |
import org.distorted.objectlib.main.InitAssets; |
|
24 | 23 |
import org.distorted.objectlib.main.ObjectSignatures; |
25 | 24 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
26 | 25 |
import org.distorted.objectlib.main.InitData; |
... | ... | |
50 | 49 |
|
51 | 50 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
52 | 51 |
|
53 |
public TwistyDiamond(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
52 |
public TwistyDiamond(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
54 | 53 |
{ |
55 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
54 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
56 | 55 |
} |
57 | 56 |
|
58 | 57 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
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)