Revision fb9d7614
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/json/JsonReader.java | ||
|---|---|---|
| 52 | 52 |
private int mMovementType, mMovementSplit; |
| 53 | 53 |
private int[][][] mEnabled; |
| 54 | 54 |
private float[] mDist3D; |
| 55 |
private int mNumCubitFaces, mNumFaces, mNumFaceColors;
|
|
| 55 |
private int mNumFaces, mNumFaceColors; |
|
| 56 | 56 |
private float[][] mPositions; |
| 57 | 57 |
private ObjectShape[] mShapes; |
| 58 | 58 |
private ObjectFaceShape[] mFaceShapes; |
| ... | ... | |
| 157 | 157 |
int[][] bandIndices = new int[mNumCubitVariants][]; |
| 158 | 158 |
int[][][] vertIndices = new int[mNumCubitVariants][][]; |
| 159 | 159 |
|
| 160 |
mNumCubitFaces = -1; |
|
| 161 |
|
|
| 162 | 160 |
for(int i=0; i<mNumCubitVariants; i++) |
| 163 | 161 |
{
|
| 164 | 162 |
JSONObject jsonShape = object.getJSONObject(i); |
| ... | ... | |
| 187 | 185 |
bandIndices[i] = new int[numFaces]; |
| 188 | 186 |
vertIndices[i] = new int[numFaces][]; |
| 189 | 187 |
|
| 190 |
if( mNumCubitFaces<numFaces ) mNumCubitFaces=numFaces; |
|
| 191 |
|
|
| 192 | 188 |
for(int j=0; j<numFaces; j++) |
| 193 | 189 |
{
|
| 194 | 190 |
JSONObject jsonFace = jsonFaces.getJSONObject(j); |
| ... | ... | |
| 629 | 625 |
return mDist3D; |
| 630 | 626 |
} |
| 631 | 627 |
|
| 632 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 633 |
|
|
| 634 |
public int getNumCubitFaces() |
|
| 635 |
{
|
|
| 636 |
return mNumCubitFaces; |
|
| 637 |
} |
|
| 638 |
|
|
| 639 | 628 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 640 | 629 |
|
| 641 | 630 |
public float[][] getCubitPositions() |
Also available in: Unified diff
Remove the 'getNumCubitFaces()' object API (forgotten part)