Project

General

Profile

« Previous | Next » 

Revision cf93ea4e

Added by Leszek Koltunski about 1 year ago

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)

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyMixup3x3.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;
22 23

  
23
import java.io.InputStream;
24

  
25 24
///////////////////////////////////////////////////////////////////////////////////////////////////
26 25

  
27 26
public class TwistyMixup3x3 extends TwistyMixup
......
31 30

  
32 31
///////////////////////////////////////////////////////////////////////////////////////////////////
33 32

  
34
  public TwistyMixup3x3(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
33
  public TwistyMixup3x3(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
35 34
    {
36
    super(data, meshState, iconMode, quat, move, scale, stream);
35
    super(meshState, iconMode, quat, move, scale, data, asset);
37 36
    }
38 37

  
39 38
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff