Revision 9c06394a
Added by Leszek Koltunski almost 3 years ago
| src/main/java/org/distorted/objects/TwistyObject.java | ||
|---|---|---|
| 28 | 28 |
import com.google.firebase.crashlytics.FirebaseCrashlytics; |
| 29 | 29 |
|
| 30 | 30 |
import org.distorted.helpers.FactoryCubit; |
| 31 |
import org.distorted.helpers.FactorySticker; |
|
| 32 |
import org.distorted.helpers.ObjectSticker; |
|
| 31 | 33 |
import org.distorted.helpers.QuatHelper; |
| 32 | 34 |
import org.distorted.library.effect.Effect; |
| 33 | 35 |
import org.distorted.library.effect.MatrixEffectMove; |
| ... | ... | |
| 588 | 590 |
paint.setColor(COLOR_BLACK); |
| 589 | 591 |
canvas.drawRect(0, 0, mNumTexCols*TEXTURE_HEIGHT, mNumTexRows*TEXTURE_HEIGHT, paint); |
| 590 | 592 |
|
| 591 |
int tex = 0; |
|
| 593 |
int face = 0; |
|
| 594 |
FactorySticker factory = FactorySticker.getInstance(); |
|
| 592 | 595 |
|
| 593 | 596 |
for(int row=0; row<mNumTexRows; row++) |
| 594 | 597 |
for(int col=0; col<mNumTexCols; col++) |
| 595 | 598 |
{
|
| 596 |
if( tex>=NUM_TEXTURES ) break; |
|
| 597 |
createFaceTexture(canvas, paint, tex, col*TEXTURE_HEIGHT, row*TEXTURE_HEIGHT); |
|
| 598 |
tex++; |
|
| 599 |
if( face>=NUM_TEXTURES ) break; |
|
| 600 |
ObjectSticker sticker = retSticker(face); |
|
| 601 |
factory.drawRoundedPolygon(canvas, paint, col*TEXTURE_HEIGHT, row*TEXTURE_HEIGHT, getColor(face%NUM_FACES), sticker); |
|
| 602 |
face++; |
|
| 599 | 603 |
} |
| 600 | 604 |
|
| 601 | 605 |
if( !mTexture.setTexture(bitmap) ) |
| ... | ... | |
| 970 | 974 |
abstract int getNumStickerTypes(int numLayers); |
| 971 | 975 |
abstract int getNumCubitFaces(); |
| 972 | 976 |
abstract MeshBase createCubitMesh(int cubit, int numLayers); |
| 973 |
abstract void createFaceTexture(Canvas canvas, Paint paint, int face, int left, int top); |
|
| 977 |
abstract ObjectSticker retSticker(int face); |
|
| 978 |
abstract int getColor(int face); |
|
| 974 | 979 |
abstract int getFaceColor(int cubit, int cubitface, int numLayers); |
| 975 | 980 |
abstract float returnMultiplier(); |
| 976 | 981 |
abstract float[][] getCuts(int numLayers); |
Also available in: Unified diff
Standarize drawing stickers of a twisty puzzle. From now on, there's no 'sticker drawing' code in the individual classes, only some constants.