Skip to content

Made Gltf extension loaders non-static to avoid concurrency issues #1886

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

Merged
Ali-RS merged 1 commit into from
Dec 28, 2022
Merged

Made Gltf extension loaders non-static to avoid concurrency issues #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 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 @@ -51,13 +51,13 @@ public class CustomContentManager {
private GltfModelKey key;
private GltfLoader gltfLoader;

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

static {
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());
defaultExtensionLoaders.put("KHR_texture_transform", new TextureTransformExtensionLoader());
}

void init(GltfLoader gltfLoader) {
Expand Down
14 changes: 7 additions & 7 deletions jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public class GltfLoader implements AssetLoader {
private static final Logger logger = Logger.getLogger(GltfLoader.class.getName());

// Data cache for already parsed JME objects
private Map<String, Object[]> dataCache = new HashMap<>();
private final Map<String, Object[]> dataCache = new HashMap<>();
private JsonArray scenes;
private JsonArray nodes;
private JsonArray meshes;
Expand All @@ -85,12 +85,12 @@ public class GltfLoader implements AssetLoader {
private JsonObject docRoot;
private Node rootNode;

private FloatArrayPopulator floatArrayPopulator = new FloatArrayPopulator();
private Vector3fArrayPopulator vector3fArrayPopulator = new Vector3fArrayPopulator();
private QuaternionArrayPopulator quaternionArrayPopulator = new QuaternionArrayPopulator();
private Matrix4fArrayPopulator matrix4fArrayPopulator = new Matrix4fArrayPopulator();
private Map<String, MaterialAdapter> defaultMaterialAdapters = new HashMap<>();
private CustomContentManager customContentManager = new CustomContentManager();
private final FloatArrayPopulator floatArrayPopulator = new FloatArrayPopulator();
private final Vector3fArrayPopulator vector3fArrayPopulator = new Vector3fArrayPopulator();
private final QuaternionArrayPopulator quaternionArrayPopulator = new QuaternionArrayPopulator();
private final Matrix4fArrayPopulator matrix4fArrayPopulator = new Matrix4fArrayPopulator();
private final Map<String, MaterialAdapter> defaultMaterialAdapters = new HashMap<>();
private final CustomContentManager customContentManager = new CustomContentManager();
private boolean useNormalsFlag = false;

Map<SkinData, List<Spatial>> skinnedSpatials = new HashMap<>();
Expand Down