diff --git a/assets/Models/falloak1.fbx b/assets/Models/falloak1.fbx new file mode 100644 index 00000000..7e622a75 Binary files /dev/null and b/assets/Models/falloak1.fbx differ diff --git a/assets/Textures/default_texture_map.json b/assets/Textures/default_texture_map.json index 0f9df534..8fd62eda 100644 --- a/assets/Textures/default_texture_map.json +++ b/assets/Textures/default_texture_map.json @@ -101,6 +101,12 @@ "/Textures/transparent_blue.png", "/Textures/transparent_blue.png" ] + }, + "Models/falloak1.fbx" : { + "Cube" : [ + "/Textures/falloak1.png", + "/Textures/falloak1.png" + ] } } } \ No newline at end of file diff --git a/assets/Textures/falloak1.png b/assets/Textures/falloak1.png new file mode 100644 index 00000000..5549c3b9 Binary files /dev/null and b/assets/Textures/falloak1.png differ diff --git a/src/main/java/electrosphere/engine/LoadingThread.java b/src/main/java/electrosphere/engine/LoadingThread.java index 432ed618..c368cb5b 100644 --- a/src/main/java/electrosphere/engine/LoadingThread.java +++ b/src/main/java/electrosphere/engine/LoadingThread.java @@ -510,6 +510,15 @@ public class LoadingThread extends Thread { // EntityUtils.getPosition(tree).set(rand.nextFloat() * 150 + 10, 0, rand.nextFloat() * 150 + 10); //// EntityUtils.getEntityRotation(tree).rotateAxis((float)-Math.PI/2.0f, new Vector3f(1,0,0)); // } + + for(int i = 0; i < 250; i++){ + Random rand = new Random(); + String treePath = "Models/falloak1.fbx"; + Entity tree = EntityUtils.spawnDrawableEntity(treePath); + EntityUtils.getPosition(tree).set(rand.nextFloat() * 105 + 1, 0, rand.nextFloat() * 105 + 1); + EntityUtils.getRotation(tree).rotateLocalX(-(float)Math.PI/2.0f).rotateZ(rand.nextFloat()); +// EntityUtils.getEntityRotation(tree).rotateAxis((float)-Math.PI/2.0f, new Vector3f(1,0,0)); + } // Random rand = new Random(); // for(int i = 0; i < 1000; i++){ diff --git a/src/main/java/electrosphere/util/ModelLoader.java b/src/main/java/electrosphere/util/ModelLoader.java index 1e0b66a7..08be9e55 100644 --- a/src/main/java/electrosphere/util/ModelLoader.java +++ b/src/main/java/electrosphere/util/ModelLoader.java @@ -89,6 +89,8 @@ public class ModelLoader { //once we've either added default textures or actual textures, //set the current mesh's material to this new one current_mesh.set_material(final_material); + } else { + LoggerInterface.loggerRenderer.WARNING("Failed to load texture for node " + current_mesh.nodeID + " of model " + path); } } }