replace line with trimmedLine to do slicing

OpenDroneMap · Dec 19, 2023 · 1e4328f · 1e4328f
1 parent 1909c8f
commit 1e4328f
Showing 1 changed file with 15 additions and 13 deletions.
diff --git 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;
             }