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/TwistyCamouflage.java
18 18
import org.distorted.objectlib.helpers.ObjectShape;
19 19
import org.distorted.objectlib.helpers.ObjectSignature;
20 20
import org.distorted.objectlib.helpers.ObjectVertexEffects;
21
import org.distorted.objectlib.main.InitAssets;
21 22
import org.distorted.objectlib.main.InitData;
22 23
import org.distorted.objectlib.main.ObjectSignatures;
23 24
import org.distorted.objectlib.main.ObjectType;
24 25
import org.distorted.objectlib.scrambling.ObjectScrambler;
25 26

  
26
import java.io.InputStream;
27

  
28 27
///////////////////////////////////////////////////////////////////////////////////////////////////
29 28

  
30 29
public class TwistyCamouflage extends TwistyBandagedAbstract
......
120 119

  
121 120
///////////////////////////////////////////////////////////////////////////////////////////////////
122 121

  
123
  public TwistyCamouflage(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
122
  public TwistyCamouflage(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
124 123
    {
125
    super(data, meshState, iconMode, SIZE_CORRECTION*(data.getNumLayers()[0]+data.getNumLayers()[1]+data.getNumLayers()[2])/3.0f, quat, move, scale, stream);
124
    super(meshState, iconMode, SIZE_CORRECTION*(data.getNumLayers()[0]+data.getNumLayers()[1]+data.getNumLayers()[2])/3.0f,
125
          quat, move, scale, data, asset);
126 126
    }
127 127

  
128 128
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff