Revision b63235a0
Added by Leszek Koltunski over 1 year ago
| src/main/java/org/distorted/objectlib/json/JsonReader.java | ||
|---|---|---|
| 161 | 161 |
|
| 162 | 162 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 163 | 163 |
|
| 164 |
private void parseMetadata5(JSONObject object) throws JSONException |
|
| 164 |
private void parseMetadata5or6(JSONObject object) throws JSONException
|
|
| 165 | 165 |
{
|
| 166 | 166 |
mLongName = object.getString("longname");
|
| 167 | 167 |
mShortName = object.getString("shortname");
|
| ... | ... | |
| 490 | 490 |
|
| 491 | 491 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 492 | 492 |
|
| 493 |
private void parseAxis2or3or4or5(JSONArray object) throws JSONException |
|
| 493 |
private void parseAxis2or3or4or5or6(JSONArray object) throws JSONException
|
|
| 494 | 494 |
{
|
| 495 | 495 |
int numAxis = object.length(); |
| 496 | 496 |
|
| ... | ... | |
| 696 | 696 |
JSONObject mesh = object.getJSONObject("mesh");
|
| 697 | 697 |
parseMesh(mesh); |
| 698 | 698 |
JSONArray axis = object.getJSONArray("axis");
|
| 699 |
parseAxis2or3or4or5(axis); |
|
| 699 |
parseAxis2or3or4or5or6(axis);
|
|
| 700 | 700 |
JSONArray quats = object.getJSONArray("quats");
|
| 701 | 701 |
parseQuats(quats); |
| 702 | 702 |
JSONObject scrambling = object.getJSONObject("scrambling");
|
| ... | ... | |
| 711 | 711 |
|
| 712 | 712 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 713 | 713 |
|
| 714 |
private void parseVersion5(JSONObject object) throws JSONException |
|
| 714 |
private void parseVersion5or6(JSONObject object) throws JSONException
|
|
| 715 | 715 |
{
|
| 716 | 716 |
JSONObject metadata = object.getJSONObject("metadata");
|
| 717 |
parseMetadata5(metadata); |
|
| 717 |
parseMetadata5or6(metadata);
|
|
| 718 | 718 |
JSONObject mesh = object.getJSONObject("mesh");
|
| 719 | 719 |
parseMesh(mesh); |
| 720 | 720 |
JSONArray axis = object.getJSONArray("axis");
|
| 721 |
parseAxis2or3or4or5(axis); |
|
| 721 |
parseAxis2or3or4or5or6(axis);
|
|
| 722 | 722 |
JSONArray quats = object.getJSONArray("quats");
|
| 723 | 723 |
parseQuats(quats); |
| 724 | 724 |
JSONObject scrambling = object.getJSONObject("scrambling");
|
| ... | ... | |
| 769 | 769 |
|
| 770 | 770 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 771 | 771 |
|
| 772 |
private void parseVersion5Metadata(JSONObject object) throws JSONException |
|
| 772 |
private void parseVersion5or6Metadata(JSONObject object) throws JSONException
|
|
| 773 | 773 |
{
|
| 774 | 774 |
JSONObject metadata = object.getJSONObject("metadata");
|
| 775 |
parseMetadata5(metadata); |
|
| 775 |
parseMetadata5or6(metadata);
|
|
| 776 | 776 |
} |
| 777 | 777 |
|
| 778 | 778 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 798 | 798 |
{
|
| 799 | 799 |
parseVersion2or3or4(object); |
| 800 | 800 |
} |
| 801 |
else if( major==5 ) |
|
| 801 |
else if( major==5 || major==6 )
|
|
| 802 | 802 |
{
|
| 803 |
parseVersion5(object); |
|
| 803 |
parseVersion5or6(object);
|
|
| 804 | 804 |
} |
| 805 | 805 |
else |
| 806 | 806 |
{
|
| ... | ... | |
| 831 | 831 |
{
|
| 832 | 832 |
parseVersion2or3or4Metadata(object); |
| 833 | 833 |
} |
| 834 |
else if( major==5 ) |
|
| 834 |
else if( major==5 || major==6 )
|
|
| 835 | 835 |
{
|
| 836 |
parseVersion5Metadata(object); |
|
| 836 |
parseVersion5or6Metadata(object);
|
|
| 837 | 837 |
} |
| 838 | 838 |
else |
| 839 | 839 |
{
|
Also available in: Unified diff
Make it possible to create Diamond and Icosahedron-shaped objects to be read from json.