Added support for materials and textures with full paths

globallightingdata · Jul 19, 2023 · 7cb737b · 7cb737b
1 parent 27da351
commit 7cb737b
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/src/L3D.Net/Geometry/ObjParser.cs b/src/L3D.Net/Geometry/ObjParser.cs
@@ -15,7 +15,18 @@ public class ObjParser : IObjParser
 {
     public static readonly IObjParser Instance = new ObjParser();
 
-    public IModel3D? Parse(string fileName, Dictionary<string, Stream> files, ILogger? logger = null)
+    private static string GetFileName(string path)
+    {
+        var stage1 = path.Split('\\').LastOrDefault();
+        if (string.IsNullOrEmpty(stage1))
+            return path;
+        var stage2 = stage1.Split('/').LastOrDefault();
+        if (string.IsNullOrEmpty(stage2))
+            return path;
+        return stage2;
+    }
+
+public IModel3D? Parse(string fileName, Dictionary<string, Stream> files, ILogger? logger = null)
     {
         if (!files.TryGetValue(fileName, out var stream))
             return null;
@@ -25,7 +36,7 @@ public class ObjParser : IObjParser
 
         var objMaterialLibraries = CollectAvailableMaterialLibraries(logger, objFile, files).ToList();
 
-        List<string> textures = CollectAvailableTextures(objMaterialLibraries).Distinct().Where(x => !string.IsNullOrWhiteSpace(x)).Select(Path.GetFileName).Where(files.ContainsKey).ToList()!;
+        List<string> textures = CollectAvailableTextures(objMaterialLibraries).Distinct().Where(x => !string.IsNullOrWhiteSpace(x)).Select(GetFileName!).Where(files.ContainsKey).ToList()!;
 
         return new ObjModel3D
         {
@@ -48,7 +59,7 @@ public IModel3D Parse(string filePath, ILogger? logger = null)
 
         var objMaterialLibraries = CollectAvailableMaterialLibraries(objFile, directory, logger).ToList();
 
-        List<string> textures = CollectAvailableTextures(objMaterialLibraries).Distinct().Where(x => !string.IsNullOrWhiteSpace(x)).Select(Path.GetFileName).ToList();
+        List<string> textures = CollectAvailableTextures(objMaterialLibraries).Distinct().Where(x => !string.IsNullOrWhiteSpace(x)).Select(GetFileName!).ToList();
 
         var filePaths = objMaterialLibraries.Select(x => x.Item1).Union(textures).ToList();
         filePaths.Add(filePath);
@@ -57,7 +68,7 @@ public IModel3D Parse(string filePath, ILogger? logger = null)
 
         return new ObjModel3D
         {
-            FileName = Path.GetFileName(filePath),
+            FileName = GetFileName(filePath),
             ReferencedMaterialLibraryFiles = objMaterialLibraries.Select(tuple => tuple.Item1).ToDictionary(d => d, d => files[d]),
             ReferencedTextureFiles = textures.ToDictionary(d => d, d => files[d]),
             Data = ConvertGeometry(objFile, objMaterialLibraries.Select(tuple => tuple.Item2).ToList(), files),
@@ -71,7 +82,7 @@ private static IEnumerable<Tuple<string, ObjMaterialFile>> CollectAvailableMater
         {
             try
             {
-                mtl = Path.GetFileName(mtl);
+                mtl = GetFileName(mtl);
                 var materialFile = Path.Combine(directory, mtl);
                 return Tuple.Create(mtl, ObjMaterialFile.FromFile(materialFile));
             }