Revision cf93ea4e
Added by Leszek Koltunski about 1 year ago
src/main/java/org/distorted/objectlib/main/TwistyJson.java | ||
---|---|---|
9 | 9 |
|
10 | 10 |
package org.distorted.objectlib.main; |
11 | 11 |
|
12 |
import java.io.InputStream; |
|
13 |
|
|
14 | 12 |
import org.distorted.library.type.Static3D; |
15 | 13 |
import org.distorted.library.type.Static4D; |
16 | 14 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
... | ... | |
19 | 17 |
import org.distorted.objectlib.helpers.ObjectSticker; |
20 | 18 |
import org.distorted.objectlib.helpers.ObjectStickerOverride; |
21 | 19 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
22 |
import org.distorted.objectlib.scrambling.ScrambleState; |
|
23 | 20 |
import org.distorted.objectlib.json.JsonReader; |
24 | 21 |
import org.distorted.objectlib.shape.ShapeDiamond; |
25 | 22 |
import org.distorted.objectlib.shape.ShapeDodecahedron; |
... | ... | |
42 | 39 |
|
43 | 40 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
44 | 41 |
|
45 |
public TwistyJson(InputStream jsonStream, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream meshStream)
|
|
42 |
public TwistyJson(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitAssets assets)
|
|
46 | 43 |
{ |
47 |
super(jsonStream, meshState, iconMode, quat, move, scale, meshStream);
|
|
44 |
super(meshState, iconMode, quat, move, scale, assets);
|
|
48 | 45 |
} |
49 | 46 |
|
50 | 47 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
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)