Revision cf93ea4e
Added by Leszek Koltunski about 1 year ago
| src/main/java/org/distorted/objectlib/objects/TwistyBandagedCuboid.java | ||
|---|---|---|
| 11 | 11 |
|
| 12 | 12 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_CUBOID; |
| 13 | 13 |
|
| 14 |
import java.io.InputStream; |
|
| 15 |
|
|
| 16 | 14 |
import org.distorted.library.effect.EffectName; |
| 17 | 15 |
import org.distorted.library.main.DistortedLibrary; |
| 18 | 16 |
import org.distorted.library.type.Static3D; |
| ... | ... | |
| 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.helpers.ObjectShape; |
| 27 | 26 |
import org.distorted.objectlib.main.ObjectType; |
| ... | ... | |
| 232 | 231 |
|
| 233 | 232 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 234 | 233 |
|
| 235 |
public TwistyBandagedCuboid(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 234 |
public TwistyBandagedCuboid(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 236 | 235 |
{
|
| 237 |
super(data, meshState, iconMode, (data.getNumLayers()[0]+data.getNumLayers()[1]+data.getNumLayers()[2])/3.0f, quat, move, scale, stream);
|
|
| 236 |
super(meshState, iconMode, (data.getNumLayers()[0]+data.getNumLayers()[1]+data.getNumLayers()[2])/3.0f, quat, move, scale, data, asset);
|
|
| 238 | 237 |
} |
| 239 | 238 |
|
| 240 | 239 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
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)