Revision fcf7320f
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objects/RubikObjectList.java | ||
|---|---|---|
| 45 | 45 |
|
| 46 | 46 |
private static RubikObjectList mType; |
| 47 | 47 |
private static int mNumObjects; |
| 48 |
private static int mNumTutorials;
|
|
| 48 |
private static int mNumExtras;
|
|
| 49 | 49 |
private static ArrayList<RubikObject> mObjects; |
| 50 | 50 |
private static int mObject = DEF_OBJECT; |
| 51 | 51 |
|
| ... | ... | |
| 66 | 66 |
|
| 67 | 67 |
private RubikObjectList() |
| 68 | 68 |
{
|
| 69 |
mNumObjects = 0;
|
|
| 70 |
mNumTutorials = 0;
|
|
| 69 |
mNumObjects= 0; |
|
| 70 |
mNumExtras = 0;
|
|
| 71 | 71 |
|
| 72 | 72 |
mObjects = new ArrayList<>(); |
| 73 | 73 |
|
| ... | ... | |
| 85 | 85 |
mObjects.add(obj); |
| 86 | 86 |
mNumObjects++; |
| 87 | 87 |
|
| 88 |
if( obj.getTutorialJsonID()!=0 )
|
|
| 88 |
if( obj.getExtrasJsonID()!=0 )
|
|
| 89 | 89 |
{
|
| 90 |
obj.setTutorialOrdinal(mNumTutorials);
|
|
| 91 |
mNumTutorials++;
|
|
| 90 |
obj.setExtrasOrdinal(mNumExtras);
|
|
| 91 |
mNumExtras++;
|
|
| 92 | 92 |
} |
| 93 | 93 |
} |
| 94 | 94 |
} |
| ... | ... | |
| 242 | 242 |
return -1; |
| 243 | 243 |
} |
| 244 | 244 |
|
| 245 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 246 |
|
|
| 247 |
public static int getNumExtrasObjects() |
|
| 248 |
{
|
|
| 249 |
return mNumExtras; |
|
| 250 |
} |
|
| 251 |
|
|
| 245 | 252 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 246 | 253 |
|
| 247 | 254 |
public static int getNumTutorialObjects() |
| 248 | 255 |
{
|
| 249 |
return mNumTutorials;
|
|
| 256 |
return mNumExtras;
|
|
| 250 | 257 |
} |
| 251 | 258 |
|
| 252 | 259 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 253 | 260 |
|
| 254 |
public static InputStream getTutorialStream(int tutorialOrdinal, Activity act)
|
|
| 261 |
public static InputStream getExtrasStream(int extrasOrdinal, Activity act)
|
|
| 255 | 262 |
{
|
| 256 |
int objectOrdinal = getObjectOrdinal(tutorialOrdinal);
|
|
| 263 |
int objectOrdinal = getObjectOrdinal(extrasOrdinal);
|
|
| 257 | 264 |
RubikObject object= getObject(objectOrdinal); |
| 258 | 265 |
|
| 259 | 266 |
if( object!=null ) |
| 260 | 267 |
{
|
| 261 |
int jsonID = object.getTutorialJsonID();
|
|
| 262 |
return ObjectJson.getTutorialStream(jsonID,act);
|
|
| 268 |
int jsonID = object.getExtrasJsonID();
|
|
| 269 |
return ObjectJson.getExtrasStream(jsonID,act);
|
|
| 263 | 270 |
} |
| 264 | 271 |
|
| 265 | 272 |
return null; |
| ... | ... | |
| 267 | 274 |
|
| 268 | 275 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 269 | 276 |
|
| 270 |
public static int getObjectOrdinal(int tutorialOrdinal)
|
|
| 277 |
public static int getObjectOrdinal(int extrasOrdinal)
|
|
| 271 | 278 |
{
|
| 272 |
for(int i=tutorialOrdinal; i<mNumObjects; i++)
|
|
| 279 |
for(int i=extrasOrdinal; i<mNumObjects; i++)
|
|
| 273 | 280 |
{
|
| 274 | 281 |
RubikObject object = getObject(i); |
| 275 |
int tutOrd = object!=null ? object.getTutorialOrdinal() : -1;
|
|
| 276 |
if( tutOrd==tutorialOrdinal ) return i;
|
|
| 282 |
int extOrd = object!=null ? object.getExtrasOrdinal() : -1;
|
|
| 283 |
if( extOrd==extrasOrdinal ) return i;
|
|
| 277 | 284 |
} |
| 278 | 285 |
|
| 279 | 286 |
return -1; |
| 280 | 287 |
} |
| 281 | 288 |
|
| 289 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 290 |
|
|
| 291 |
public static int getExtrasOrdinal(int objectOrdinal) |
|
| 292 |
{
|
|
| 293 |
RubikObject object = getObject(objectOrdinal); |
|
| 294 |
return object!=null ? object.getExtrasOrdinal() : -1; |
|
| 295 |
} |
|
| 296 |
|
|
| 282 | 297 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 283 | 298 |
|
| 284 | 299 |
public static int getTutorialOrdinal(int objectOrdinal) |
| 285 | 300 |
{
|
| 286 | 301 |
RubikObject object = getObject(objectOrdinal); |
| 287 |
return object!=null ? object.getTutorialOrdinal() : -1; |
|
| 302 |
return object!=null ? object.getExtrasOrdinal() : -1; |
|
| 303 |
} |
|
| 304 |
|
|
| 305 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 306 |
|
|
| 307 |
public static int getLocalObjectMinor(int objectOrdinal) |
|
| 308 |
{
|
|
| 309 |
RubikObject object = getObject(objectOrdinal); |
|
| 310 |
return object!=null ? object.getObjectMinor() : -1; |
|
| 311 |
} |
|
| 312 |
|
|
| 313 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 314 |
|
|
| 315 |
public static int getLocalExtrasMinor(int objectOrdinal) |
|
| 316 |
{
|
|
| 317 |
RubikObject object = getObject(objectOrdinal); |
|
| 318 |
return object!=null ? object.getExtrasMinor() : -1; |
|
| 288 | 319 |
} |
| 289 | 320 |
} |
Also available in: Unified diff
Progress downloading objects and extras.