Revision fcf7320f
Added by Leszek Koltunski almost 4 years ago
| src/main/java/org/distorted/objects/RubikObject.java | ||
|---|---|---|
| 21 | 21 |
|
| 22 | 22 |
import org.distorted.dmesh.ObjectMesh; |
| 23 | 23 |
import org.distorted.jsons.ObjectJson; |
| 24 |
import org.distorted.objectlib.json.JsonWriter; |
|
| 24 | 25 |
import org.distorted.objectlib.main.ObjectType; |
| 25 | 26 |
import org.distorted.patterns.RubikPatternList; |
| 26 | 27 |
|
| ... | ... | |
| 33 | 34 |
private final String mName; |
| 34 | 35 |
private final int mNumScramble; |
| 35 | 36 |
private final int mOrdinal; |
| 36 |
private final int mJsonID, mMeshID, mTutorialsID;
|
|
| 37 |
private final int mJsonID, mMeshID, mExtrasID;
|
|
| 37 | 38 |
private final int mIconID; |
| 38 | 39 |
private final String[][] mPatterns; |
| 39 | 40 |
|
| 40 | 41 |
private int mMeshState; |
| 41 |
private int mTutorialOrdinal; |
|
| 42 |
private int mExtrasOrdinal; |
|
| 43 |
private int mObjectMinor, mExtrasMinor; |
|
| 42 | 44 |
|
| 43 | 45 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 44 | 46 |
|
| ... | ... | |
| 50 | 52 |
mOrdinal = type.ordinal(); |
| 51 | 53 |
mJsonID = ObjectJson.getObjectJsonID(mOrdinal); |
| 52 | 54 |
mMeshID = ObjectMesh.getMeshID(mOrdinal); |
| 53 |
mTutorialsID = ObjectJson.getTutorialJsonID(mOrdinal);
|
|
| 55 |
mExtrasID = ObjectJson.getExtrasJsonID(mOrdinal);
|
|
| 54 | 56 |
|
| 55 | 57 |
int patternOrdinal = RubikPatternList.getOrdinal(mOrdinal); |
| 56 | 58 |
mPatterns = RubikPatternList.getPatterns(patternOrdinal); |
| 57 | 59 |
|
| 58 | 60 |
mMeshState = MESH_NICE; |
| 59 |
mTutorialOrdinal = -1; |
|
| 61 |
mExtrasOrdinal = -1; |
|
| 62 |
|
|
| 63 |
mObjectMinor = JsonWriter.VERSION_OBJECT_MINOR; |
|
| 64 |
mExtrasMinor = JsonWriter.VERSION_EXTRAS_MINOR; |
|
| 60 | 65 |
} |
| 61 | 66 |
|
| 62 | 67 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 63 | 68 |
|
| 64 |
public void setTutorialOrdinal(int ordinal)
|
|
| 69 |
public void setExtrasOrdinal(int ordinal)
|
|
| 65 | 70 |
{
|
| 66 |
mTutorialOrdinal = ordinal;
|
|
| 71 |
mExtrasOrdinal = ordinal;
|
|
| 67 | 72 |
} |
| 68 | 73 |
|
| 69 | 74 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 70 | 75 |
|
| 71 |
public int getTutorialOrdinal()
|
|
| 76 |
public int getExtrasOrdinal()
|
|
| 72 | 77 |
{
|
| 73 |
return mTutorialOrdinal;
|
|
| 78 |
return mExtrasOrdinal;
|
|
| 74 | 79 |
} |
| 75 | 80 |
|
| 76 | 81 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 132 | 137 |
|
| 133 | 138 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 134 | 139 |
|
| 135 |
public int getTutorialJsonID()
|
|
| 140 |
public int getExtrasJsonID()
|
|
| 136 | 141 |
{
|
| 137 |
return mTutorialsID;
|
|
| 142 |
return mExtrasID;
|
|
| 138 | 143 |
} |
| 139 | 144 |
|
| 140 | 145 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 143 | 148 |
{
|
| 144 | 149 |
return mPatterns; |
| 145 | 150 |
} |
| 151 |
|
|
| 152 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 153 |
|
|
| 154 |
public int getObjectMinor() |
|
| 155 |
{
|
|
| 156 |
return mObjectMinor; |
|
| 157 |
} |
|
| 158 |
|
|
| 159 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 160 |
|
|
| 161 |
public int getExtrasMinor() |
|
| 162 |
{
|
|
| 163 |
return mExtrasMinor; |
|
| 164 |
} |
|
| 146 | 165 |
} |
Also available in: Unified diff
Progress downloading objects and extras.