Revision a57e6870
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/objects/TwistySquare2.java | ||
|---|---|---|
| 49 | 49 |
|
| 50 | 50 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 51 | 51 |
|
| 52 |
public TwistySquare2(int size, Static4D quat, Static3D move, DistortedTexture texture,
|
|
| 52 |
public TwistySquare2(int[] numL, Static4D quat, Static3D move, DistortedTexture texture,
|
|
| 53 | 53 |
MeshSquare mesh, DistortedEffects effects, Resources res, int scrWidth) |
| 54 | 54 |
{
|
| 55 |
super(size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 55 |
super(numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 56 | 56 |
} |
| 57 | 57 |
|
| 58 | 58 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 82 | 82 |
|
| 83 | 83 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 84 | 84 |
|
| 85 |
protected int getResource(int numLayers) |
|
| 85 |
protected int getResource(int[] numLayers)
|
|
| 86 | 86 |
{
|
| 87 | 87 |
return R.raw.squa2; |
| 88 | 88 |
} |
| 89 | 89 |
|
| 90 | 90 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 91 | 91 |
|
| 92 |
protected int[] getSolvedQuats(int cubit, int numLayers) |
|
| 92 |
protected int[] getSolvedQuats(int cubit, int[] numLayers)
|
|
| 93 | 93 |
{
|
| 94 | 94 |
return null; |
| 95 | 95 |
} |
| 96 | 96 |
|
| 97 | 97 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 98 | 98 |
|
| 99 |
protected ObjectShape getObjectShape(int cubit, int numLayers) |
|
| 99 |
protected ObjectShape getObjectShape(int cubit, int[] numLayers)
|
|
| 100 | 100 |
{
|
| 101 | 101 |
int variant = getCubitVariant(cubit,numLayers); |
| 102 | 102 |
|
| ... | ... | |
| 193 | 193 |
|
| 194 | 194 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 195 | 195 |
|
| 196 |
protected Static4D getQuat(int cubit, int numLayers) |
|
| 196 |
protected Static4D getQuat(int cubit, int[] numLayers)
|
|
| 197 | 197 |
{
|
| 198 | 198 |
if( mQuats==null ) initializeQuats(); |
| 199 | 199 |
|
| ... | ... | |
| 213 | 213 |
|
| 214 | 214 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 215 | 215 |
|
| 216 |
protected int getNumCubitVariants(int numLayers) |
|
| 216 |
protected int getNumCubitVariants(int[] numLayers)
|
|
| 217 | 217 |
{
|
| 218 | 218 |
return 3; |
| 219 | 219 |
} |
| 220 | 220 |
|
| 221 | 221 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 222 | 222 |
|
| 223 |
protected int getCubitVariant(int cubit, int numLayers) |
|
| 223 |
protected int getCubitVariant(int cubit, int[] numLayers)
|
|
| 224 | 224 |
{
|
| 225 | 225 |
return cubit<2 ? 0 : (cubit<10 ? 1:2); |
| 226 | 226 |
} |
| ... | ... | |
| 274 | 274 |
|
| 275 | 275 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 276 | 276 |
|
| 277 |
protected float[][] getCubitPositions(int numLayers) |
|
| 277 |
protected float[][] getCubitPositions(int[] numLayers)
|
|
| 278 | 278 |
{
|
| 279 | 279 |
if( mCenters ==null ) |
| 280 | 280 |
{
|
| ... | ... | |
| 326 | 326 |
|
| 327 | 327 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 328 | 328 |
|
| 329 |
protected int getNumStickerTypes(int numLayers) |
|
| 329 |
protected int getNumStickerTypes(int[] numLayers)
|
|
| 330 | 330 |
{
|
| 331 | 331 |
return NUM_STICKERS; |
| 332 | 332 |
} |
| 333 | 333 |
|
| 334 | 334 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 335 | 335 |
|
| 336 |
protected int getFaceColor(int cubit, int cubitface, int numLayers) |
|
| 336 |
protected int getFaceColor(int cubit, int cubitface, int[] numLayers)
|
|
| 337 | 337 |
{
|
| 338 | 338 |
if( mStickerColor==null ) |
| 339 | 339 |
{
|
| ... | ... | |
| 396 | 396 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 397 | 397 |
// PUBLIC API |
| 398 | 398 |
|
| 399 |
public ObjectType intGetObjectType(int numLayers) |
|
| 399 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 400 | 400 |
{
|
| 401 | 401 |
return ObjectType.SQU2_3; |
| 402 | 402 |
} |
| 403 | 403 |
|
| 404 | 404 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 405 | 405 |
|
| 406 |
public int getObjectName(int numLayers) |
|
| 406 |
public int getObjectName(int[] numLayers)
|
|
| 407 | 407 |
{
|
| 408 | 408 |
return R.string.squa2; |
| 409 | 409 |
} |
| 410 | 410 |
|
| 411 | 411 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 412 | 412 |
|
| 413 |
public int getInventor(int numLayers) |
|
| 413 |
public int getInventor(int[] numLayers)
|
|
| 414 | 414 |
{
|
| 415 | 415 |
return R.string.squa2_inventor; |
| 416 | 416 |
} |
| 417 | 417 |
|
| 418 | 418 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 419 | 419 |
|
| 420 |
public int getComplexity(int numLayers) |
|
| 420 |
public int getComplexity(int[] numLayers)
|
|
| 421 | 421 |
{
|
| 422 | 422 |
return 7; |
| 423 | 423 |
} |
Also available in: Unified diff
make numLayers into an int[] (preparation for Cuboids)
Caution: because of previous changes to cubit order in cube, the Solver is broken!