Revision 84d746d7
Added by Leszek Koltunski about 2 years ago
| src/main/java/org/distorted/objects/RubikObject.java | ||
|---|---|---|
| 23 | 23 |
|
| 24 | 24 |
import android.app.Activity; |
| 25 | 25 |
import android.content.res.Resources; |
| 26 |
import android.graphics.Bitmap; |
|
| 27 |
import android.graphics.drawable.BitmapDrawable; |
|
| 26 | 28 |
import android.graphics.drawable.Drawable; |
| 27 | 29 |
import android.widget.ImageButton; |
| 28 | 30 |
import android.widget.ImageView; |
| 29 | 31 |
|
| 30 | 32 |
import org.distorted.dmesh.ObjectMesh; |
| 33 |
import org.distorted.external.RubikFiles; |
|
| 31 | 34 |
import org.distorted.jsons.ObjectJson; |
| 32 | 35 |
import org.distorted.objectlib.json.JsonWriter; |
| 33 | 36 |
import org.distorted.objectlib.main.ObjectType; |
| ... | ... | |
| 39 | 42 |
|
| 40 | 43 |
public class RubikObject |
| 41 | 44 |
{
|
| 42 |
private final String mName; |
|
| 43 |
private final int mNumScramble; |
|
| 44 |
private final int mJsonID, mMeshID, mExtrasID; |
|
| 45 |
private final String mLowerName, mUpperName; |
|
| 45 | 46 |
private final int mIconID; |
| 46 | 47 |
private final String[][] mPatterns; |
| 47 |
private final int mObjectMinor, mExtrasMinor; |
|
| 48 | 48 |
|
| 49 |
private int mJsonID, mMeshID, mExtrasID; |
|
| 50 |
private int mObjectMinor, mExtrasMinor; |
|
| 51 |
private int mNumScramble; |
|
| 49 | 52 |
private int mMeshState; |
| 50 | 53 |
private int mExtrasOrdinal; |
| 51 | 54 |
private Drawable mIconD; |
| ... | ... | |
| 56 | 59 |
{
|
| 57 | 60 |
int ordinal= type.ordinal(); |
| 58 | 61 |
|
| 59 |
mName = type.name(); |
|
| 62 |
mUpperName = type.name(); |
|
| 63 |
mLowerName = type.name().toLowerCase(); |
|
| 60 | 64 |
mNumScramble = type.getNumScramble(); |
| 61 | 65 |
|
| 62 | 66 |
mIconID = type.getIconID(); |
| ... | ... | |
| 75 | 79 |
|
| 76 | 80 |
mIconD = null; |
| 77 | 81 |
} |
| 78 |
/* |
|
| 82 |
|
|
| 79 | 83 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 80 | 84 |
|
| 81 | 85 |
RubikObject(RubikObjectList.DownloadedObject object) |
| 82 | 86 |
{
|
| 83 |
mName = object.shortName; |
|
| 84 |
mMeshID = 0; |
|
| 87 |
android.util.Log.e("D", "new downloaded RubikObject "+object.shortName+" added");
|
|
| 88 |
|
|
| 89 |
|
|
| 90 |
mLowerName = object.shortName; |
|
| 91 |
mUpperName = object.shortName.toUpperCase(); |
|
| 92 |
mNumScramble = object.numScrambles; |
|
| 93 |
mObjectMinor = object.objectMinor; |
|
| 94 |
mExtrasMinor = object.extrasMinor; |
|
| 95 |
|
|
| 85 | 96 |
mPatterns = null; |
| 86 | 97 |
mMeshState = MESH_NICE; |
| 87 | 98 |
mExtrasOrdinal = -1; |
| 88 | 99 |
|
| 89 |
|
|
| 90 |
|
|
| 91 |
mNumScramble = type.getNumScramble(); |
|
| 92 |
mObjectMinor = ? |
|
| 93 |
mExtrasMinor = ? |
|
| 94 |
mIconID = type.getIconID(); |
|
| 95 |
mJsonID = ObjectJson.getObjectJsonID(mOrdinal); |
|
| 96 |
mExtrasID = ObjectJson.getExtrasJsonID(mOrdinal); |
|
| 100 |
mMeshID = 0; |
|
| 101 |
mIconID = -1; |
|
| 102 |
mJsonID = -1; |
|
| 103 |
mExtrasID = -1; |
|
| 97 | 104 |
} |
| 98 | 105 |
|
| 99 | 106 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 100 | 107 |
|
| 101 |
public void updateObject(RubikObjectList.DownloadedObject object)
|
|
| 108 |
public boolean updateObject(RubikObjectList.DownloadedObject object)
|
|
| 102 | 109 |
{
|
| 110 |
boolean changed = false; |
|
| 103 | 111 |
|
| 112 |
if( object.objectMinor>JsonWriter.VERSION_OBJECT_MINOR ) |
|
| 113 |
{
|
|
| 114 |
android.util.Log.e("D", "Updating RubikObject's "+object.shortName+" main JSON");
|
|
| 115 |
|
|
| 116 |
mObjectMinor = object.objectMinor; |
|
| 117 |
mNumScramble = object.numScrambles; |
|
| 118 |
mMeshID = 0; |
|
| 119 |
mJsonID = -1; |
|
| 120 |
changed = true; |
|
| 121 |
} |
|
| 122 |
|
|
| 123 |
if( object.extrasMinor>JsonWriter.VERSION_EXTRAS_MINOR ) |
|
| 124 |
{
|
|
| 125 |
android.util.Log.e("D", "Updating RubikObject's "+object.shortName+" extras JSON");
|
|
| 126 |
|
|
| 127 |
mExtrasMinor = object.extrasMinor; |
|
| 128 |
mExtrasID = -1; |
|
| 129 |
changed = true; |
|
| 130 |
} |
|
| 131 |
|
|
| 132 |
return changed; |
|
| 104 | 133 |
} |
| 105 |
*/ |
|
| 134 |
|
|
| 106 | 135 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 107 | 136 |
|
| 108 | 137 |
private void createIconDrawable(Activity act) |
| 109 | 138 |
{
|
| 110 |
mIconD = act.getDrawable(mIconID); |
|
| 139 |
if( mIconID>0 ) |
|
| 140 |
{
|
|
| 141 |
mIconD = act.getDrawable(mIconID); |
|
| 142 |
} |
|
| 143 |
else |
|
| 144 |
{
|
|
| 145 |
RubikFiles files = RubikFiles.getInstance(); |
|
| 146 |
Bitmap bmp = files.getIcon(act,mLowerName+".png"); |
|
| 147 |
mIconD = new BitmapDrawable(act.getResources(), bmp); |
|
| 148 |
} |
|
| 111 | 149 |
} |
| 112 | 150 |
|
| 113 | 151 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 141 | 179 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 142 | 180 |
// PUBLIC API |
| 143 | 181 |
|
| 144 |
public String getName() |
|
| 182 |
public String getLowerName() |
|
| 183 |
{
|
|
| 184 |
return mLowerName; |
|
| 185 |
} |
|
| 186 |
|
|
| 187 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 188 |
|
|
| 189 |
public String getUpperName() |
|
| 145 | 190 |
{
|
| 146 |
return mName; |
|
| 191 |
return mUpperName;
|
|
| 147 | 192 |
} |
| 148 | 193 |
|
| 149 | 194 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 187 | 232 |
|
| 188 | 233 |
public InputStream getObjectStream(Activity act) |
| 189 | 234 |
{
|
| 190 |
if( mJsonID!=0 )
|
|
| 235 |
if( mJsonID>0 )
|
|
| 191 | 236 |
{
|
| 192 | 237 |
Resources res = act.getResources(); |
| 193 | 238 |
return res.openRawResource(mJsonID); |
| 194 | 239 |
} |
| 240 |
if( mJsonID<0 ) |
|
| 241 |
{
|
|
| 242 |
RubikFiles files = RubikFiles.getInstance(); |
|
| 243 |
return files.openFile(act,mLowerName+"_object.json"); |
|
| 244 |
} |
|
| 245 |
|
|
| 195 | 246 |
return null; |
| 196 | 247 |
} |
| 197 | 248 |
|
| ... | ... | |
| 199 | 250 |
|
| 200 | 251 |
public InputStream getMeshStream(Activity act) |
| 201 | 252 |
{
|
| 202 |
if( mMeshID!=0 )
|
|
| 253 |
if( mMeshID>0 )
|
|
| 203 | 254 |
{
|
| 204 | 255 |
Resources res = act.getResources(); |
| 205 | 256 |
return res.openRawResource(mMeshID); |
| 206 | 257 |
} |
| 258 |
|
|
| 207 | 259 |
return null; |
| 208 | 260 |
} |
| 209 | 261 |
|
| ... | ... | |
| 211 | 263 |
|
| 212 | 264 |
public InputStream getExtrasStream(Activity act) |
| 213 | 265 |
{
|
| 214 |
if( mExtrasID!=0 )
|
|
| 266 |
if( mExtrasID>0 )
|
|
| 215 | 267 |
{
|
| 216 | 268 |
Resources res = act.getResources(); |
| 217 | 269 |
return res.openRawResource(mExtrasID); |
| 218 | 270 |
} |
| 271 |
if( mExtrasID<0 ) |
|
| 272 |
{
|
|
| 273 |
RubikFiles files = RubikFiles.getInstance(); |
|
| 274 |
return files.openFile(act,mLowerName+"_extras.json"); |
|
| 275 |
} |
|
| 276 |
|
|
| 219 | 277 |
return null; |
| 220 | 278 |
} |
| 221 | 279 |
|
Also available in: Unified diff
Downloaded Objects more or less work now.