Skip to content

Commit b7787a7

Browse files
stephengoldstephengold
authored
partial revert of PR #2060 (JSON parser abstraction) (#2278)
1 parent 69f5030 commit b7787a7

13 files changed

+43
-55
lines changed

‎jme3-examples/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ dependencies {
2424
implementation project(':jme3-networking')
2525
implementation project(':jme3-niftygui')
2626
implementation project(':jme3-plugins')
27-
implementation project(':jme3-plugins-json')
28-
implementation project(':jme3-plugins-json-gson')
27+
// implementation project(':jme3-plugins-json')
28+
// implementation project(':jme3-plugins-json-gson')
2929
implementation project(':jme3-terrain')
3030
implementation project(':jme3-awt-dialogs')
3131
runtimeOnly project(':jme3-testdata')

‎jme3-plugins/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ sourceSets {
1111

1212
dependencies {
1313
api project(':jme3-core')
14-
implementation project(':jme3-plugins-json')
15-
implementation project(':jme3-plugins-json-gson')
14+
api 'com.google.code.gson:gson:2.9.1'
1615
testRuntimeOnly project(':jme3-desktop')
1716
}

‎jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/CustomContentManager.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009-2023 jMonkeyEngine
2+
* Copyright (c) 2009-2024 jMonkeyEngine
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -31,10 +31,9 @@
3131
*/
3232
package com.jme3.scene.plugins.gltf;
3333

34+
import com.google.gson.JsonArray;
35+
import com.google.gson.JsonElement;
3436
import com.jme3.asset.AssetLoadException;
35-
import com.jme3.plugins.json.JsonArray;
36-
import com.jme3.plugins.json.JsonElement;
37-
3837
import java.io.IOException;
3938
import java.lang.reflect.InvocationTargetException;
4039
import java.util.HashMap;

‎jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/ExtensionLoader.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009-2021 jMonkeyEngine
2+
* Copyright (c) 2009-2024 jMonkeyEngine
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -31,8 +31,7 @@
3131
*/
3232
package com.jme3.scene.plugins.gltf;
3333

34-
35-
import com.jme3.plugins.json.JsonElement;
34+
import com.google.gson.JsonElement;
3635
import java.io.IOException;
3736

3837
/**

‎jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/ExtrasLoader.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3131
*/
3232
package com.jme3.scene.plugins.gltf;
33-
import com.jme3.plugins.json.JsonElement;
33+
34+
import com.google.gson.JsonElement;
3435

3536
/**
3637
* Interface to handle a glTF extra.

‎jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfLoader.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009-2023 jMonkeyEngine
2+
* Copyright (c) 2009-2024 jMonkeyEngine
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -31,10 +31,12 @@
3131
*/
3232
package com.jme3.scene.plugins.gltf;
3333

34-
import com.jme3.plugins.json.JsonArray;
35-
import com.jme3.plugins.json.JsonObject;
36-
import com.jme3.plugins.json.JsonPrimitive;
37-
import com.jme3.plugins.json.JsonElement;
34+
import com.google.gson.JsonArray;
35+
import com.google.gson.JsonObject;
36+
import com.google.gson.JsonPrimitive;
37+
import com.google.gson.JsonElement;
38+
import com.google.gson.JsonParser;
39+
import com.google.gson.stream.JsonReader;
3840
import com.jme3.anim.*;
3941
import com.jme3.asset.*;
4042
import com.jme3.material.Material;
@@ -121,7 +123,7 @@ protected Object loadFromStream(AssetInfo assetInfo, InputStream stream) throws
121123
defaultMat.setFloat("Roughness", 1f);
122124
}
123125

124-
docRoot = parse(stream);
126+
docRoot = JsonParser.parseReader(new JsonReader(new InputStreamReader(stream))).getAsJsonObject();
125127

126128
JsonObject asset = docRoot.getAsJsonObject().get("asset").getAsJsonObject();
127129
getAsString(asset, "generator");

‎jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfUtils.java

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009-2021 jMonkeyEngine
2+
* Copyright (c) 2009-2024 jMonkeyEngine
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -31,15 +31,13 @@
3131
*/
3232
package com.jme3.scene.plugins.gltf;
3333

34+
import com.google.gson.JsonArray;
35+
import com.google.gson.JsonElement;
36+
import com.google.gson.JsonObject;
3437
import com.jme3.asset.AssetInfo;
3538
import com.jme3.asset.AssetLoadException;
3639
import com.jme3.math.*;
3740
import com.jme3.scene.*;
38-
import com.jme3.plugins.json.Json;
39-
import com.jme3.plugins.json.JsonParser;
40-
import com.jme3.plugins.json.JsonArray;
41-
import com.jme3.plugins.json.JsonObject;
42-
import com.jme3.plugins.json.JsonElement;
4341
import com.jme3.texture.Texture;
4442
import com.jme3.util.*;
4543
import java.io.*;
@@ -61,18 +59,7 @@ public class GltfUtils {
6159
private GltfUtils() {
6260
}
6361

64-
65-
/**
66-
* Parse a json input stream and returns a {@link JsonObject}
67-
* @param stream the stream to parse
68-
* @return the JsonObject
69-
*/
70-
public static JsonObject parse(InputStream stream) {
71-
JsonParser parser = Json.create();
72-
return parser.parse(stream);
73-
}
74-
75-
public static Mesh.Mode getMeshMode(Integer mode) {
62+
public static Mesh.Mode getMeshMode(Integer mode) {
7663
if (mode == null) {
7764
return Mesh.Mode.Triangles;
7865
}

‎jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/LightsPunctualExtensionLoader.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009-2021 jMonkeyEngine
2+
* Copyright (c) 2009-2024 jMonkeyEngine
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -31,9 +31,9 @@
3131
*/
3232
package com.jme3.scene.plugins.gltf;
3333

34-
import com.jme3.plugins.json.JsonArray;
35-
import com.jme3.plugins.json.JsonObject;
36-
import com.jme3.plugins.json.JsonElement;
34+
import com.google.gson.JsonArray;
35+
import com.google.gson.JsonElement;
36+
import com.google.gson.JsonObject;
3737
import com.jme3.asset.AssetLoadException;
3838
import com.jme3.light.DirectionalLight;
3939
import com.jme3.light.Light;

‎jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/PBREmissiveStrengthExtensionLoader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023 jMonkeyEngine
2+
* Copyright (c) 2023-2024 jMonkeyEngine
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,7 @@
3232
package com.jme3.scene.plugins.gltf;
3333

3434
import com.jme3.asset.AssetKey;
35-
import com.jme3.plugins.json.JsonElement;
35+
import com.google.gson.JsonElement;
3636
import java.io.IOException;
3737

3838
/**

‎jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/PBRSpecGlossExtensionLoader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009-2020 jMonkeyEngine
2+
* Copyright (c) 2009-2024 jMonkeyEngine
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -34,7 +34,7 @@
3434
import com.jme3.asset.AssetKey;
3535

3636
import java.io.IOException;
37-
import com.jme3.plugins.json.JsonElement;
37+
import com.google.gson.JsonElement;
3838
import static com.jme3.scene.plugins.gltf.GltfUtils.getAsColor;
3939
import static com.jme3.scene.plugins.gltf.GltfUtils.getAsFloat;
4040

‎jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/TextureTransformExtensionLoader.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009-2022 jMonkeyEngine
2+
* Copyright (c) 2009-2024 jMonkeyEngine
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -31,9 +31,9 @@
3131
*/
3232
package com.jme3.scene.plugins.gltf;
3333

34-
import com.jme3.plugins.json.JsonArray;
35-
import com.jme3.plugins.json.JsonObject;
36-
import com.jme3.plugins.json.JsonElement;
34+
import com.google.gson.JsonArray;
35+
import com.google.gson.JsonElement;
36+
import com.google.gson.JsonObject;
3737
import com.jme3.asset.AssetLoadException;
3838
import com.jme3.math.Matrix3f;
3939
import com.jme3.math.Vector3f;

‎jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/UnlitExtensionLoader.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009-2021 jMonkeyEngine
2+
* Copyright (c) 2009-2024 jMonkeyEngine
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,8 @@
3030
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3131
*/
3232
package com.jme3.scene.plugins.gltf;
33-
import com.jme3.plugins.json.JsonElement;
33+
34+
import com.google.gson.JsonElement;
3435
import com.jme3.asset.AssetKey;
3536

3637
/**

‎jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/UserDataLoader.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009-2023 jMonkeyEngine
2+
* Copyright (c) 2009-2024 jMonkeyEngine
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -32,10 +32,10 @@
3232

3333
package com.jme3.scene.plugins.gltf;
3434

35-
import com.jme3.plugins.json.JsonArray;
36-
import com.jme3.plugins.json.JsonElement;
37-
import com.jme3.plugins.json.JsonObject;
38-
import com.jme3.plugins.json.JsonPrimitive;
35+
import com.google.gson.JsonArray;
36+
import com.google.gson.JsonElement;
37+
import com.google.gson.JsonObject;
38+
import com.google.gson.JsonPrimitive;
3939
import com.jme3.scene.Spatial;
4040

4141
import java.lang.reflect.Array;

0 commit comments

Comments
 (0)