diff --git a/assets/Textures/default_texture_map.json b/assets/Textures/default_texture_map.json index d1fd3eac..59b1a2c8 100644 --- a/assets/Textures/default_texture_map.json +++ b/assets/Textures/default_texture_map.json @@ -267,6 +267,32 @@ "/Textures/woodplanks1.png", "/Textures/woodplanks1.png" ] + }, + "Models/shrine2.fbx" : { + "Roof" : [ + "/Textures/shrine2Roof.png", + "/Textures/shrine2Roof.png" + ], + "MainWalls" : [ + "/Textures/shrine2MainWalls.png", + "/Textures/shrine2MainWalls.png" + ], + "Feet" : [ + "/Textures/shrine2Feet.png", + "/Textures/shrine2Feet.png" + ], + "Platform" : [ + "/Textures/shrine2Platform.png", + "/Textures/shrine2Platform.png" + ], + "SupportBeams" : [ + "/Textures/shrine2SupportBeams.png", + "/Textures/shrine2SupportBeams.png" + ], + "Stairs" : [ + "/Textures/shrine2Stairs.png", + "/Textures/shrine2Stairs.png" + ] } } } \ No newline at end of file diff --git a/assets/Textures/shrine2Feet.png b/assets/Textures/shrine2Feet.png new file mode 100644 index 00000000..e33c07d5 Binary files /dev/null and b/assets/Textures/shrine2Feet.png differ diff --git a/assets/Textures/shrine2MainWalls.png b/assets/Textures/shrine2MainWalls.png new file mode 100644 index 00000000..cbf3cffd Binary files /dev/null and b/assets/Textures/shrine2MainWalls.png differ diff --git a/assets/Textures/shrine2Platform.png b/assets/Textures/shrine2Platform.png new file mode 100644 index 00000000..2c39e296 Binary files /dev/null and b/assets/Textures/shrine2Platform.png differ diff --git a/assets/Textures/shrine2Roof.png b/assets/Textures/shrine2Roof.png new file mode 100644 index 00000000..93481bdd Binary files /dev/null and b/assets/Textures/shrine2Roof.png differ diff --git a/assets/Textures/shrine2Stairs.png b/assets/Textures/shrine2Stairs.png new file mode 100644 index 00000000..26c79ecc Binary files /dev/null and b/assets/Textures/shrine2Stairs.png differ diff --git a/assets/Textures/shrine2SupportBeams.png b/assets/Textures/shrine2SupportBeams.png new file mode 100644 index 00000000..78ea71f9 Binary files /dev/null and b/assets/Textures/shrine2SupportBeams.png differ diff --git a/src/main/java/electrosphere/engine/LoadingThread.java b/src/main/java/electrosphere/engine/LoadingThread.java index f8d5ae1f..af10e380 100644 --- a/src/main/java/electrosphere/engine/LoadingThread.java +++ b/src/main/java/electrosphere/engine/LoadingThread.java @@ -717,25 +717,25 @@ public class LoadingThread extends Thread { // EntityUtils.getActor(grass).maskShader("Cube", "Shaders/grass1/grass1.vs", "Shaders/grass1/grass1.gs", "Shaders/grass1/grass1.fs"); // EntityUtils.getPosition(grass).set(3,0,1); - //queue grass shader - // Globals.assetManager.addShaderToQueue("Shaders/grass1/grass1.vs", "Shaders/grass1/grass1.gs", "Shaders/grass1/grass1.fs"); - // for(int x = 0; x < 10; x++){ - // for(int y = 0; y < 10; y++){ - // Entity grass = EntityUtils.spawnDrawableEntity("Models/grass1.fbx"); - // //shader mask - // EntityUtils.getActor(grass).maskShader("Cube", "Shaders/grass1/grass1.vs", "Shaders/grass1/grass1.gs", "Shaders/grass1/grass1.fs"); - // EntityUtils.getPosition(grass).set(3 + x / 5.0f,0.0,1 + y / 5.0f); - // } - // } + // queue grass shader + Globals.assetManager.addShaderToQueue("Shaders/grass1/grass1.vs", "Shaders/grass1/grass1.gs", "Shaders/grass1/grass1.fs"); + for(int x = 0; x < 10; x++){ + for(int y = 0; y < 10; y++){ + Entity grass = EntityUtils.spawnDrawableEntity("Models/grass1.fbx"); + //shader mask + EntityUtils.getActor(grass).maskShader("Cube", "Shaders/grass1/grass1.vs", "Shaders/grass1/grass1.gs", "Shaders/grass1/grass1.fs"); + EntityUtils.getPosition(grass).set(3 + x / 5.0f,0.0,1 + y / 5.0f); + } + } //water cube Entity water = EntityUtils.spawnDrawableEntity("Models/watercube1.fbx"); EntityUtils.getActor(water).maskShader("Cube", "Shaders/water1/water.vs", "Shaders/water1/water.fs"); Globals.assetManager.addShaderToQueue("Shaders/water1/water.vs", "Shaders/water1/water.fs"); - EntityUtils.getPosition(water).set(5,0.51,5); - EntityUtils.getRotation(water).rotationX((float)Math.PI/4.0f); - // EntityUtils.getPosition(water).set(5,-0.1,5); + // EntityUtils.getPosition(water).set(5,0.51,5); + // EntityUtils.getRotation(water).rotationX((float)Math.PI/4.0f); + EntityUtils.getPosition(water).set(5,-0.1,5); EntityUtils.getScale(water).set(1,1,1); //texture mask EntityUtils.getActor(water).addTextureMask(RenderUtils.generateVolumetricTextureMask("Cube")); @@ -745,6 +745,13 @@ public class LoadingThread extends Thread { water.putData(EntityDataStrings.DRAW_TRANSPARENT_PASS, true); + + //shrine 2 + Entity shrine = EntityUtils.spawnDrawableEntity("Models/shrine2.fbx"); + EntityUtils.getPosition(shrine).set(15,0,15); + EntityUtils.getRotation(shrine).rotationX((float)-Math.PI/2.0f); + + // goblin = CreatureUtils.spawnBasicCreature("Goblin"); // CollisionObjUtils.positionCharacter(goblin, new Vector3f(3, 0, 4)); // EntityUtils.getScale(goblin).set(0.005f);