Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve GLTF support #2069

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
+1,044 −452
Draft

Improve GLTF support #2069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
90a28b1
Never return the cached spatial directly: prevent the manipulation o…
riccardobl Sep 4, 2023
da8186d
Add extension to load speaker nodes
riccardobl Sep 4, 2023
d8e6b27
Add userdata loader and make it the default
riccardobl Sep 4, 2023
394973d
Make default extensions registrable statically, move all extensions i…
riccardobl Sep 4, 2023
4390373
auto-format
riccardobl Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 92 additions & 25 deletions jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/CustomContentManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,16 @@
import com.jme3.asset.AssetLoadException;
import com.jme3.plugins.json.JsonArray;
import com.jme3.plugins.json.JsonElement;

import com.jme3.scene.plugins.gltf.ext.JME_speaker.SpeakerExtensionLoader;
import com.jme3.scene.plugins.gltf.ext.KHR_lights_punctual.LightsPunctualExtensionLoader;
import com.jme3.scene.plugins.gltf.ext.KHR_materials_pbrSpecularGlossiness.PBRSpecGlossExtensionLoader;
import com.jme3.scene.plugins.gltf.ext.KHR_materials_unlit.UnlitExtensionLoader;
import com.jme3.scene.plugins.gltf.ext.KHR_texture_transform.TextureTransformExtensionLoader;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;

Expand All @@ -46,20 +52,26 @@
*/
public class CustomContentManager {

private final static Logger logger = Logger.getLogger(CustomContentManager.class.getName());
private static final Logger logger = Logger.getLogger(CustomContentManager.class.getName());

private GltfModelKey key;
private GltfLoader gltfLoader;

private final Map<String, ExtensionLoader> defaultExtensionLoaders = new HashMap<>();
static final Map<String, Class<? extends ExtensionLoader>> defaultExtensionLoaders =
new ConcurrentHashMap<>();

public CustomContentManager() {
defaultExtensionLoaders.put("KHR_materials_pbrSpecularGlossiness", new PBRSpecGlossExtensionLoader());
defaultExtensionLoaders.put("KHR_lights_punctual", new LightsPunctualExtensionLoader());
defaultExtensionLoaders.put("KHR_materials_unlit", new UnlitExtensionLoader());
defaultExtensionLoaders.put("KHR_texture_transform", new TextureTransformExtensionLoader());
static {
defaultExtensionLoaders.put("KHR_materials_pbrSpecularGlossiness", PBRSpecGlossExtensionLoader.class);
defaultExtensionLoaders.put("KHR_lights_punctual", LightsPunctualExtensionLoader.class);
defaultExtensionLoaders.put("KHR_materials_unlit", UnlitExtensionLoader.class);
defaultExtensionLoaders.put("KHR_texture_transform", TextureTransformExtensionLoader.class);
defaultExtensionLoaders.put("JME_speaker", SpeakerExtensionLoader.class);
}

private final Map<String, ExtensionLoader> loadedExtensionLoaders = new HashMap<>();

public CustomContentManager() {}

void init(GltfLoader gltfLoader) {
this.gltfLoader = gltfLoader;

Expand All @@ -72,8 +84,16 @@ void init(GltfLoader gltfLoader) {
for (JsonElement extElem : extensionUsed) {
String ext = extElem.getAsString();
if (ext != null) {
if (defaultExtensionLoaders.get(ext) == null && (this.key != null && this.key.getExtensionLoader(ext) == null)) {
logger.log(Level.WARNING, "Extension " + ext + " is not supported, please provide your own implementation in the GltfModelKey");
if (
defaultExtensionLoaders.get(ext) == null &&
(this.key != null && this.key.getExtensionLoader(ext) == null)
) {
logger.log(
Level.WARNING,
"Extension " +
ext +
" is not supported, please provide your own implementation in the GltfModelKey"
);
}
}
}
Expand All @@ -83,15 +103,24 @@ void init(GltfLoader gltfLoader) {
for (JsonElement extElem : extensionRequired) {
String ext = extElem.getAsString();
if (ext != null) {
if (defaultExtensionLoaders.get(ext) == null && (this.key != null && this.key.getExtensionLoader(ext) == null)) {
logger.log(Level.SEVERE, "Extension " + ext + " is mandatory for this file, the loaded scene result will be unexpected.");
if (
defaultExtensionLoaders.get(ext) == null &&
(this.key != null && this.key.getExtensionLoader(ext) == null)
) {
logger.log(
Level.SEVERE,
"Extension " +
ext +
" is mandatory for this file, the loaded scene result will be unexpected."
);
}
}
}
}
}

public <T> T readExtensionAndExtras(String name, JsonElement el, T input) throws AssetLoadException, IOException {
public <T> T readExtensionAndExtras(String name, JsonElement el, T input)
throws AssetLoadException, IOException {
T output = readExtension(name, el, input);
output = readExtras(name, el, output);
return output;
Expand All @@ -106,11 +135,34 @@ private <T> T readExtension(String name, JsonElement el, T input) throws AssetLo

for (Map.Entry<String, JsonElement> ext : extensions.getAsJsonObject().entrySet()) {
ExtensionLoader loader = null;

if (key != null) {
loader = key.getExtensionLoader(ext.getKey());
}

if (loader == null) {
loader = defaultExtensionLoaders.get(ext.getKey());
loader = loadedExtensionLoaders.get(ext.getKey());
if (loader == null) {
try {
Class<? extends ExtensionLoader> clz = defaultExtensionLoaders.get(ext.getKey());
if (clz != null) {
loader = clz.getDeclaredConstructor().newInstance();
}
} catch (
InstantiationException
| IllegalAccessException
| IllegalArgumentException
| InvocationTargetException
| NoSuchMethodException
| SecurityException e
) {
logger.log(Level.WARNING, "Could not instantiate loader", e);
}

if (loader != null) {
loadedExtensionLoaders.put(ext.getKey(), loader);
}
}
}

if (loader == null) {
Expand All @@ -121,7 +173,15 @@ private <T> T readExtension(String name, JsonElement el, T input) throws AssetLo
try {
return (T) loader.handleExtension(gltfLoader, name, el, ext.getValue(), input);
} catch (ClassCastException e) {
throw new AssetLoadException("Extension loader " + loader.getClass().getName() + " for extension " + ext.getKey() + " is incompatible with type " + input.getClass(), e);
throw new AssetLoadException(
"Extension loader " +
loader.getClass().getName() +
" for extension " +
ext.getKey() +
" is incompatible with type " +
input.getClass(),
e
);
}
}

Expand All @@ -130,14 +190,16 @@ private <T> T readExtension(String name, JsonElement el, T input) throws AssetLo

@SuppressWarnings("unchecked")
private <T> T readExtras(String name, JsonElement el, T input) throws AssetLoadException {
if (key == null) {
return input;
}
ExtrasLoader loader;
loader = key.getExtrasLoader();
if (loader == null) {
return input;
if (key == null) {
loader = new UserDataLoader();
} else {
loader = key.getExtrasLoader();
if (loader == null) {
return input;
}
}

JsonElement extras = el.getAsJsonObject().getAsJsonObject("extras");
if (extras == null) {
return input;
Expand All @@ -146,10 +208,15 @@ private <T> T readExtras(String name, JsonElement el, T input) throws AssetLoadE
try {
return (T) loader.handleExtras(gltfLoader, name, el, extras, input);
} catch (ClassCastException e) {
throw new AssetLoadException("Extra loader " + loader.getClass().getName() + " for " + name + " is incompatible with type " + input.getClass(), e);
throw new AssetLoadException(
"Extra loader " +
loader.getClass().getName() +
" for " +
name +
" is incompatible with type " +
input.getClass(),
e
);
}

}


}
Loading