Revision e30c522a
Added by Leszek Koltunski over 2 years ago
src/main/java/org/distorted/objectlib/objects/TwistyKilominx.java | ||
---|---|---|
328 | 328 |
|
329 | 329 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
330 | 330 |
|
331 |
protected ObjectShape getObjectShape(int cubit, int[] numLayers)
|
|
331 |
public ObjectShape getObjectShape(int variant)
|
|
332 | 332 |
{ |
333 |
int numL = numLayers[0]; |
|
334 |
int variant = getCubitVariant(cubit,numLayers); |
|
333 |
int[] numLayers = getNumLayers(); |
|
335 | 334 |
int numVariants = getNumCubitVariants(numLayers); |
335 |
int numL = numLayers[0]; |
|
336 | 336 |
|
337 | 337 |
if( variant==0 && numL>3 ) |
338 | 338 |
{ |
... | ... | |
381 | 381 |
} |
382 | 382 |
if( variant<numVariants-1 ) |
383 | 383 |
{ |
384 |
int numCubitsPerCorner = numCubitsPerCorner(numL); |
|
385 |
int numCubitsPerEdge = numCubitsPerEdge(numL); |
|
386 |
int type = computeEdgeType(cubit,numCubitsPerCorner,numCubitsPerEdge); |
|
384 |
int type = variant-1; |
|
387 | 385 |
float tmpVal= numL/(numL-1.0f); |
388 | 386 |
float height= tmpVal*COS18; |
389 | 387 |
float width = tmpVal + (type/2)*tmpVal*SIN18; |
... | ... | |
520 | 518 |
|
521 | 519 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
522 | 520 |
|
523 |
protected int getNumCubitVariants(int[] numLayers)
|
|
521 |
public int getNumCubitVariants(int[] numLayers)
|
|
524 | 522 |
{ |
525 | 523 |
switch(numLayers[0]) |
526 | 524 |
{ |
... | ... | |
533 | 531 |
|
534 | 532 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
535 | 533 |
|
536 |
protected int getCubitVariant(int cubit, int[] numLayers)
|
|
534 |
public int getCubitVariant(int cubit, int[] numLayers)
|
|
537 | 535 |
{ |
538 | 536 |
int numL = numLayers[0]; |
539 | 537 |
int numCubitsPerCorner = numCubitsPerCorner(numL); |
Also available in: Unified diff
Progress with serializing object to JSON: shapes.