Revision cf93ea4e
Added by Leszek Koltunski about 1 year ago
| src/main/java/org/distorted/objectlib/main/InitAssets.java | ||
|---|---|---|
| 1 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 2 |
// Copyright 2019 Leszek Koltunski // |
|
| 3 |
// // |
|
| 4 |
// This file is part of Magic Cube. // |
|
| 5 |
// // |
|
| 6 |
// Magic Cube is proprietary software licensed under an EULA which you should have received // |
|
| 7 |
// along with the code. If not, check https://distorted.org/magic/License-Magic-Cube.html // |
|
| 8 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 9 |
|
|
| 10 |
package org.distorted.objectlib.main; |
|
| 11 |
|
|
| 12 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 13 |
|
|
| 14 |
import java.io.InputStream; |
|
| 15 |
|
|
| 16 |
public class InitAssets |
|
| 17 |
{
|
|
| 18 |
InputStream mJsonStream; |
|
| 19 |
InputStream mMeshStream; |
|
| 20 |
|
|
| 21 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 22 |
|
|
| 23 |
public InitAssets(InputStream jsonStream) |
|
| 24 |
{
|
|
| 25 |
mJsonStream = jsonStream; |
|
| 26 |
} |
|
| 27 |
|
|
| 28 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 29 |
|
|
| 30 |
public InitAssets(InputStream jsonStream, InputStream meshStream) |
|
| 31 |
{
|
|
| 32 |
mJsonStream = jsonStream; |
|
| 33 |
mMeshStream = meshStream; |
|
| 34 |
} |
|
| 35 |
|
|
| 36 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 37 |
|
|
| 38 |
public boolean noJsonStream() |
|
| 39 |
{
|
|
| 40 |
return mJsonStream==null; |
|
| 41 |
} |
|
| 42 |
|
|
| 43 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 44 |
|
|
| 45 |
public InputStream getJsonStream() |
|
| 46 |
{
|
|
| 47 |
return mJsonStream; |
|
| 48 |
} |
|
| 49 |
|
|
| 50 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 51 |
|
|
| 52 |
public InputStream getMeshStream() |
|
| 53 |
{
|
|
| 54 |
return mMeshStream; |
|
| 55 |
} |
|
| 56 |
} |
|
| src/main/java/org/distorted/objectlib/main/ObjectControl.java | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
package org.distorted.objectlib.main; |
| 11 | 11 |
|
| 12 |
import java.io.InputStream; |
|
| 13 |
|
|
| 14 | 12 |
import android.app.Activity; |
| 15 | 13 |
import android.content.SharedPreferences; |
| 16 | 14 |
import android.util.DisplayMetrics; |
| ... | ... | |
| 696 | 694 |
|
| 697 | 695 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 698 | 696 |
|
| 699 |
public void changeObject(int ordinal, int meshState, int iconMode, InputStream jsonStream, InputStream meshStream)
|
|
| 697 |
public void changeObject(int ordinal, int meshState, int iconMode, InitAssets asset)
|
|
| 700 | 698 |
{
|
| 701 |
mPreRender.changeObject(ordinal, meshState, iconMode, jsonStream, meshStream);
|
|
| 699 |
mPreRender.changeObject(ordinal, meshState, iconMode, asset);
|
|
| 702 | 700 |
} |
| 703 | 701 |
|
| 704 | 702 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 705 | 703 |
|
| 706 |
public void changeIfDifferent(int ordinal, String newName, int meshState, int iconMode, InputStream jsonStream, InputStream meshStream)
|
|
| 704 |
public void changeIfDifferent(int ordinal, String newName, int meshState, int iconMode, InitAssets asset)
|
|
| 707 | 705 |
{
|
| 708 | 706 |
TwistyObject object = mPreRender.getObject(); |
| 709 | 707 |
String oldName = object==null ? "" : object.getShortName(); |
| ... | ... | |
| 712 | 710 |
{
|
| 713 | 711 |
mMeshState = meshState; |
| 714 | 712 |
mIconMode = iconMode; |
| 715 |
mPreRender.changeObject(ordinal, meshState, iconMode, jsonStream, meshStream);
|
|
| 713 |
mPreRender.changeObject(ordinal, meshState, iconMode, asset);
|
|
| 716 | 714 |
} |
| 717 | 715 |
} |
| 718 | 716 |
|
| src/main/java/org/distorted/objectlib/main/ObjectPreRender.java | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
package org.distorted.objectlib.main; |
| 11 | 11 |
|
| 12 |
import java.io.InputStream; |
|
| 13 |
|
|
| 14 | 12 |
import android.app.Activity; |
| 15 | 13 |
import android.content.SharedPreferences; |
| 16 | 14 |
|
| ... | ... | |
| 35 | 33 |
private static final int MAX_SLOW_SCRAMBLE = 50; |
| 36 | 34 |
|
| 37 | 35 |
private final ObjectControl mController; |
| 38 |
private InputStream mJsonStream, mMeshStream;
|
|
| 36 |
private InitAssets mAsset;
|
|
| 39 | 37 |
private int mOrdinal; |
| 40 | 38 |
private TwistyObject mOldObject, mNewObject; |
| 41 | 39 |
private SharedPreferences mPreferences; |
| ... | ... | |
| 102 | 100 |
|
| 103 | 101 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 104 | 102 |
|
| 105 |
private void createObjectNow(int ordinal, int meshState, int iconMode, InputStream jsonStream, InputStream meshStream)
|
|
| 103 |
private void createObjectNow(int ordinal, int meshState, int iconMode, InitAssets assets)
|
|
| 106 | 104 |
{
|
| 107 | 105 |
long time1 = System.currentTimeMillis(); |
| 108 | 106 |
Static3D move = new Static3D(mMoveX,mMoveY,0); |
| ... | ... | |
| 110 | 108 |
TwistyObject tmp; |
| 111 | 109 |
boolean error = false; |
| 112 | 110 |
|
| 113 |
if( jsonStream==null )
|
|
| 111 |
if( assets==null || assets.noJsonStream() )
|
|
| 114 | 112 |
{
|
| 115 |
tmp = ObjectType.create( ordinal, meshState, iconMode, quat, move, mScale, meshStream);
|
|
| 113 |
tmp = ObjectType.create( ordinal, meshState, iconMode, quat, move, mScale, assets);
|
|
| 116 | 114 |
} |
| 117 | 115 |
else |
| 118 | 116 |
{
|
| 119 |
tmp = new TwistyJson( jsonStream, meshState, iconMode, quat, move, mScale, meshStream);
|
|
| 117 |
tmp = new TwistyJson( meshState, iconMode, quat, move, mScale, assets);
|
|
| 120 | 118 |
error = tmp.getError(); |
| 121 | 119 |
} |
| 122 | 120 |
|
| ... | ... | |
| 275 | 273 |
{
|
| 276 | 274 |
mChangeObject = false; |
| 277 | 275 |
blockEverything(BlockController.PLACE_1); |
| 278 |
createObjectNow(mOrdinal,mMeshState,mIconMode,mJsonStream,mMeshStream);
|
|
| 276 |
createObjectNow(mOrdinal,mMeshState,mIconMode,mAsset);
|
|
| 279 | 277 |
int duration = BaseEffect.Type.SIZECHANGE.getDuration(); |
| 280 | 278 |
doEffectNow( BaseEffect.Type.SIZECHANGE, duration ); |
| 281 | 279 |
} |
| ... | ... | |
| 531 | 529 |
|
| 532 | 530 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 533 | 531 |
|
| 534 |
public void changeObject(int ordinal, int meshState, int iconMode, InputStream jsonStream, InputStream meshStream)
|
|
| 532 |
public void changeObject(int ordinal, int meshState, int iconMode, InitAssets asset)
|
|
| 535 | 533 |
{
|
| 536 | 534 |
mChangeObject = true; |
| 537 | 535 |
mOrdinal = ordinal; |
| 538 | 536 |
mMeshState = meshState; |
| 539 | 537 |
mIconMode = iconMode; |
| 540 |
mJsonStream = jsonStream; |
|
| 541 |
mMeshStream = meshStream; |
|
| 538 |
mAsset = asset; |
|
| 542 | 539 |
} |
| 543 | 540 |
|
| 544 | 541 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/main/ObjectType.java | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
package org.distorted.objectlib.main; |
| 11 | 11 |
|
| 12 |
import java.io.InputStream; |
|
| 13 | 12 |
import java.lang.reflect.Constructor; |
| 14 | 13 |
import java.lang.reflect.InvocationTargetException; |
| 15 | 14 |
|
| ... | ... | |
| 186 | 185 |
|
| 187 | 186 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 188 | 187 |
|
| 189 |
public static TwistyObject create(int ordinal, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream meshStream)
|
|
| 188 |
public static TwistyObject create(int ordinal, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitAssets asset)
|
|
| 190 | 189 |
{
|
| 191 | 190 |
/* |
| 192 | 191 |
if( ordinal==MORP_2.ordinal() ) |
| 193 | 192 |
{
|
| 194 |
return new TwistyMorphix(objects[ordinal].mInitData,meshState,iconMode,quat,move,scale,meshStream);
|
|
| 193 |
return new TwistyMorphix(meshState,iconMode,quat,move,scale,objects[ordinal].mInitData,asset);
|
|
| 195 | 194 |
} |
| 196 | 195 |
*/ |
| 197 | 196 |
|
| ... | ... | |
| 206 | 205 |
if( cons.length==1 ) |
| 207 | 206 |
{
|
| 208 | 207 |
InitData data = objects[ordinal].mInitData; |
| 209 |
Object[] parameters = new Object[] { data,meshState,iconMode,quat,move,scale,meshStream };
|
|
| 208 |
Object[] parameters = new Object[] { meshState,iconMode,quat,move,scale,data,asset };
|
|
| 210 | 209 |
return (TwistyObject)cons[0].newInstance(parameters); |
| 211 | 210 |
} |
| 212 | 211 |
else |
| 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 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 158 | 158 |
|
| 159 | 159 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 160 | 160 |
|
| 161 |
TwistyObject(InputStream jsonStream, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream meshStream)
|
|
| 161 |
TwistyObject(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitAssets assets)
|
|
| 162 | 162 |
{
|
| 163 | 163 |
try |
| 164 | 164 |
{
|
| 165 |
InputStream jsonStream = assets!=null ? assets.getJsonStream(): null; |
|
| 166 |
InputStream meshStream = assets!=null ? assets.getMeshStream(): null; |
|
| 165 | 167 |
JsonReader reader = new JsonReader(); |
| 166 | 168 |
reader.parseJsonFile(jsonStream); |
| 167 | 169 |
setReader(reader); |
| ... | ... | |
| 181 | 183 |
|
| 182 | 184 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 183 | 185 |
|
| 184 |
public TwistyObject(InitData data, int meshState, int iconMode, float size, Static4D quat, Static3D move, float scale, InputStream meshStream)
|
|
| 186 |
public TwistyObject(int meshState, int iconMode, float size, Static4D quat, Static3D move, float scale, InitData data, InitAssets assets)
|
|
| 185 | 187 |
{
|
| 186 | 188 |
mNumLayers = data.getNumLayers(); |
| 187 | 189 |
mSize = size; |
| 188 | 190 |
mInitData = data; |
| 191 |
InputStream meshStream = assets!=null ? assets.getMeshStream() : null; |
|
| 189 | 192 |
initialize(meshState,iconMode,quat,move,scale,meshStream,false); |
| 190 | 193 |
mError = false; |
| 191 | 194 |
mErrorString = null; |
| src/main/java/org/distorted/objectlib/objects/TwistyAxis.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.ObjectSignatures; |
| 20 | 21 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 21 | 22 |
import org.distorted.objectlib.main.InitData; |
| ... | ... | |
| 23 | 24 |
import org.distorted.objectlib.shape.ShapeHexahedron; |
| 24 | 25 |
import org.distorted.objectlib.touchcontrol.TouchControlHexahedron; |
| 25 | 26 |
|
| 26 |
import java.io.InputStream; |
|
| 27 |
|
|
| 28 | 27 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_CHANGING_SHAPEMOD; |
| 29 | 28 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_NOT_SPLIT; |
| 30 | 29 |
|
| ... | ... | |
| 47 | 46 |
|
| 48 | 47 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 49 | 48 |
|
| 50 |
public TwistyAxis(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 49 |
public TwistyAxis(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 51 | 50 |
{
|
| 52 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 51 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 53 | 52 |
} |
| 54 | 53 |
|
| 55 | 54 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyBandagedAbstract.java | ||
|---|---|---|
| 15 | 15 |
import org.distorted.library.type.Static4D; |
| 16 | 16 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 17 | 17 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 18 |
import org.distorted.objectlib.main.InitAssets; |
|
| 18 | 19 |
import org.distorted.objectlib.main.InitData; |
| 19 | 20 |
import org.distorted.objectlib.shape.ShapeHexahedron; |
| 20 | 21 |
import org.distorted.objectlib.touchcontrol.TouchControlHexahedron; |
| 21 | 22 |
|
| 22 |
import java.io.InputStream; |
|
| 23 |
|
|
| 24 | 23 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 25 | 24 |
|
| 26 | 25 |
public abstract class TwistyBandagedAbstract extends ShapeHexahedron |
| ... | ... | |
| 43 | 42 |
|
| 44 | 43 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 45 | 44 |
|
| 46 |
public TwistyBandagedAbstract(InitData data, int meshState, int iconMode, float size, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 45 |
public TwistyBandagedAbstract(int meshState, int iconMode, float size, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 47 | 46 |
{
|
| 48 |
super(data, meshState, iconMode, size, quat, move, scale, stream);
|
|
| 47 |
super(meshState, iconMode, size, quat, move, scale, data, asset);
|
|
| 49 | 48 |
} |
| 50 | 49 |
|
| 51 | 50 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 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 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 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 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyContainer.java | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
package org.distorted.objectlib.objects; |
| 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.FactoryCubit; |
| ... | ... | |
| 18 | 16 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 19 | 17 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 20 | 18 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 19 |
import org.distorted.objectlib.main.InitAssets; |
|
| 21 | 20 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 22 | 21 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 23 | 22 |
import org.distorted.objectlib.main.InitData; |
| ... | ... | |
| 47 | 46 |
|
| 48 | 47 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 49 | 48 |
|
| 50 |
public TwistyContainer(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 49 |
public TwistyContainer(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 51 | 50 |
{
|
| 52 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 51 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 53 | 52 |
} |
| 54 | 53 |
|
| 55 | 54 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyCrazy2x2.java | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
package org.distorted.objectlib.objects; |
| 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.FactoryCubit; |
| ... | ... | |
| 18 | 16 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 19 | 17 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 20 | 18 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 19 |
import org.distorted.objectlib.main.InitAssets; |
|
| 21 | 20 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 22 | 21 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 23 | 22 |
import org.distorted.objectlib.main.TwistyObjectCubit; |
| ... | ... | |
| 53 | 52 |
|
| 54 | 53 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 55 | 54 |
|
| 56 |
public TwistyCrazy2x2(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 55 |
public TwistyCrazy2x2(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 57 | 56 |
{
|
| 58 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 57 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 59 | 58 |
} |
| 60 | 59 |
|
| 61 | 60 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyCrazy3x3.java | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
package org.distorted.objectlib.objects; |
| 11 | 11 |
|
| 12 |
import java.io.InputStream; |
|
| 13 | 12 |
import java.util.ArrayList; |
| 14 | 13 |
|
| 15 | 14 |
import org.distorted.library.type.Static3D; |
| ... | ... | |
| 20 | 19 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 21 | 20 |
import org.distorted.objectlib.helpers.ObjectStickerOverride; |
| 22 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 22 |
import org.distorted.objectlib.main.InitAssets; |
|
| 23 | 23 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 24 | 24 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 25 | 25 |
import org.distorted.objectlib.main.TwistyObjectCubit; |
| ... | ... | |
| 66 | 66 |
|
| 67 | 67 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 68 | 68 |
|
| 69 |
public TwistyCrazy3x3(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 69 |
public TwistyCrazy3x3(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 70 | 70 |
{
|
| 71 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 71 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 72 | 72 |
} |
| 73 | 73 |
|
| 74 | 74 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyCrystal.java | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
package org.distorted.objectlib.objects; |
| 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.FactoryCubit; |
| ... | ... | |
| 18 | 16 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 19 | 17 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 20 | 18 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 19 |
import org.distorted.objectlib.main.InitAssets; |
|
| 21 | 20 |
import org.distorted.objectlib.main.InitData; |
| 22 | 21 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 23 | 22 |
import org.distorted.objectlib.main.ObjectType; |
| ... | ... | |
| 34 | 33 |
|
| 35 | 34 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 36 | 35 |
|
| 37 |
public TwistyCrystal(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 36 |
public TwistyCrystal(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 38 | 37 |
{
|
| 39 |
super(data, meshState, iconMode, quat, move, scale, stream);
|
|
| 38 |
super(meshState, iconMode, quat, move, scale, data, asset);
|
|
| 40 | 39 |
} |
| 41 | 40 |
|
| 42 | 41 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyCuboid.java | ||
|---|---|---|
| 12 | 12 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_CUBOID; |
| 13 | 13 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_NOT_SPLIT; |
| 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 |
|
| ... | ... | |
| 21 | 19 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 22 | 20 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 22 |
import org.distorted.objectlib.main.InitAssets; |
|
| 24 | 23 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 25 | 24 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 26 | 25 |
import org.distorted.objectlib.main.InitData; |
| ... | ... | |
| 46 | 45 |
|
| 47 | 46 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 48 | 47 |
|
| 49 |
public TwistyCuboid(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 48 |
public TwistyCuboid(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 50 | 49 |
{
|
| 51 |
super(data, meshState, iconMode, (data.getNumLayers()[0]+data.getNumLayers()[1]+data.getNumLayers()[2])/3.0f, quat, move, scale, stream);
|
|
| 50 |
super(meshState, iconMode, (data.getNumLayers()[0]+data.getNumLayers()[1]+data.getNumLayers()[2])/3.0f, quat, move, scale, data, asset);
|
|
| 52 | 51 |
} |
| 53 | 52 |
|
| 54 | 53 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java | ||
|---|---|---|
| 12 | 12 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_OCTAHEDRON; |
| 13 | 13 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_NOT_SPLIT; |
| 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 |
|
| ... | ... | |
| 21 | 19 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 22 | 20 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 22 |
import org.distorted.objectlib.main.InitAssets; |
|
| 24 | 23 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 25 | 24 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 26 | 25 |
import org.distorted.objectlib.main.InitData; |
| ... | ... | |
| 50 | 49 |
|
| 51 | 50 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 52 | 51 |
|
| 53 |
public TwistyDiamond(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 52 |
public TwistyDiamond(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 54 | 53 |
{
|
| 55 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 54 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 56 | 55 |
} |
| 57 | 56 |
|
| 58 | 57 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyDino.java | ||
|---|---|---|
| 12 | 12 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_HEXAHEDRON; |
| 13 | 13 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_SPLIT_CORNER; |
| 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 |
|
| ... | ... | |
| 21 | 19 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 22 | 20 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 23 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 22 |
import org.distorted.objectlib.main.InitAssets; |
|
| 24 | 23 |
import org.distorted.objectlib.main.InitData; |
| 25 | 24 |
import org.distorted.objectlib.shape.ShapeHexahedron; |
| 26 | 25 |
import org.distorted.objectlib.touchcontrol.TouchControlHexahedron; |
| ... | ... | |
| 45 | 44 |
|
| 46 | 45 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 47 | 46 |
|
| 48 |
TwistyDino(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 47 |
TwistyDino(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 49 | 48 |
{
|
| 50 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 49 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 51 | 50 |
} |
| 52 | 51 |
|
| 53 | 52 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyDino4.java | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
package org.distorted.objectlib.objects; |
| 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 |
|
| 17 | 15 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 16 |
import org.distorted.objectlib.main.InitAssets; |
|
| 18 | 17 |
import org.distorted.objectlib.main.InitData; |
| 19 | 18 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 20 | 19 |
import org.distorted.objectlib.main.ObjectType; |
| ... | ... | |
| 27 | 26 |
|
| 28 | 27 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 29 | 28 |
|
| 30 |
public TwistyDino4(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 29 |
public TwistyDino4(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 31 | 30 |
{
|
| 32 |
super(data, meshState, iconMode, quat, move, scale, stream);
|
|
| 31 |
super(meshState, iconMode, quat, move, scale, data, asset);
|
|
| 33 | 32 |
} |
| 34 | 33 |
|
| 35 | 34 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyDino6.java | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
package org.distorted.objectlib.objects; |
| 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 |
|
| 17 | 15 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 16 |
import org.distorted.objectlib.main.InitAssets; |
|
| 18 | 17 |
import org.distorted.objectlib.main.InitData; |
| 19 | 18 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 20 | 19 |
import org.distorted.objectlib.main.ObjectType; |
| ... | ... | |
| 23 | 22 |
|
| 24 | 23 |
public class TwistyDino6 extends TwistyDino |
| 25 | 24 |
{
|
| 26 |
public TwistyDino6(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 25 |
public TwistyDino6(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 27 | 26 |
{
|
| 28 |
super(data, meshState, iconMode, quat, move, scale, stream);
|
|
| 27 |
super(meshState, iconMode, quat, move, scale, data, asset);
|
|
| 29 | 28 |
} |
| 30 | 29 |
|
| 31 | 30 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyDodecahedron.java | ||
|---|---|---|
| 15 | 15 |
import static org.distorted.objectlib.touchcontrol.TouchControlDodecahedron.LEN; |
| 16 | 16 |
import static org.distorted.objectlib.touchcontrol.TouchControlDodecahedron.SIN54; |
| 17 | 17 |
|
| 18 |
import java.io.InputStream; |
|
| 19 |
|
|
| 20 | 18 |
import org.distorted.library.type.Static3D; |
| 21 | 19 |
import org.distorted.library.type.Static4D; |
| 20 |
import org.distorted.objectlib.main.InitAssets; |
|
| 22 | 21 |
import org.distorted.objectlib.main.InitData; |
| 23 | 22 |
import org.distorted.objectlib.touchcontrol.TouchControlDodecahedron; |
| 24 | 23 |
import org.distorted.objectlib.shape.ShapeDodecahedron; |
| ... | ... | |
| 57 | 56 |
|
| 58 | 57 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 59 | 58 |
|
| 60 |
TwistyDodecahedron(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 59 |
TwistyDodecahedron(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 61 | 60 |
{
|
| 62 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 61 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 63 | 62 |
} |
| 64 | 63 |
|
| 65 | 64 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyFisher.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.ObjectSignatures; |
| 20 | 21 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 21 | 22 |
import org.distorted.objectlib.main.InitData; |
| ... | ... | |
| 23 | 24 |
import org.distorted.objectlib.shape.ShapeHexahedron; |
| 24 | 25 |
import org.distorted.objectlib.touchcontrol.TouchControlHexahedron; |
| 25 | 26 |
|
| 26 |
import java.io.InputStream; |
|
| 27 |
|
|
| 28 | 27 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_CHANGING_SHAPEMOD; |
| 29 | 28 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_NOT_SPLIT; |
| 30 | 29 |
|
| ... | ... | |
| 47 | 46 |
|
| 48 | 47 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 49 | 48 |
|
| 50 |
public TwistyFisher(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 49 |
public TwistyFisher(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 51 | 50 |
{
|
| 52 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 51 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 53 | 52 |
} |
| 54 | 53 |
|
| 55 | 54 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyHelicopter.java | ||
|---|---|---|
| 12 | 12 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_HEXAHEDRON; |
| 13 | 13 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_SPLIT_EDGE; |
| 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 |
|
| ... | ... | |
| 21 | 19 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 22 | 20 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 22 |
import org.distorted.objectlib.main.InitAssets; |
|
| 24 | 23 |
import org.distorted.objectlib.main.InitData; |
| 25 | 24 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 26 | 25 |
import org.distorted.objectlib.touchcontrol.TouchControlHexahedron; |
| ... | ... | |
| 50 | 49 |
|
| 51 | 50 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 52 | 51 |
|
| 53 |
public TwistyHelicopter(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 52 |
public TwistyHelicopter(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 54 | 53 |
{
|
| 55 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 54 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 56 | 55 |
} |
| 57 | 56 |
|
| 58 | 57 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyIvy.java | ||
|---|---|---|
| 12 | 12 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_SPLIT_CORNER; |
| 13 | 13 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_HEXAHEDRON; |
| 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 |
|
| ... | ... | |
| 21 | 19 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 22 | 20 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 22 |
import org.distorted.objectlib.main.InitAssets; |
|
| 24 | 23 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 25 | 24 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 26 | 25 |
import org.distorted.objectlib.main.InitData; |
| ... | ... | |
| 51 | 50 |
|
| 52 | 51 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 53 | 52 |
|
| 54 |
public TwistyIvy(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 53 |
public TwistyIvy(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 55 | 54 |
{
|
| 56 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 55 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 57 | 56 |
} |
| 58 | 57 |
|
| 59 | 58 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyJing.java | ||
|---|---|---|
| 12 | 12 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_TETRAHEDRON; |
| 13 | 13 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_NOT_SPLIT; |
| 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 |
|
| ... | ... | |
| 21 | 19 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 22 | 20 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 22 |
import org.distorted.objectlib.main.InitAssets; |
|
| 24 | 23 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 25 | 24 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 26 | 25 |
import org.distorted.objectlib.main.InitData; |
| ... | ... | |
| 53 | 52 |
|
| 54 | 53 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 55 | 54 |
|
| 56 |
public TwistyJing(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 55 |
public TwistyJing(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 57 | 56 |
{
|
| 58 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 57 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 59 | 58 |
} |
| 60 | 59 |
|
| 61 | 60 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyKilominx.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; |
| ... | ... | |
| 31 | 30 |
|
| 32 | 31 |
public class TwistyKilominx extends TwistyDodecahedron |
| 33 | 32 |
{
|
| 34 |
public TwistyKilominx(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 33 |
public TwistyKilominx(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 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyMasterball.java | ||
|---|---|---|
| 19 | 19 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 20 | 20 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 21 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 22 |
import org.distorted.objectlib.main.InitAssets; |
|
| 22 | 23 |
import org.distorted.objectlib.main.InitData; |
| 23 | 24 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 24 | 25 |
import org.distorted.objectlib.main.ObjectType; |
| 25 | 26 |
import org.distorted.objectlib.shape.ShapeDiamond; |
| 26 | 27 |
import org.distorted.objectlib.touchcontrol.TouchControlBall; |
| 27 | 28 |
|
| 28 |
import java.io.InputStream; |
|
| 29 |
|
|
| 30 | 29 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 31 | 30 |
|
| 32 | 31 |
public class TwistyMasterball extends ShapeDiamond |
| ... | ... | |
| 50 | 49 |
|
| 51 | 50 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 52 | 51 |
|
| 53 |
public TwistyMasterball(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 52 |
public TwistyMasterball(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 54 | 53 |
{
|
| 55 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 54 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 56 | 55 |
} |
| 57 | 56 |
|
| 58 | 57 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 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 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyMirror.java | ||
|---|---|---|
| 12 | 12 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_CHANGING_MIRROR; |
| 13 | 13 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_NOT_SPLIT; |
| 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 |
|
| ... | ... | |
| 21 | 19 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 22 | 20 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 22 |
import org.distorted.objectlib.main.InitAssets; |
|
| 24 | 23 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 25 | 24 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 26 | 25 |
import org.distorted.objectlib.main.InitData; |
| ... | ... | |
| 52 | 51 |
|
| 53 | 52 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 54 | 53 |
|
| 55 |
public TwistyMirror(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 54 |
public TwistyMirror(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 56 | 55 |
{
|
| 57 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 56 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 58 | 57 |
} |
| 59 | 58 |
|
| 60 | 59 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyMixup.java | ||
|---|---|---|
| 11 | 11 |
|
| 12 | 12 |
import org.distorted.library.type.Static3D; |
| 13 | 13 |
import org.distorted.library.type.Static4D; |
| 14 |
import org.distorted.objectlib.main.InitAssets; |
|
| 14 | 15 |
import org.distorted.objectlib.main.InitData; |
| 15 | 16 |
import org.distorted.objectlib.shape.ShapeHexahedron; |
| 16 | 17 |
import org.distorted.objectlib.touchcontrol.TouchControlHexahedron; |
| 17 | 18 |
|
| 18 |
import java.io.InputStream; |
|
| 19 |
|
|
| 20 | 19 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_HEXAHEDRON; |
| 21 | 20 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_NOT_SPLIT; |
| 22 | 21 |
|
| ... | ... | |
| 39 | 38 |
|
| 40 | 39 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 41 | 40 |
|
| 42 |
public TwistyMixup(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 41 |
public TwistyMixup(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 43 | 42 |
{
|
| 44 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 43 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 45 | 44 |
} |
| 46 | 45 |
|
| 47 | 46 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 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 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyMixup3x3Plus.java | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
package org.distorted.objectlib.objects; |
| 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.FactoryCubit; |
| ... | ... | |
| 18 | 16 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 19 | 17 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 20 | 18 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 19 |
import org.distorted.objectlib.main.InitAssets; |
|
| 21 | 20 |
import org.distorted.objectlib.main.InitData; |
| 22 | 21 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 23 | 22 |
import org.distorted.objectlib.main.ObjectType; |
| ... | ... | |
| 31 | 30 |
|
| 32 | 31 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 33 | 32 |
|
| 34 |
public TwistyMixup3x3Plus(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 33 |
public TwistyMixup3x3Plus(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 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyMorphix.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; |
| ... | ... | |
| 23 | 24 |
import org.distorted.objectlib.shape.ShapeTetrahedron; |
| 24 | 25 |
import org.distorted.objectlib.touchcontrol.TouchControlTetrahedron; |
| 25 | 26 |
|
| 26 |
import java.io.InputStream; |
|
| 27 |
|
|
| 28 | 27 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_CHANGING_SHAPEMOD; |
| 29 | 28 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_NOT_SPLIT; |
| 30 | 29 |
|
| ... | ... | |
| 52 | 51 |
|
| 53 | 52 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 54 | 53 |
|
| 55 |
public TwistyMorphix(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 54 |
public TwistyMorphix(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 56 | 55 |
{
|
| 57 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 56 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 58 | 57 |
} |
| 59 | 58 |
|
| 60 | 59 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyPentultimate.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 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 23 | 24 |
|
| 24 |
import java.io.InputStream; |
|
| 25 |
|
|
| 26 | 25 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_NOT_SPLIT; |
| 27 | 26 |
import static org.distorted.objectlib.touchcontrol.TouchControlDodecahedron.C2; |
| 28 | 27 |
import static org.distorted.objectlib.touchcontrol.TouchControlDodecahedron.COS54; |
| ... | ... | |
| 38 | 37 |
|
| 39 | 38 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 40 | 39 |
|
| 41 |
public TwistyPentultimate(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 40 |
public TwistyPentultimate(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 42 | 41 |
{
|
| 43 |
super(data, meshState, iconMode, quat, move, scale, stream);
|
|
| 42 |
super(meshState, iconMode, quat, move, scale, data, asset);
|
|
| 44 | 43 |
} |
| 45 | 44 |
|
| 46 | 45 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyPyraminx.java | ||
|---|---|---|
| 12 | 12 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_TETRAHEDRON; |
| 13 | 13 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_NOT_SPLIT; |
| 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 |
|
| ... | ... | |
| 21 | 19 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 22 | 20 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 22 |
import org.distorted.objectlib.main.InitAssets; |
|
| 24 | 23 |
import org.distorted.objectlib.main.InitData; |
| 25 | 24 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 26 | 25 |
import org.distorted.objectlib.touchcontrol.TouchControlTetrahedron; |
| ... | ... | |
| 46 | 45 |
|
| 47 | 46 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 48 | 47 |
|
| 49 |
public TwistyPyraminx(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 48 |
public TwistyPyraminx(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 50 | 49 |
{
|
| 51 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 50 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 52 | 51 |
} |
| 53 | 52 |
|
| 54 | 53 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyPyraminxDiamond.java | ||
|---|---|---|
| 19 | 19 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 20 | 20 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 21 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 22 |
import org.distorted.objectlib.main.InitAssets; |
|
| 22 | 23 |
import org.distorted.objectlib.main.InitData; |
| 23 | 24 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 24 | 25 |
import org.distorted.objectlib.main.ObjectType; |
| 25 | 26 |
import org.distorted.objectlib.shape.ShapeOctahedron; |
| 26 | 27 |
import org.distorted.objectlib.touchcontrol.TouchControlOctahedron; |
| 27 | 28 |
|
| 28 |
import java.io.InputStream; |
|
| 29 |
|
|
| 30 | 29 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 31 | 30 |
|
| 32 | 31 |
public class TwistyPyraminxDiamond extends ShapeOctahedron |
| ... | ... | |
| 49 | 48 |
|
| 50 | 49 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 51 | 50 |
|
| 52 |
public TwistyPyraminxDiamond(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 51 |
public TwistyPyraminxDiamond(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 53 | 52 |
{
|
| 54 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 53 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 55 | 54 |
} |
| 56 | 55 |
|
| 57 | 56 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyPyraminxDuo.java | ||
|---|---|---|
| 19 | 19 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 20 | 20 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 21 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 22 |
import org.distorted.objectlib.main.InitAssets; |
|
| 22 | 23 |
import org.distorted.objectlib.main.InitData; |
| 23 | 24 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 24 | 25 |
import org.distorted.objectlib.main.ObjectType; |
| 25 | 26 |
import org.distorted.objectlib.shape.ShapeTetrahedron; |
| 26 | 27 |
import org.distorted.objectlib.touchcontrol.TouchControlTetrahedron; |
| 27 | 28 |
|
| 28 |
import java.io.InputStream; |
|
| 29 |
|
|
| 30 | 29 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 31 | 30 |
|
| 32 | 31 |
public class TwistyPyraminxDuo extends ShapeTetrahedron |
| ... | ... | |
| 51 | 50 |
|
| 52 | 51 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 53 | 52 |
|
| 54 |
public TwistyPyraminxDuo(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 53 |
public TwistyPyraminxDuo(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 55 | 54 |
{
|
| 56 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 55 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 57 | 56 |
} |
| 58 | 57 |
|
| 59 | 58 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyRedi.java | ||
|---|---|---|
| 12 | 12 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_HEXAHEDRON; |
| 13 | 13 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_SPLIT_CORNER; |
| 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 |
|
| ... | ... | |
| 21 | 19 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 22 | 20 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 22 |
import org.distorted.objectlib.main.InitAssets; |
|
| 24 | 23 |
import org.distorted.objectlib.main.InitData; |
| 25 | 24 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 26 | 25 |
import org.distorted.objectlib.touchcontrol.TouchControlHexahedron; |
| ... | ... | |
| 47 | 46 |
|
| 48 | 47 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 49 | 48 |
|
| 50 |
public TwistyRedi(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 49 |
public TwistyRedi(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 51 | 50 |
{
|
| 52 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 51 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 53 | 52 |
} |
| 54 | 53 |
|
| 55 | 54 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyRex.java | ||
|---|---|---|
| 12 | 12 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_HEXAHEDRON; |
| 13 | 13 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_SPLIT_CORNER; |
| 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 |
|
| ... | ... | |
| 21 | 19 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 22 | 20 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 22 |
import org.distorted.objectlib.main.InitAssets; |
|
| 24 | 23 |
import org.distorted.objectlib.main.InitData; |
| 25 | 24 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 26 | 25 |
import org.distorted.objectlib.touchcontrol.TouchControlHexahedron; |
| ... | ... | |
| 50 | 49 |
|
| 51 | 50 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 52 | 51 |
|
| 53 |
public TwistyRex(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 52 |
public TwistyRex(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 54 | 53 |
{
|
| 55 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 54 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 56 | 55 |
} |
| 57 | 56 |
|
| 58 | 57 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistySkewb.java | ||
|---|---|---|
| 12 | 12 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_HEXAHEDRON; |
| 13 | 13 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_SPLIT_CORNER; |
| 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 |
|
| ... | ... | |
| 21 | 19 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 22 | 20 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 22 |
import org.distorted.objectlib.main.InitAssets; |
|
| 24 | 23 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 25 | 24 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 26 | 25 |
import org.distorted.objectlib.main.InitData; |
| ... | ... | |
| 48 | 47 |
|
| 49 | 48 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 50 | 49 |
|
| 51 |
public TwistySkewb(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 50 |
public TwistySkewb(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 52 | 51 |
{
|
| 53 |
super(data, meshState, iconMode, 2*data.getNumLayers()[0]-2, quat, move, scale, stream);
|
|
| 52 |
super(meshState, iconMode, 2*data.getNumLayers()[0]-2, quat, move, scale, data, asset);
|
|
| 54 | 53 |
} |
| 55 | 54 |
|
| 56 | 55 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistySquare.java | ||
|---|---|---|
| 12 | 12 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_CHANGING_SQUARE; |
| 13 | 13 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_NOT_SPLIT; |
| 14 | 14 |
|
| 15 |
import java.io.InputStream; |
|
| 16 |
|
|
| 17 | 15 |
import org.distorted.library.type.Static3D; |
| 18 | 16 |
import org.distorted.library.type.Static4D; |
| 17 |
import org.distorted.objectlib.main.InitAssets; |
|
| 19 | 18 |
import org.distorted.objectlib.main.InitData; |
| 20 | 19 |
import org.distorted.objectlib.shape.ShapeHexahedron; |
| 21 | 20 |
import org.distorted.objectlib.touchcontrol.TouchControlHexahedron; |
| ... | ... | |
| 44 | 43 |
|
| 45 | 44 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 46 | 45 |
|
| 47 |
TwistySquare(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 46 |
TwistySquare(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 48 | 47 |
{
|
| 49 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 48 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 50 | 49 |
} |
| 51 | 50 |
|
| 52 | 51 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistySquare1.java | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
package org.distorted.objectlib.objects; |
| 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 |
|
| ... | ... | |
| 18 | 16 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 19 | 17 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 20 | 18 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 19 |
import org.distorted.objectlib.main.InitAssets; |
|
| 21 | 20 |
import org.distorted.objectlib.main.InitData; |
| 22 | 21 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 23 | 22 |
import org.distorted.objectlib.main.ObjectType; |
| ... | ... | |
| 33 | 32 |
|
| 34 | 33 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 35 | 34 |
|
| 36 |
public TwistySquare1(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 35 |
public TwistySquare1(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 37 | 36 |
{
|
| 38 |
super(data, meshState, iconMode, quat, move, scale, stream);
|
|
| 37 |
super(meshState, iconMode, quat, move, scale, data, asset);
|
|
| 39 | 38 |
} |
| 40 | 39 |
|
| 41 | 40 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistySquare2.java | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
package org.distorted.objectlib.objects; |
| 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 |
|
| ... | ... | |
| 18 | 16 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 19 | 17 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 20 | 18 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 19 |
import org.distorted.objectlib.main.InitAssets; |
|
| 21 | 20 |
import org.distorted.objectlib.main.InitData; |
| 22 | 21 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 23 | 22 |
import org.distorted.objectlib.main.ObjectType; |
| ... | ... | |
| 33 | 32 |
|
| 34 | 33 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 35 | 34 |
|
| 36 |
public TwistySquare2(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 35 |
public TwistySquare2(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 37 | 36 |
{
|
| 38 |
super(data, meshState, iconMode, quat, move, scale, stream);
|
|
| 37 |
super(meshState, iconMode, quat, move, scale, data, asset);
|
|
| 39 | 38 |
} |
| 40 | 39 |
|
| 41 | 40 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyStarminx.java | ||
|---|---|---|
| 17 | 17 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 18 | 18 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 19 | 19 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 20 |
import org.distorted.objectlib.main.InitAssets; |
|
| 20 | 21 |
import org.distorted.objectlib.main.InitData; |
| 21 | 22 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 22 | 23 |
import org.distorted.objectlib.main.ObjectType; |
| 23 | 24 |
|
| 24 |
import java.io.InputStream; |
|
| 25 |
|
|
| 26 | 25 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_NOT_SPLIT; |
| 27 | 26 |
import static org.distorted.objectlib.touchcontrol.TouchControlDodecahedron.C2; |
| 28 | 27 |
import static org.distorted.objectlib.touchcontrol.TouchControlDodecahedron.COS54; |
| ... | ... | |
| 38 | 37 |
|
| 39 | 38 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 40 | 39 |
|
| 41 |
public TwistyStarminx(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 40 |
public TwistyStarminx(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 42 | 41 |
{
|
| 43 |
super(data, meshState, iconMode, quat, move, scale, stream);
|
|
| 42 |
super(meshState, iconMode, quat, move, scale, data, asset);
|
|
| 44 | 43 |
} |
| 45 | 44 |
|
| 46 | 45 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyTrajber.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.ObjectSignatures; |
| 20 | 21 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 21 | 22 |
import org.distorted.objectlib.main.InitData; |
| ... | ... | |
| 23 | 24 |
import org.distorted.objectlib.shape.ShapeOctahedron; |
| 24 | 25 |
import org.distorted.objectlib.touchcontrol.TouchControlOctahedron; |
| 25 | 26 |
|
| 26 |
import java.io.InputStream; |
|
| 27 |
|
|
| 28 | 27 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_OCTAHEDRON; |
| 29 | 28 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_NOT_SPLIT; |
| 30 | 29 |
|
| ... | ... | |
| 52 | 51 |
|
| 53 | 52 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 54 | 53 |
|
| 55 |
public TwistyTrajber(InitData data, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 54 |
public TwistyTrajber(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
|
|
| 56 | 55 |
{
|
| 57 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream);
|
|
| 56 |
super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
|
|
| 58 | 57 |
} |
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)