Revision ec42a6fe
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/objects/TwistyKilominx.java | ||
|---|---|---|
| 621 | 621 |
} |
| 622 | 622 |
} |
| 623 | 623 |
|
| 624 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 625 |
|
|
| 626 |
public int getVariantFaceColor(int variant, int face, int[] numLayers) |
|
| 627 |
{
|
|
| 628 |
return face>=mStickerVariants[variant].length ? -1 : mStickerVariants[variant][face]; |
|
| 629 |
} |
|
| 630 |
|
|
| 631 | 624 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 632 | 625 |
// make the 'center' sticker artificially larger, so that we paint over the area in the center of the face. |
| 633 | 626 |
|
| ... | ... | |
| 636 | 629 |
int[] numLayers = getNumLayers(); |
| 637 | 630 |
int index = numLayers[0]==3 ? 0:2; |
| 638 | 631 |
float CENTER_CORR = 0.87f; |
| 639 |
/* |
|
| 640 |
float C = 1.14f; |
|
| 641 |
|
|
| 642 |
mStickerCoords[index][0] *= C; |
|
| 643 |
mStickerCoords[index][1] *= C; |
|
| 644 |
mStickerCoords[index][2] *= C; |
|
| 645 |
mStickerCoords[index][3] *= C; |
|
| 646 |
mStickerCoords[index][4] *= C; |
|
| 647 |
mStickerCoords[index][5] *= C; |
|
| 648 |
mStickerCoords[index][6] *= C; |
|
| 649 |
mStickerCoords[index][7] *= C; |
|
| 650 |
*/ |
|
| 632 |
|
|
| 651 | 633 |
mStickerCoords[index][2] *= CENTER_CORR; |
| 652 | 634 |
mStickerCoords[index][3] *= CENTER_CORR; |
| 653 | 635 |
} |
| ... | ... | |
| 656 | 638 |
|
| 657 | 639 |
public float getStickerRadius() |
| 658 | 640 |
{
|
| 659 |
return 0.15f;
|
|
| 641 |
return 0.18f;
|
|
| 660 | 642 |
} |
| 661 | 643 |
|
| 662 | 644 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Finally move the 'getVariantFaceColor()' method to the base class.