Skip to content

Commit

Permalink
Logging
Browse files Browse the repository at this point in the history
  • Loading branch information
Amrsatrio committed Oct 14, 2020
1 parent 1a145b5 commit ec8bb3e
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 29 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

group 'com.tb24'
version '0.3.3'
version '0.3.4'

sourceCompatibility = 1.8
targetCompatibility = 1.8
Expand Down
58 changes: 30 additions & 28 deletions src/main/java/com/tb24/blenderumap/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ public static void main(String[] args) {
return;
}

LOGGER.info("Reading config file " + configFile.getAbsolutePath());

try (FileReader reader = new FileReader(configFile)) {
config = GSON.fromJson(reader, Config.class);
}
Expand Down Expand Up @@ -441,34 +443,34 @@ public void addToObj(JsonObject obj) {
}

FPackageIndex[][] textures = { // d n s e a
{
textureMap.getOrDefault("Trunk_BaseColor", textureMap.getOrDefault("Diffuse", textureMap.get("DiffuseTexture"))),
textureMap.getOrDefault("Trunk_Normal", textureMap.get("Normals")),
textureMap.getOrDefault("Trunk_Specular", textureMap.get("SpecularMasks")),
textureMap.get("EmissiveTexture"),
textureMap.get("MaskTexture")
},
{
textureMap.get("Diffuse_Texture_3"),
textureMap.get("Normals_Texture_3"),
textureMap.get("SpecularMasks_3"),
textureMap.get("EmissiveTexture_3"),
textureMap.get("MaskTexture_3")
},
{
textureMap.get("Diffuse_Texture_4"),
textureMap.get("Normals_Texture_4"),
textureMap.get("SpecularMasks_4"),
textureMap.get("EmissiveTexture_4"),
textureMap.get("MaskTexture_4")
},
{
textureMap.get("Diffuse_Texture_2"),
textureMap.get("Normals_Texture_2"),
textureMap.get("SpecularMasks_2"),
textureMap.get("EmissiveTexture_2"),
textureMap.get("MaskTexture_2")
}
{
textureMap.getOrDefault("Trunk_BaseColor", textureMap.getOrDefault("Diffuse", textureMap.get("DiffuseTexture"))),
textureMap.getOrDefault("Trunk_Normal", textureMap.get("Normals")),
textureMap.getOrDefault("Trunk_Specular", textureMap.get("SpecularMasks")),
textureMap.get("EmissiveTexture"),
textureMap.get("MaskTexture")
},
{
textureMap.get("Diffuse_Texture_3"),
textureMap.get("Normals_Texture_3"),
textureMap.get("SpecularMasks_3"),
textureMap.get("EmissiveTexture_3"),
textureMap.get("MaskTexture_3")
},
{
textureMap.get("Diffuse_Texture_4"),
textureMap.get("Normals_Texture_4"),
textureMap.get("SpecularMasks_4"),
textureMap.get("EmissiveTexture_4"),
textureMap.get("MaskTexture_4")
},
{
textureMap.get("Diffuse_Texture_2"),
textureMap.get("Normals_Texture_2"),
textureMap.get("SpecularMasks_2"),
textureMap.get("EmissiveTexture_2"),
textureMap.get("MaskTexture_2")
}
};

JsonArray array = new JsonArray(textures.length);
Expand Down

0 comments on commit ec8bb3e

Please sign in to comment.