diff --git a/assets/Models/foliage/falloak1.fbx b/assets/Models/foliage/falloak1.fbx deleted file mode 100644 index c30e1a9d..00000000 Binary files a/assets/Models/foliage/falloak1.fbx and /dev/null differ diff --git a/assets/Models/foliage/tree1.fbx b/assets/Models/foliage/tree1.fbx deleted file mode 100644 index 9098b9c8..00000000 Binary files a/assets/Models/foliage/tree1.fbx and /dev/null differ diff --git a/assets/Textures/Branch.png b/assets/Textures/Branch.png deleted file mode 100644 index 82d12047..00000000 Binary files a/assets/Textures/Branch.png and /dev/null differ diff --git a/assets/Textures/animetree1leaves1.png b/assets/Textures/animetree1leaves1.png deleted file mode 100644 index 9091a999..00000000 Binary files a/assets/Textures/animetree1leaves1.png and /dev/null differ diff --git a/assets/Textures/building_diffuse.png b/assets/Textures/building_diffuse.png deleted file mode 100644 index bc113fd0..00000000 Binary files a/assets/Textures/building_diffuse.png and /dev/null differ diff --git a/assets/Textures/Testing1.png b/assets/Textures/color/Testing1.png similarity index 100% rename from assets/Textures/Testing1.png rename to assets/Textures/color/Testing1.png diff --git a/assets/Textures/default_texture_map.json b/assets/Textures/default_texture_map.json index a4fe4449..1643729c 100644 --- a/assets/Textures/default_texture_map.json +++ b/assets/Textures/default_texture_map.json @@ -63,16 +63,6 @@ "diffuse" : "/Textures/katana1.png" } ], - "Models/tree1.fbx": [ - { - "meshName" : "Cube.002", - "diffuse" : "/Textures/Branch.png" - }, - { - "meshName" : "Cylinder", - "diffuse" : "/Textures/Branch.png" - } - ], "Models/goblin1.fbx" : [ { "meshName" : "makehuman1", @@ -115,12 +105,6 @@ "diffuse" : "/Textures/b1.png" } ], - "Models/building1.fbx" : [ - { - "meshName" : "Cube.001", - "diffuse" : "/Textures/building_diffuse.png" - } - ], "Models/basic/geometry/unitcylinder.fbx" : [ { "meshName" : "Cylinder", @@ -233,32 +217,6 @@ "isDefault" : true } ], - "Models/shrine2.fbx" : [ - { - "meshName" : "Roof", - "diffuse" : "/Textures/shrine2Roof.png" - }, - { - "meshName" : "MainWalls", - "diffuse" : "/Textures/shrine2MainWalls.png" - }, - { - "meshName" : "Feet", - "diffuse" : "/Textures/shrine2Feet.png" - }, - { - "meshName" : "Platform", - "diffuse" : "/Textures/shrine2Platform.png" - }, - { - "meshName" : "SupportBeams", - "diffuse" : "/Textures/shrine2SupportBeams.png" - }, - { - "meshName" : "Stairs", - "diffuse" : "/Textures/shrine2Stairs.png" - } - ], "Models/foliage/foliageBlockTemplate1Test1.fbx" : [ { "meshName" : "Plane", diff --git a/assets/Textures/floatingisland1.png b/assets/Textures/floatingisland1.png deleted file mode 100644 index 1b851aa1..00000000 Binary files a/assets/Textures/floatingisland1.png and /dev/null differ diff --git a/assets/Textures/grass1.png b/assets/Textures/grass1.png deleted file mode 100644 index 51aacd1c..00000000 Binary files a/assets/Textures/grass1.png and /dev/null differ diff --git a/assets/Textures/leaves.png b/assets/Textures/leaves.png deleted file mode 100644 index 7f1474e1..00000000 Binary files a/assets/Textures/leaves.png and /dev/null differ diff --git a/assets/Textures/leavesStylized1.png b/assets/Textures/leavesStylized1.png deleted file mode 100644 index d2d9589e..00000000 Binary files a/assets/Textures/leavesStylized1.png and /dev/null differ diff --git a/assets/Textures/spark1.png b/assets/Textures/spark1.png deleted file mode 100644 index 9c8dc27f..00000000 Binary files a/assets/Textures/spark1.png and /dev/null differ diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index e75b94ac..b05d64aa 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1481,6 +1481,10 @@ Fix playerless scene updates More tool recipes UI test data fixes +(04/15/2025) +Cull unused assets +Update default texture + diff --git a/src/main/java/electrosphere/engine/Globals.java b/src/main/java/electrosphere/engine/Globals.java index d8004c13..615d4b03 100644 --- a/src/main/java/electrosphere/engine/Globals.java +++ b/src/main/java/electrosphere/engine/Globals.java @@ -290,10 +290,9 @@ public class Globals { public static String textureSpecularDefault; public static Material materialDefault; - public static String blackTexture = "Textures/b1.png"; - public static String testingTexture = "Textures/Testing1.png"; - public static String whiteTexture = "Textures/w1.png"; - public static String offWhiteTexture = "Textures/ow1.png"; + public static final String blackTexture = "Textures/b1.png"; + public static final String whiteTexture = "Textures/w1.png"; + public static final String offWhiteTexture = "Textures/ow1.png"; public static String imagePlaneModelID; public static String solidPlaneModelID; @@ -616,6 +615,7 @@ public class Globals { * Texture paths to be loaded when renderer inits */ private static String[] defaultTexturePaths = new String[]{ + AssetDataStrings.TEXTURE_DEFAULT, "Textures/default_diffuse.png", "Textures/default_specular.png", "Textures/b1.png", @@ -661,8 +661,8 @@ public class Globals { //create default material materialDefault = new Material(); - materialDefault.set_diffuse("Textures/default_diffuse.png"); - materialDefault.set_specular("Textures/default_specular.png"); + materialDefault.set_diffuse(AssetDataStrings.TEXTURE_DEFAULT); + materialDefault.set_specular(AssetDataStrings.TEXTURE_DEFAULT); //create font manager fontManager = new FontManager(); diff --git a/src/main/java/electrosphere/engine/assetmanager/AssetDataStrings.java b/src/main/java/electrosphere/engine/assetmanager/AssetDataStrings.java index 1298560a..c071e769 100644 --- a/src/main/java/electrosphere/engine/assetmanager/AssetDataStrings.java +++ b/src/main/java/electrosphere/engine/assetmanager/AssetDataStrings.java @@ -32,6 +32,7 @@ public class AssetDataStrings { * Fundamental textures of the engine */ public static final String TEXTURE_TEAL_TRANSPARENT = "Textures/color/transparent_teal.png"; + public static final String TEXTURE_DEFAULT = "Textures/color/Testing1.png"; /** * Atlas texture paths