Revision 804293f0
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objects/RubikObjectList.java | ||
|---|---|---|
| 19 | 19 |
|
| 20 | 20 |
package org.distorted.objects; |
| 21 | 21 |
|
| 22 |
import java.io.InputStream; |
|
| 23 |
import java.util.ArrayList; |
|
| 24 |
|
|
| 25 |
import android.app.Activity; |
|
| 22 | 26 |
import android.content.SharedPreferences; |
| 23 | 27 |
|
| 28 |
import org.distorted.jsons.ObjectJson; |
|
| 24 | 29 |
import org.distorted.main.RubikActivity; |
| 25 | 30 |
import org.distorted.objectlib.main.ObjectConstants; |
| 26 | 31 |
import org.distorted.objectlib.main.ObjectType; |
| 27 | 32 |
import org.distorted.screens.RubikScreenPlay; |
| 28 | 33 |
import org.distorted.screens.ScreenList; |
| 29 | 34 |
|
| 30 |
import java.util.ArrayList; |
|
| 31 |
|
|
| 32 | 35 |
import static org.distorted.objectlib.main.TwistyObject.MESH_NICE; |
| 33 | 36 |
import static org.distorted.objectlib.main.ObjectType.NUM_OBJECTS; |
| 34 | 37 |
|
| ... | ... | |
| 42 | 45 |
|
| 43 | 46 |
private static RubikObjectList mType; |
| 44 | 47 |
private static int mNumObjects; |
| 48 |
private static int mNumTutorials; |
|
| 45 | 49 |
private static ArrayList<RubikObject> mObjects; |
| 46 | 50 |
private static int mObject = DEF_OBJECT; |
| 47 | 51 |
|
| ... | ... | |
| 62 | 66 |
|
| 63 | 67 |
private RubikObjectList() |
| 64 | 68 |
{
|
| 65 |
mNumObjects = 0; |
|
| 69 |
mNumObjects = 0; |
|
| 70 |
mNumTutorials = 0; |
|
| 71 |
|
|
| 66 | 72 |
mObjects = new ArrayList<>(); |
| 67 | 73 |
|
| 68 | 74 |
createBuiltinObjects(); |
| ... | ... | |
| 78 | 84 |
RubikObject obj = new RubikObject(type); |
| 79 | 85 |
mObjects.add(obj); |
| 80 | 86 |
mNumObjects++; |
| 87 |
|
|
| 88 |
if( obj.getTutorialJsonID()!=0 ) |
|
| 89 |
{
|
|
| 90 |
obj.setTutorialOrdinal(mNumTutorials); |
|
| 91 |
mNumTutorials++; |
|
| 92 |
} |
|
| 81 | 93 |
} |
| 82 | 94 |
} |
| 83 | 95 |
|
| ... | ... | |
| 229 | 241 |
|
| 230 | 242 |
return -1; |
| 231 | 243 |
} |
| 244 |
|
|
| 245 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 246 |
|
|
| 247 |
public static int getNumTutorialObjects() |
|
| 248 |
{
|
|
| 249 |
return mNumTutorials; |
|
| 250 |
} |
|
| 251 |
|
|
| 252 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 253 |
|
|
| 254 |
public static InputStream getTutorialStream(int tutorialOrdinal, Activity act) |
|
| 255 |
{
|
|
| 256 |
int objectOrdinal = getObjectOrdinal(tutorialOrdinal); |
|
| 257 |
RubikObject object= getObject(objectOrdinal); |
|
| 258 |
|
|
| 259 |
if( object!=null ) |
|
| 260 |
{
|
|
| 261 |
int jsonID = object.getTutorialJsonID(); |
|
| 262 |
return ObjectJson.getTutorialStream(jsonID,act); |
|
| 263 |
} |
|
| 264 |
|
|
| 265 |
return null; |
|
| 266 |
} |
|
| 267 |
|
|
| 268 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 269 |
|
|
| 270 |
public static int getObjectOrdinal(int tutorialOrdinal) |
|
| 271 |
{
|
|
| 272 |
for(int i=tutorialOrdinal; i<mNumObjects; i++) |
|
| 273 |
{
|
|
| 274 |
RubikObject object = getObject(i); |
|
| 275 |
int tutOrd = object!=null ? object.getTutorialOrdinal() : -1; |
|
| 276 |
if( tutOrd==tutorialOrdinal ) return i; |
|
| 277 |
} |
|
| 278 |
|
|
| 279 |
return -1; |
|
| 280 |
} |
|
| 281 |
|
|
| 282 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 283 |
|
|
| 284 |
public static int getTutorialOrdinal(int objectOrdinal) |
|
| 285 |
{
|
|
| 286 |
RubikObject object = getObject(objectOrdinal); |
|
| 287 |
return object!=null ? object.getTutorialOrdinal() : -1; |
|
| 288 |
} |
|
| 232 | 289 |
} |
Also available in: Unified diff
Re-organize tutorial list so that we can pull this one from JSON files.