Revision abf36986
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objects/TwistyPyraminx.java | ||
|---|---|---|
| 203 | 203 |
|
| 204 | 204 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 205 | 205 |
|
| 206 |
int getNumFaces() |
|
| 206 |
int getNumFaceColors()
|
|
| 207 | 207 |
{
|
| 208 | 208 |
return FACE_COLORS.length; |
| 209 | 209 |
} |
| ... | ... | |
| 272 | 272 |
|
| 273 | 273 |
private int faceColor(int cubit, int axis) |
| 274 | 274 |
{
|
| 275 |
return CUBITS[cubit].mRotationRow[axis] == 1 ? axis : NUM_FACES;
|
|
| 275 |
return CUBITS[cubit].mRotationRow[axis] == 1 ? axis : NUM_TEXTURES;
|
|
| 276 | 276 |
} |
| 277 | 277 |
|
| 278 | 278 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 287 | 287 |
case 2: return faceColor(cubit,1); |
| 288 | 288 |
case 5: return faceColor(cubit,3); |
| 289 | 289 |
case 7: return faceColor(cubit,2); |
| 290 |
default:return NUM_FACES;
|
|
| 290 |
default:return NUM_TEXTURES;
|
|
| 291 | 291 |
} |
| 292 | 292 |
} |
| 293 | 293 |
else |
| 294 | 294 |
{
|
| 295 |
return cubitface<NUM_FACES ? faceColor(cubit,cubitface) : NUM_FACES;
|
|
| 295 |
return cubitface<NUM_TEXTURES ? faceColor(cubit,cubitface) : NUM_TEXTURES;
|
|
| 296 | 296 |
} |
| 297 | 297 |
} |
| 298 | 298 |
|
| ... | ... | |
| 375 | 375 |
mStickers[0] = new ObjectSticker(STICKERS[0],null,radii,stroke); |
| 376 | 376 |
} |
| 377 | 377 |
|
| 378 |
return mStickers[face/NUM_FACES]; |
|
| 378 |
return mStickers[face/NUM_FACE_COLORS];
|
|
| 379 | 379 |
} |
| 380 | 380 |
|
| 381 | 381 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Add Mirror Cube 2x2 and 3x3.