Revision eb9263dd
Added by Leszek Koltunski 5 months ago
src/main/java/org/distorted/objects/RubikObject.java | ||
---|---|---|
22 | 22 |
|
23 | 23 |
import androidx.appcompat.content.res.AppCompatResources; |
24 | 24 |
|
25 |
import org.distorted.dmesh.ObjectMesh; |
|
26 | 25 |
import org.distorted.external.RubikFiles; |
27 |
import org.distorted.jsons.ObjectJson; |
|
28 | 26 |
import org.distorted.main.R; |
29 |
import org.distorted.objectlib.main.ObjectType;
|
|
27 |
import org.distorted.objectlib.metadata.ListObjects;
|
|
30 | 28 |
import org.distorted.objectlib.metadata.Metadata; |
31 | 29 |
import org.distorted.objectlib.patterns.RubikPatternList; |
32 | 30 |
import org.distorted.solvers.ImplementedSolversList; |
... | ... | |
53 | 51 |
|
54 | 52 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
55 | 53 |
|
56 |
RubikObject(ObjectType type)
|
|
54 |
RubikObject(ListObjects type)
|
|
57 | 55 |
{ |
58 | 56 |
Metadata meta = type.getMetadata(); |
59 | 57 |
mObjectOrdinal= type.ordinal(); |
... | ... | |
64 | 62 |
mPrice = meta.price(); |
65 | 63 |
mIsFree = mPrice==0; |
66 | 64 |
mIconID = meta.icon(); |
67 |
mJsonID = ObjectJson.getObjectJsonID(mObjectOrdinal);
|
|
68 |
mMeshID = ObjectMesh.getMeshID(mObjectOrdinal);
|
|
69 |
mExtrasID = ObjectJson.getExtrasJsonID(mObjectOrdinal);
|
|
65 |
mJsonID = meta.objectJson();
|
|
66 |
mMeshID = meta.mesh();
|
|
67 |
mExtrasID = meta.extrasJson();
|
|
70 | 68 |
mIsLocal = false; |
71 | 69 |
|
72 | 70 |
int patternOrdinal = RubikPatternList.getOrdinal(mObjectOrdinal); |
Also available in: Unified diff
Next step toward separating TwistyObject metadata.