Revision 9ef0ad15
Added by Leszek Koltunski 2 months ago
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 379 | 379 |
int numFaces = mShapes[variant].getNumFaces(); |
| 380 | 380 |
|
| 381 | 381 |
for(int face=0; face<numFaces; face++) |
| 382 |
if( getCubitFaceColor(cubit,face)>=0 ) |
|
| 382 |
if( getDefaultCubitFaceColor(cubit,face)>=0 )
|
|
| 383 | 383 |
{
|
| 384 | 384 |
mVariantFaceIsOuter[variant][face] = 1; |
| 385 | 385 |
} |
| ... | ... | |
| 1250 | 1250 |
|
| 1251 | 1251 |
void repaintPuzzleFace(int cubit, int face, int newColor) |
| 1252 | 1252 |
{
|
| 1253 |
int oldColorIndex = getCubitFaceColor(cubit,face); |
|
| 1253 |
int oldColorIndex = getDefaultCubitFaceColor(cubit,face);
|
|
| 1254 | 1254 |
|
| 1255 | 1255 |
if( oldColorIndex<0 || oldColorIndex>=mNumFaceColors ) |
| 1256 | 1256 |
{
|
| 1257 |
android.util.Log.e("D", "error in TwistyObject.repaintPuzzleFace, index="+oldColorIndex);
|
|
| 1257 |
android.util.Log.e("D", "TwistyObject.repaintPuzzleFace: index="+oldColorIndex);
|
|
| 1258 | 1258 |
return; |
| 1259 | 1259 |
} |
| 1260 | 1260 |
|
| ... | ... | |
| 1277 | 1277 |
// this doesn't have to return the real, displayed color - but the default one (from Shape classes). |
| 1278 | 1278 |
// The real displayed color can be different because of the sticker color overrides in 'Config'. |
| 1279 | 1279 |
|
| 1280 |
int getCubitFaceColor(int cubit, int face) |
|
| 1280 |
int getDefaultCubitFaceColor(int cubit, int face)
|
|
| 1281 | 1281 |
{
|
| 1282 | 1282 |
int puzzleFace = getCubitFaceMap(cubit,face); |
| 1283 | 1283 |
if( puzzleFace>=0 ) puzzleFace %= mNumFaceColors; |
| ... | ... | |
| 1343 | 1343 |
|
| 1344 | 1344 |
for(int face=0; face<mNumCubitFaces; face++) |
| 1345 | 1345 |
{
|
| 1346 |
cubColor = getCubitFaceColor(cubit,face); |
|
| 1346 |
cubColor = getDefaultCubitFaceColor(cubit,face);
|
|
| 1347 | 1347 |
stiShape = getVariantStickerShape(variant,face); |
| 1348 | 1348 |
texIndex = cubColor<0 || stiShape<0 ? mNumTextures-mNumOverrides : stiShape*mNumFaceColors + cubColor; |
| 1349 | 1349 |
row = (mNumTexRows-1) - texIndex/mNumTexCols; |
Also available in: Unified diff
minor