Revision cf93ea4e
Added by Leszek Koltunski about 1 year ago
src/main/java/org/distorted/objectlib/objects/TwistyMegaminx.java | ||
---|---|---|
12 | 12 |
import static org.distorted.objectlib.touchcontrol.TouchControlDodecahedron.COS54; |
13 | 13 |
import static org.distorted.objectlib.touchcontrol.TouchControlDodecahedron.SIN54; |
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 |
import org.distorted.library.main.QuatHelper; |
... | ... | |
22 | 20 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
23 | 21 |
import org.distorted.objectlib.helpers.ObjectSignature; |
24 | 22 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
23 |
import org.distorted.objectlib.main.InitAssets; |
|
25 | 24 |
import org.distorted.objectlib.main.InitData; |
26 | 25 |
import org.distorted.objectlib.main.ObjectSignatures; |
27 | 26 |
import org.distorted.objectlib.main.ObjectType; |
... | ... | |
36 | 35 |
|
37 | 36 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
38 | 37 |
|
39 |
public TwistyMegaminx(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
38 |
public TwistyMegaminx(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
40 | 39 |
{ |
41 |
super(data, meshState, iconMode, quat, move, scale, stream);
|
|
40 |
super(meshState, iconMode, quat, move, scale, data, asset);
|
|
42 | 41 |
} |
43 | 42 |
|
44 | 43 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
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)