diff --git a/assets/Models/building1.fbx b/assets/Models/building1.fbx new file mode 100644 index 00000000..35af28cd Binary files /dev/null and b/assets/Models/building1.fbx differ diff --git a/assets/Textures/building_diffuse.png b/assets/Textures/building_diffuse.png new file mode 100644 index 00000000..bc113fd0 Binary files /dev/null and b/assets/Textures/building_diffuse.png differ diff --git a/assets/Textures/default_texture_map.json b/assets/Textures/default_texture_map.json index d5a525da..fcebd4b2 100644 --- a/assets/Textures/default_texture_map.json +++ b/assets/Textures/default_texture_map.json @@ -62,7 +62,7 @@ "/Textures/GoblinEyes.png" ] }, - "Models/person1walkanim.fbx" : { + "Models/person1animpass2.fbx" : { "makehuman1" : [ "/Textures/skin1.png", "/Textures/skin1.png" @@ -71,6 +71,12 @@ "/Textures/w1.png", "/Textures/w1.png" ] + }, + "Models/building1.fbx" : { + "Cube.001" : [ + "/Textures/building_diffuse.png", + "/Textures/building_diffuse.png" + ] } } } \ No newline at end of file diff --git a/src/main/java/electrosphere/engine/LoadingThread.java b/src/main/java/electrosphere/engine/LoadingThread.java index 32585142..f4696ae4 100644 --- a/src/main/java/electrosphere/engine/LoadingThread.java +++ b/src/main/java/electrosphere/engine/LoadingThread.java @@ -26,6 +26,7 @@ import electrosphere.menu.MenuUtils; import electrosphere.net.NetUtils; import electrosphere.net.client.ClientNetworking; import electrosphere.net.server.Server; +import electrosphere.renderer.ActorUtils; import electrosphere.renderer.Model; import electrosphere.renderer.RenderUtils; import electrosphere.renderer.assetmanager.AssetDataStrings; @@ -470,7 +471,7 @@ public class LoadingThread extends Thread { // EntityUtils.getEntityScale(creature).set(0.01f); // } - + //trees \:D/ for(int i = 0; i < 10; i++){ Random rand = new Random(); String treePath = "Models/tree1.fbx"; @@ -479,6 +480,13 @@ public class LoadingThread extends Thread { // EntityUtils.getEntityRotation(tree).rotateAxis((float)-Math.PI/2.0f, new Vector3f(1,0,0)); } + String buildingPath = "Models/building1.fbx"; + Entity building = EntityUtils.spawnDrawableEntity(buildingPath); + EntityUtils.getPosition(building).set(5,1.2f,5); + EntityUtils.getScale(building).set(0.5f); + EntityUtils.getRotation(building).rotateLocalY((float)(Math.PI)); +// ActorUtils.applyBlenderTransformer(building); + //spawn evil goblin Entity goblin = CreatureUtils.spawnBasicCreature("Goblin"); EntityUtils.getPosition(goblin).set(30, 0, 30);