diff --git a/assets/Models/arrow1.fbx b/assets/Models/arrow1.fbx new file mode 100644 index 00000000..7587acc6 Binary files /dev/null and b/assets/Models/arrow1.fbx differ diff --git a/assets/Textures/arrow1.png b/assets/Textures/arrow1.png new file mode 100644 index 00000000..eae7949f Binary files /dev/null and b/assets/Textures/arrow1.png differ diff --git a/assets/Textures/default_texture_map.json b/assets/Textures/default_texture_map.json index 5c7146f3..c3142bba 100644 --- a/assets/Textures/default_texture_map.json +++ b/assets/Textures/default_texture_map.json @@ -119,6 +119,12 @@ "/Textures/bow1.png", "/Textures/bow1.png" ] + }, + "Models/arrow1.fbx" : { + "ArrowMesh" : [ + "/Textures/arrow1.png", + "/Textures/arrow1.png" + ] } } } \ No newline at end of file diff --git a/src/main/java/electrosphere/main/Main.java b/src/main/java/electrosphere/main/Main.java index 256ba77c..4e79cbd4 100644 --- a/src/main/java/electrosphere/main/Main.java +++ b/src/main/java/electrosphere/main/Main.java @@ -171,9 +171,9 @@ public class Main { //uncomment to test loading a model into engine // if(1==1){ -// Globals.assetManager.addModelPathToQueue("/Models/bow1.fbx"); +// Globals.assetManager.addModelPathToQueue("/Models/arrow1.fbx"); // Globals.assetManager.loadAssetsInQueue(); -// Model bowModel = Globals.assetManager.fetchModel("/Models/bow1.fbx"); +// Model bowModel = Globals.assetManager.fetchModel("/Models/arrow1.fbx"); // bowModel.describeHighLevel(); // System.exit(0); // }