Node and Mesh lookup

GlennFolker · Mar 30, 2024 · c454246 · c454246
1 parent 687d5e2
commit c454246
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/gltfrenzy/loader/MeshSetLoader.java b/src/gltfrenzy/loader/MeshSetLoader.java
@@ -26,7 +26,7 @@ public MeshSet load(AssetManager manager, String fileName, Fi file, MeshSetParam
         var scenes = manager.get(sceneName, Scenes3D.class);
         var target = fileName.substring(hash + 1);
 
-        return scenes.meshNames.getThrow(target, () -> new IllegalArgumentException("Mesh '" + target + "' not found in '" + sceneName + "'."));
+        return scenes.mesh(target);
     }
 
     @Override

diff --git a/src/gltfrenzy/loader/NodeLoader.java b/src/gltfrenzy/loader/NodeLoader.java
@@ -26,7 +26,7 @@ public Node load(AssetManager manager, String fileName, Fi file, NodeParameter p
         var scenes = manager.get(sceneName, Scenes3D.class);
         var target = fileName.substring(hash + 1);
 
-        return scenes.nodeNames.getThrow(target, () -> new IllegalArgumentException("Node '" + target + "' not found in '" + sceneName + "'."));
+        return scenes.node(target);
     }
 
     @Override

diff --git a/src/gltfrenzy/model/Scenes3D.java b/src/gltfrenzy/model/Scenes3D.java
@@ -30,6 +30,14 @@ public class Scenes3D implements Disposable{
     public final ObjectMap<String, Node> nodeNames = new ObjectMap<>();
     public final IntSeq rootNodes = new IntSeq();
 
+    public MeshSet mesh(String name){
+        return meshNames.getThrow(name, () -> new IllegalArgumentException("Mesh '" + name + "' not found."));
+    }
+
+    public Node node(String name){
+        return nodeNames.getThrow(name, () -> new IllegalArgumentException("Node '" + name + "' not found."));
+    }
+
     @Override
     public void dispose(){
         meshes.each(MeshSet::dispose);