From 9388606d4db7e2c2c4614fae3ffb520bd14cc153 Mon Sep 17 00:00:00 2001 From: charly-perspectives <119584927+charly-perspectives@users.noreply.github.com> Date: Thu, 5 Oct 2023 15:16:40 +0200 Subject: [PATCH] fix indentation in mtl file --- Obj2Tiles.Library/Materials/Material.cs | 5 +++-- Obj2Tiles/Utils.cs | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Obj2Tiles.Library/Materials/Material.cs b/Obj2Tiles.Library/Materials/Material.cs index 84b6f82..1e6f8d6 100644 --- a/Obj2Tiles.Library/Materials/Material.cs +++ b/Obj2Tiles.Library/Materials/Material.cs @@ -69,8 +69,9 @@ public static Material[] ReadMtl(string path, out string[] dependencies) { if (line.StartsWith("#") || string.IsNullOrWhiteSpace(line)) continue; - - var parts = line.Split(' '); + + var lineTrimmed = line.Trim(); + var parts = lineTrimmed.Split(' '); switch (parts[0]) { case "newmtl": diff --git a/Obj2Tiles/Utils.cs b/Obj2Tiles/Utils.cs index dca59a4..1df8bf3 100644 --- a/Obj2Tiles/Utils.cs +++ b/Obj2Tiles/Utils.cs @@ -35,73 +35,73 @@ private static IEnumerable GetMtlDependencies(string mtlPath) var dependencies = new List(); - + foreach (var line in mtlFile) { - if (line.StartsWith("map_Kd")) + if (line.Trim().StartsWith("map_Kd")) { dependencies.Add(line[7..].Trim()); continue; } - if (line.StartsWith("map_Ka")) + if (line.Trim().StartsWith("map_Ka")) { dependencies.Add(line[7..].Trim()); continue; } - if (line.StartsWith("norm")) + if (line.Trim().StartsWith("norm")) { dependencies.Add(line[5..].Trim()); continue; } - if (line.StartsWith("map_Ks")) + if (line.Trim().StartsWith("map_Ks")) { dependencies.Add(line[7..].Trim()); continue; } - if (line.StartsWith("map_Bump")) + if (line.Trim().StartsWith("map_Bump")) { dependencies.Add(line[8..].Trim()); continue; } - if (line.StartsWith("map_d")) + if (line.Trim().StartsWith("map_d")) { dependencies.Add(line[6..].Trim()); continue; } - if (line.StartsWith("map_Ns")) + if (line.Trim().StartsWith("map_Ns")) { dependencies.Add(line[7..].Trim()); continue; } - if (line.StartsWith("bump")) + if (line.Trim().StartsWith("bump")) { dependencies.Add(line[5..].Trim()); continue; } - if (line.StartsWith("disp")) + if (line.Trim().StartsWith("disp")) { dependencies.Add(line[5..].Trim()); continue; } - if (line.StartsWith("decal")) + if (line.Trim().StartsWith("decal")) { dependencies.Add(line[6..].Trim());