Revision f56b53cb
Added by Leszek Koltunski over 3 years ago
| src/main/java/org/distorted/objects/ObjectList.java | ||
|---|---|---|
| 107 | 107 |
new int[][] {
|
| 108 | 108 |
{2 , 10, 12, R.raw.diam2, R.drawable.ui_small_diam2, R.drawable.ui_medium_diam2, R.drawable.ui_big_diam2, R.drawable.ui_huge_diam2} ,
|
| 109 | 109 |
{3 , 18, 24, R.raw.diam3, R.drawable.ui_small_diam3, R.drawable.ui_medium_diam3, R.drawable.ui_big_diam3, R.drawable.ui_huge_diam3} ,
|
| 110 |
{4 , 32, 32, 0, R.drawable.ui_small_diam3, R.drawable.ui_medium_diam3, R.drawable.ui_big_diam3, R.drawable.ui_huge_diam3} ,
|
|
| 110 |
{4 , 32, 32, R.raw.diam4, R.drawable.ui_small_diam3, R.drawable.ui_medium_diam3, R.drawable.ui_big_diam3, R.drawable.ui_huge_diam3} ,
|
|
| 111 | 111 |
}, |
| 112 | 112 |
TwistyDiamond.class, |
| 113 | 113 |
new MovementDiamond(), |
| src/main/java/org/distorted/objects/TwistyDiamond.java | ||
|---|---|---|
| 403 | 403 |
|
| 404 | 404 |
MeshBase mesh; |
| 405 | 405 |
int numO = getNumOctahedrons(numLayers); |
| 406 |
int N = numLayers>3 ? 5:6; |
|
| 407 |
int E = numLayers>3 ? 1:2; |
|
| 406 | 408 |
|
| 407 | 409 |
if( cubit<numO ) |
| 408 | 410 |
{
|
| 409 | 411 |
if( mMeshes[0]==null ) |
| 410 | 412 |
{
|
| 411 |
float[][] bands = new float[][] { {0.05f,35,0.5f,0.8f,6,2,2} };
|
|
| 413 |
float[][] bands = new float[][] { {0.05f,35,0.5f,0.8f,N,E,E} };
|
|
| 412 | 414 |
int[] bandIndexes = new int[] { 0,0,0,0,0,0,0,0 };
|
| 413 | 415 |
float[][] corners = new float[][] { {0.04f,0.20f} };
|
| 414 | 416 |
int[] cornerIndexes = new int[] { 0,0,0,0,0,0 };
|
| ... | ... | |
| 430 | 432 |
{
|
| 431 | 433 |
if( mMeshes[1]==null ) |
| 432 | 434 |
{
|
| 433 |
float[][] bands = new float[][] { {0.05f,35,0.5f,0.8f,6,2,2} };
|
|
| 435 |
float[][] bands = new float[][] { {0.05f,35,0.5f,0.8f,N,E,E} };
|
|
| 434 | 436 |
int[] bandIndexes = new int[] { 0,0,0,0 };
|
| 435 | 437 |
float[][] corners = new float[][] { {0.08f,0.15f} };
|
| 436 | 438 |
int[] cornerIndexes = new int[] { 0,0,0,0 };
|
Also available in: Unified diff
Master FTO: mesh