From 1e4328f669097365e8fb1b17a97541c334f2f273 Mon Sep 17 00:00:00 2001
From: Ezio Helios <eziohelios@protonmail.com>
Date: Tue, 19 Dec 2023 17:14:43 +0800
Subject: [PATCH] replace `line` with `trimmedLine` to do slicing

---
 Obj2Tiles/Utils.cs | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/Obj2Tiles/Utils.cs b/Obj2Tiles/Utils.cs
index 3e8f410..9e3b423 100644
--- a/Obj2Tiles/Utils.cs
+++ b/Obj2Tiles/Utils.cs
@@ -18,10 +18,12 @@ public static IEnumerable<string> GetObjDependencies(string objPath)
 
         foreach (var line in objFile)
         {
-            if (!line.StartsWith("mtllib")) continue;
+            var trimmedLine = line.Trim();
+
+            if (!trimmedLine.StartsWith("mtllib")) continue;
 
-            var mtlPath = Path.Combine(folderName, line[7..].Trim());
-            dependencies.Add(line[7..].Trim());
+            var mtlPath = Path.Combine(folderName, trimmedLine[7..].Trim());
+            dependencies.Add(trimmedLine[7..].Trim());
 
             dependencies.AddRange(GetMtlDependencies(mtlPath));
         }
@@ -42,70 +44,70 @@ private static IEnumerable<string> GetMtlDependencies(string mtlPath)
             
             if (trimmedLine.StartsWith("map_Kd"))
             {
-                dependencies.Add(line[7..].Trim());
+                dependencies.Add(trimmedLine[7..].Trim());
 
                 continue;
             }
 
             if (trimmedLine.StartsWith("map_Ka"))
             {
-                dependencies.Add(line[7..].Trim());
+                dependencies.Add(trimmedLine[7..].Trim());
 
                 continue;
             }
 
             if (trimmedLine.StartsWith("norm"))
             {
-                dependencies.Add(line[5..].Trim());
+                dependencies.Add(trimmedLine[5..].Trim());
 
                 continue;
             }
 
             if (trimmedLine.StartsWith("map_Ks"))
             {
-                dependencies.Add(line[7..].Trim());
+                dependencies.Add(trimmedLine[7..].Trim());
 
                 continue;
             }
 
             if (trimmedLine.StartsWith("map_Bump"))
             {
-                dependencies.Add(line[8..].Trim());
+                dependencies.Add(trimmedLine[8..].Trim());
 
                 continue;
             }
 
             if (trimmedLine.StartsWith("map_d"))
             {
-                dependencies.Add(line[6..].Trim());
+                dependencies.Add(trimmedLine[6..].Trim());
 
                 continue;
             }
 
             if (trimmedLine.StartsWith("map_Ns"))
             {
-                dependencies.Add(line[7..].Trim());
+                dependencies.Add(trimmedLine[7..]);
 
                 continue;
             }
 
             if (trimmedLine.StartsWith("bump"))
             {
-                dependencies.Add(line[5..].Trim());
+                dependencies.Add(trimmedLine[5..].Trim());
 
                 continue;
             }
 
             if (trimmedLine.StartsWith("disp"))
             {
-                dependencies.Add(line[5..].Trim());
+                dependencies.Add(trimmedLine[5..].Trim());
 
                 continue;
             }
 
             if (trimmedLine.StartsWith("decal"))
             {
-                dependencies.Add(line[6..].Trim());
+                dependencies.Add(trimmedLine[6..].Trim());
 
                 continue;
             }