Merge pull request jMonkeyEngine#639 from tonihele/bugfix/issue-638

Also include the JSON GSON implementation for gLTF model loading
tonihele · Dec 18, 2024 · d688e6c · d688e6c
2 parents eaa73cf + 731b800
commit d688e6c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/BasicGameTemplate/nbproject/project.properties b/BasicGameTemplate/nbproject/project.properties
@@ -44,7 +44,8 @@ javac.classpath=\
     ${libs.jme3-terrain.classpath}:\
     ${libs.jme3-jbullet.classpath}:\
     ${libs.jme3-awt-dialogs.classpath}:\
-    ${libs.jme3-plugins-json.classpath}
+    ${libs.jme3-plugins-json.classpath}:\
+	${libs.jme3-plugins-json-gson.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

diff --git a/JME3TestsTemplate/nbproject/project.properties b/JME3TestsTemplate/nbproject/project.properties
@@ -27,6 +27,7 @@ jar.compress=false
 javac.classpath=\
     ${libs.jme3-jogg.classpath}:\
     ${libs.jme3-plugins-json.classpath}:\
+	${libs.jme3-plugins-json-gson.classpath}:\
     ${libs.jme3-networking.classpath}:\
     ${libs.jme3-plugins.classpath}:\
     ${libs.jme3-core.classpath}:\

diff --git a/build.gradle b/build.gradle
@@ -40,6 +40,7 @@ dependencies {
     corelibs dep("org.jmonkeyengine:jme3-desktop:$jmeVersion-$jmeVersionTag", true, true)
     corelibs dep("org.jmonkeyengine:jme3-awt-dialogs:$jmeVersion-$jmeVersionTag", true, true)
     corelibs dep("org.jmonkeyengine:jme3-plugins-json:$jmeVersion-$jmeVersionTag", true, true)
+	corelibs dep("org.jmonkeyengine:jme3-plugins-json-gson:$jmeVersion-$jmeVersionTag", true, true)
     corelibs dep("org.jmonkeyengine:jme3-lwjgl:$jmeVersion-$jmeVersionTag", true, true)
     corelibs dep("org.jmonkeyengine:jme3-effects:$jmeVersion-$jmeVersionTag", true, true)
     corelibs dep("com.github.stephengold:Minie:8.2.0", true, true) // replacement for bullet-native