ModelLoader uses context pathmanager

project.godot

@@ -15,6 +15,10 @@ run/main_scene="res://project/scenes/main.tscn"
 config/features=PackedStringArray("4.3", "C#", "Forward Plus")
 config/icon="res://icon.svg"
 
+[autoload]
+
+Context="*res://project/code/TMV/Context.cs"
+
 [dotnet]
 
 project/assembly_name="Thief Mission Viewer"

project/code/LGS/ResourcePathManager.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
@@ -5,7 +6,14 @@ using System.Linq;
 
 namespace KeepersCompound.LGS;
 
-// TODO: Merge the two versions of GetXXX and handle null campaign string as OM
+public enum ResourceType
+{
+    Mission,
+    Object,
+    ObjectTexture,
+    Texture,
+}
+
 public class ResourcePathManager
 {
     private record CampaignResources
@@ -14,6 +22,33 @@ public class ResourcePathManager
         public Dictionary<string, string> texturePathMap;
         public Dictionary<string, string> objectPathMap;
         public Dictionary<string, string> objectTexturePathMap;
+
+        public List<string> GetResourceNames(ResourceType type)
+        {
+            List<string> keys = type switch
+            {
+                ResourceType.Mission => [.. missionPathMap.Keys],
+                ResourceType.Object => [.. objectPathMap.Keys],
+                ResourceType.ObjectTexture => [.. objectTexturePathMap.Keys],
+                ResourceType.Texture => [.. texturePathMap.Keys],
+                _ => throw new ArgumentOutOfRangeException(nameof(type)),
+            };
+            keys.Sort();
+            return keys;
+        }
+
+        public string GetResourcePath(ResourceType type, string name)
+        {
+            var map = type switch
+            {
+                ResourceType.Mission => missionPathMap,
+                ResourceType.Object => objectPathMap,
+                ResourceType.ObjectTexture => objectTexturePathMap,
+                ResourceType.Texture => texturePathMap,
+                _ => throw new ArgumentOutOfRangeException(nameof(type)),
+            };
+            return map.TryGetValue(name, out var resourcePath) ? resourcePath : null;
+        }
     }
 
     private bool _initialised = false;
@@ -102,127 +137,57 @@ public class ResourcePathManager
         return names;
     }
 
-    public string GetMissionPath(string campaignName, string missionName)
+    public List<string> GetResourceNames(ResourceType type, string campaignName)
     {
-        if (!_initialised) return null;
+        if (!_initialised)
+        {
+            throw new InvalidOperationException("Resource Path Manager hasn't been initialised.");
+        }
 
         if (campaignName == null || campaignName == "")
         {
-            if (_omResources.missionPathMap.TryGetValue(missionName, out var omPath))
-            {
-                return omPath;
-            }
-        }
-        else if (
-            _fmResources.TryGetValue(campaignName, out var campaign) &&
-            campaign.missionPathMap.TryGetValue(missionName, out var fmPath))
-        {
-            return fmPath;
-        }
-
-        return null;
-    }
-
-    public List<string> GetMissionNames(string campaignName)
-    {
-        if (!_initialised) return null;
-
-        if (campaignName == null || campaignName == "")
-        {
-            var names = new List<string>(_omResources.missionPathMap.Keys);
-            names.Sort();
-            return names;
+            return _omResources.GetResourceNames(type);
         }
         else if (_fmResources.TryGetValue(campaignName, out var campaign))
         {
-            var names = new List<string>(campaign.missionPathMap.Keys);
-            names.Sort();
-            return names;
+            return campaign.GetResourceNames(type);
         }
-        return null;
+
+        throw new ArgumentException("No campaign found with given name", nameof(campaignName));
     }
 
-    // TODO: OMs fail to find a path, but FMs using OM textures do  find them
-    // The OMs still fail even if I put them in a folder with FMs that work=??
-    public string GetTexturePath(string campaignName, string textureName)
+    public (string, string) GetResourcePath(
+        ResourceType type,
+        string campaignName,
+        string resourceName)
     {
-        if (!_initialised) return null;
-
-        textureName = textureName.ToLower();
-        if (campaignName == null || campaignName == "")
+        if (!_initialised)
         {
-            if (_omResources.texturePathMap.TryGetValue(textureName, out var path))
-            {
-                return path;
-            }
+            throw new InvalidOperationException("Resource Path Manager hasn't been initialised.");
+        }
+
+        resourceName = resourceName.ToLower();
+        var omResourcePath = _omResources.GetResourcePath(type, resourceName);
+
+        if (campaignName == null || campaignName == "" && omResourcePath != null)
+        {
+            return ("", omResourcePath);
         }
         else if (_fmResources.TryGetValue(campaignName, out var campaign))
         {
-            if (campaign.texturePathMap.TryGetValue(textureName, out var fmPath))
+            var fmResourcePath = campaign.GetResourcePath(type, resourceName);
+            if (fmResourcePath != null)
             {
-                return fmPath;
+                return (campaignName, fmResourcePath);
             }
-            else if (_omResources.texturePathMap.TryGetValue(textureName, out var omPath))
+            else if (omResourcePath != null)
             {
-                return omPath;
+                return ("", omResourcePath);
             }
         }
 
-        return null;
-    }
-
-    public string GetObjectPath(ref string campaignName, string objectName)
-    {
-        if (!_initialised) return null;
-
-        objectName = objectName.ToLower();
-        if (campaignName == null || campaignName == "")
-        {
-            if (_omResources.objectPathMap.TryGetValue(objectName, out var omPath))
-            {
-                return omPath;
-            }
-        }
-        if (_fmResources.TryGetValue(campaignName, out var campaign))
-        {
-            if (campaign.objectPathMap.TryGetValue(objectName, out var fmPath))
-            {
-                return fmPath;
-            }
-            else if (_omResources.objectPathMap.TryGetValue(objectName, out var omPath))
-            {
-                campaignName = "";
-                return omPath;
-            }
-        }
-        return null;
-    }
-
-    public string GetObjectTexturePath(string campaignName, string textureName)
-    {
-        if (!_initialised) return null;
-
-        textureName = Path.GetFileNameWithoutExtension(textureName).ToLower();
-        if (campaignName == null || campaignName == "")
-        {
-            if (_omResources.objectTexturePathMap.TryGetValue(textureName, out var path))
-            {
-                return path;
-            }
-        }
-        else if (_fmResources.TryGetValue(campaignName, out var campaign))
-        {
-            if (campaign.objectTexturePathMap.TryGetValue(textureName, out var fmPath))
-            {
-                return fmPath;
-            }
-            else if (_omResources.objectTexturePathMap.TryGetValue(textureName, out var omPath))
-            {
-                return omPath;
-            }
-        }
-
-        return null;
+        // throw new ArgumentException($"No resource found with given type and name: {type}, {resourceName}", nameof(resourceName));
+        return (null, null);
     }
 
     private static Dictionary<string, string> GetObjectTexturePaths(string root)
@@ -253,7 +218,6 @@ public class ResourcePathManager
         return pathMap;
     }
 
-    // TODO: Handle object textures?
     private static Dictionary<string, string> GetTexturePaths(string root)
     {
         string[] validExtensions = { ".dds", ".png", ".tga", ".pcx", ".gif", ".bmp", ".cel", };

project/code/TMV/Context.cs

@@ -0,0 +1,21 @@
+using Godot;
+using KeepersCompound.LGS;
+
+namespace KeepersCompound.TMV;
+
+public partial class Context : Node
+{
+    public static Context Instance { get; private set; }
+
+    public ResourcePathManager PathManager { get; private set; }
+    public ModelLoader ModelLoader { get; private set; }
+
+    public override void _Ready()
+    {
+        var extractPath = ProjectSettings.GlobalizePath($"user://extracted/tmp");
+        PathManager = new ResourcePathManager(extractPath);
+        ModelLoader = new ModelLoader();
+
+        Instance = this;
+    }
+}

project/code/TMV/InstallPaths.cs

@@ -1,57 +0,0 @@
-using System.IO;
-using Godot;
-
-namespace KeepersCompound.TMV;
-
-// TODO: Error handling lol
-public class InstallPaths
-{
-    public string rootPath;
-    public string famPath;
-    public string objPath;
-    public string omsPath;
-    public string fmsPath;
-
-    public InstallPaths(string root)
-    {
-        var searchOptions = new EnumerationOptions
-        {
-            MatchCasing = MatchCasing.CaseInsensitive,
-            RecurseSubdirectories = true
-        };
-
-        rootPath = root;
-        famPath = Directory.GetFiles(rootPath, "fam.crf", searchOptions)[0];
-        objPath = Directory.GetFiles(rootPath, "obj.crf", searchOptions)[0];
-        var paths = Directory.GetFiles(rootPath, "install.cfg", searchOptions);
-        if (paths.Length == 0)
-        {
-            paths = Directory.GetFiles(rootPath, "darkinst.cfg", searchOptions);
-        }
-        var installCfgPath = paths[0];
-        GD.Print($"Install.cfg: {installCfgPath}");
-        foreach (var line in File.ReadLines(installCfgPath))
-        {
-            if (line.StartsWith("load_path"))
-            {
-                var path = line.Split(" ")[1].Replace("\\", "/");
-                omsPath = Path.GetFullPath(rootPath + path);
-                break;
-            }
-        }
-
-        var camModPath = Directory.GetFiles(rootPath, "cam_mod.ini", searchOptions)[0];
-        fmsPath = rootPath + "/FMs";
-        foreach (var line in File.ReadLines(camModPath))
-        {
-            if (line.StartsWith("fm_path"))
-            {
-                var path = line.Split(" ")[1].Replace("\\", "/");
-                fmsPath = Path.GetFullPath(rootPath + path);
-                break;
-            }
-        }
-
-        GD.Print($"OMs Path: {omsPath}");
-    }
-}

project/code/TMV/Mission.cs

@@ -41,18 +41,13 @@ public partial class Mission : Node3D
 
 	string _campaignName;
 	string _missionName;
-	ResourcePathManager _installPaths;
 	DbFile _file;
 	TextureLoader _textureLoader;
-	ModelLoader _modelLoader;
 	List<ShaderMaterial> _materials;
 	Vector2I _lmLayerMask;
 
 	public override void _Ready()
 	{
-		var extractPath = ProjectSettings.GlobalizePath($"user://extracted/tmp");
-		_installPaths = new ResourcePathManager(extractPath);
-		_modelLoader = new ModelLoader(_installPaths);
 		_materials = new List<ShaderMaterial>();
 		_lmLayerMask = new Vector2I(~0, ~0);
 
@@ -60,12 +55,17 @@ public partial class Mission : Node3D
 		lightmapToggler.Setup(this);
 
 		var missionSelector = GetNode<Control>("%MissionSelector") as MissionSelector;
-		missionSelector.pathManager = _installPaths;
 		missionSelector.MissionSelected += (string campaign, string mission) =>
 		{
 			_campaignName = campaign;
 			_missionName = mission;
-			FileName = _installPaths.GetMissionPath(campaign, mission);
+			var pathManager = Context.Instance.PathManager;
+			var (newCampaign, missionPath) = pathManager.GetResourcePath(ResourceType.Mission, campaign, mission);
+			if (newCampaign != campaign)
+			{
+				GD.Print($"Didn't find campaign mission: ({campaign}, {mission})");
+			}
+			FileName = missionPath;
 			Build = true;
 		};
 	}
@@ -115,7 +115,7 @@ public partial class Mission : Node3D
 	{
 		ClearMap();
 
-		_textureLoader = new TextureLoader(_installPaths, _campaignName);
+		_textureLoader = new TextureLoader(_campaignName);
 		Timing.TimeStage("DbFile Parse", () => _file = new(FileName));
 		Timing.TimeStage("Register Textures", () => UseChunk<TxList>("TXLIST", RegisterTextures));
 		Timing.TimeStage("Build WR", () => UseChunk<WorldRep>("WREXT", BuildWrMeshes));
@@ -249,7 +249,10 @@ public partial class Mission : Node3D
 			var rawRot = brush.angle;
 			var rot = new Vector3(rawRot.Y, rawRot.Z, rawRot.X) * 360 / ushort.MaxValue;
 			var scale = scaleProp == null ? Vector3.One : scaleProp.scale.ToGodotVec3(false);
-			var model = Timing.TimeStage("Get Models", () => { return _modelLoader.Load(_campaignName, modelName); });
+			var model = Timing.TimeStage("Get Models", () =>
+			{
+				return Context.Instance.ModelLoader.Load(_campaignName, modelName);
+			});
 			if (model != null)
 			{
 				model.Position = pos;
@@ -265,14 +268,19 @@ public partial class Mission : Node3D
 					}
 
 					path = prop.value;
+
+					var pathManager = Context.Instance.PathManager;
 					if (path.StartsWith("fam", StringComparison.OrdinalIgnoreCase))
 					{
-						path = _installPaths.GetTexturePath(_campaignName, path);
-						return path != null;
+						var resType = ResourceType.Texture;
+						path = pathManager.GetResourcePath(resType, _campaignName, prop.value).Item2;
+					}
+					else
+					{
+						var resType = ResourceType.ObjectTexture;
+						var resName = Path.GetFileNameWithoutExtension(prop.value);
+						path = pathManager.GetResourcePath(resType, _campaignName, resName).Item2;
 					}
-
-					// gonna assume obj lol
-					path = _installPaths.GetObjectTexturePath(_campaignName, path);
 
 					return path != null;
 				}

project/code/TMV/Model.cs

@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.IO;
 using Godot;
-using KeepersCompound.LGS;
 using KeepersCompound.TMV.UI;
 
 namespace KeepersCompound.TMV;
@@ -11,104 +8,17 @@ public partial class Model : Node3D
     public override void _Ready()
     {
         var modelSelector = GetNode<Control>("%ModelSelector") as ModelSelector;
-        modelSelector.LoadModel += BuildModel;
+        modelSelector.ModelSelected += BuildModel;
     }
 
-    public void BuildModel(string rootPath, string modelPath)
+    public void BuildModel(string campaignName, string modelPath)
     {
         foreach (var node in GetChildren())
         {
             node.QueueFree();
         }
 
-        var modelFile = new ModelFile(modelPath);
-        if (modelFile == null)
-        {
-            GD.Print($"Failed to load model file: {modelPath}");
-            return;
-        }
-
-        // TODO: Remove this disgusting hack. Not only is it a hack, it doesn't support custom models
-        var baseDir = Path.GetDirectoryName(modelPath);
-        var options = new EnumerationOptions
-        {
-            MatchCasing = MatchCasing.CaseInsensitive,
-            RecurseSubdirectories = true,
-        };
-        var materials = new List<StandardMaterial3D>();
-        foreach (var material in modelFile.Materials)
-        {
-            if (material.Type == 0)
-            {
-                var paths = Directory.GetFiles(baseDir, material.Name, options);
-                if (paths.IsEmpty()) continue;
-
-                materials.Add(new StandardMaterial3D
-                {
-                    AlbedoTexture = TextureLoader.LoadTexture(paths[0])
-                });
-            }
-            else
-            {
-                var b = (material.Handle) & 0xff;
-                var g = (material.Handle >> 8) & 0xff;
-                var r = (material.Handle >> 16) & 0xff;
-                var colour = new Color(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f);
-                materials.Add(new StandardMaterial3D
-                {
-                    AlbedoColor = colour
-                });
-            }
-        }
-
-        var surfaceDataMap = new Dictionary<int, MeshSurfaceData>();
-        foreach (var poly in modelFile.Polygons)
-        {
-            var vertices = new List<Vector3>();
-            var normal = modelFile.Normals[poly.Normal].ToGodotVec3();
-            var uvs = new List<Vector2>();
-            for (var i = 0; i < poly.VertexCount; i++)
-            {
-                var vertex = modelFile.Vertices[poly.VertexIndices[i]];
-                vertices.Add(vertex.ToGodotVec3());
-                if (i < poly.UvIndices.Length)
-                {
-                    var uv = modelFile.Uvs[poly.UvIndices[i]];
-                    uvs.Add(new Vector2(uv.X, uv.Y));
-                }
-                else
-                {
-                    uvs.Add(Vector2.Zero);
-                }
-            }
-
-            if (!surfaceDataMap.ContainsKey(poly.Data))
-            {
-                surfaceDataMap.Add(poly.Data, new MeshSurfaceData());
-            }
-
-            surfaceDataMap[poly.Data].AddPolygon(vertices, normal, uvs, uvs);
-        }
-
-        var mesh = new ArrayMesh();
-        foreach (var (materialId, surfaceData) in surfaceDataMap)
-        {
-            var array = surfaceData.BuildSurfaceArray();
-            var surfaceIdx = mesh.GetSurfaceCount();
-            mesh.AddSurfaceFromArrays(Mesh.PrimitiveType.Triangles, array);
-            for (var i = 0; i < materials.Count; i++)
-            {
-                var m = modelFile.Materials[i];
-                if (m.Slot == materialId)
-                {
-                    mesh.SurfaceSetMaterial(surfaceIdx, materials[i]);
-                    break;
-                }
-            }
-        }
-
-        var pos = -modelFile.Header.Center.ToGodotVec3();
-        var meshInstance = new MeshInstance3D { Mesh = mesh, Position = pos };
-        AddChild(meshInstance);
+        var model = Context.Instance.ModelLoader.Load(campaignName, modelPath);
+        AddChild(model);
     }
 }

project/code/TMV/ModelLoader.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.IO;
 using Godot;
 using KeepersCompound.LGS;
 
@@ -6,14 +7,7 @@ namespace KeepersCompound.TMV;
 
 public class ModelLoader
 {
-    private readonly Dictionary<(string, string), MeshInstance3D> _cache;
-    private readonly ResourcePathManager _pathManager;
-
-    public ModelLoader(ResourcePathManager pathManager)
-    {
-        _pathManager = pathManager;
-        _cache = new Dictionary<(string, string), MeshInstance3D>();
-    }
+    private readonly Dictionary<(string, string), MeshInstance3D> _cache = new();
 
     public MeshInstance3D Load(string campaignName, string modelName, bool forceLoad = false)
     {
@@ -32,14 +26,16 @@ public class ModelLoader
         }
 
         // We don't care if this is null actually, we'll still cache that it's null lol
-        var model = Timing.TimeStage("Load Models", () => { return LoadModel(_pathManager, ref campaignName, modelName); });
+        var model = Timing.TimeStage("Load Models", () => { return LoadModel(ref campaignName, modelName); });
         _cache[(campaignName, modelName)] = model;
         return model?.Duplicate() as MeshInstance3D;
     }
 
-    public static MeshInstance3D LoadModel(ResourcePathManager pathManager, ref string campaignName, string modelName)
+    public static MeshInstance3D LoadModel(ref string campaignName, string modelName)
     {
-        var modelPath = pathManager.GetObjectPath(ref campaignName, modelName);
+        var pathManager = Context.Instance.PathManager;
+        var (newCampaignName, modelPath) = pathManager.GetResourcePath(ResourceType.Object, campaignName, modelName);
+        campaignName = newCampaignName;
         if (modelPath == null)
         {
             return null;
@@ -56,7 +52,8 @@ public class ModelLoader
         {
             if (material.Type == 0)
             {
-                var path = pathManager.GetObjectTexturePath(campaignName, material.Name);
+                var resName = Path.GetFileNameWithoutExtension(material.Name);
+                var (_, path) = pathManager.GetResourcePath(ResourceType.ObjectTexture, campaignName, resName);
                 if (path == null)
                 {
                     path = "user://textures/jorge.png";

project/code/TMV/TextureLoader.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using Godot;
 using KeepersCompound.LGS;
@@ -7,16 +8,14 @@ namespace KeepersCompound.TMV;
 
 public partial class TextureLoader
 {
-    private readonly ResourcePathManager _pathManager;
     private readonly string _fmName;
     private readonly List<ImageTexture> _textureCache = new();
     private readonly Dictionary<int, int> _idMap = new();
     private readonly Dictionary<int, string> _idPathMap = new();
     private readonly Dictionary<string, int> _pathMap = new();
 
-    public TextureLoader(ResourcePathManager pathManager, string fmName)
+    public TextureLoader(string fmName)
     {
-        _pathManager = pathManager;
         _fmName = fmName;
         LoadDefaultTexture();
     }
@@ -37,7 +36,8 @@ public partial class TextureLoader
     private bool Load(int id, string path)
     {
         var loaded = false;
-        string texPath = _pathManager.GetTexturePath(_fmName, path);
+        var pathManager = Context.Instance.PathManager;
+        var (_, texPath) = pathManager.GetResourcePath(ResourceType.Texture, _fmName, path);
 
         if (texPath != null)
         {

project/code/TMV/UI/MissionSelector.cs

@@ -8,8 +8,6 @@ public partial class MissionSelector : Control
 	public event MissionSelectedEventHandler MissionSelected;
 	public delegate void MissionSelectedEventHandler(string campaign, string mission);
 
-	public ResourcePathManager pathManager;
-
 	private FileDialog _FolderSelect;
 	private LineEdit _FolderPath;
 	private Button _BrowseButton;
@@ -52,7 +50,7 @@ public partial class MissionSelector : Control
 	private void SetInstallPath(string path)
 	{
 		_FolderPath.Text = path;
-		if (pathManager.Init(path))
+		if (Context.Instance.PathManager.Init(path))
 		{
 			BuildCampaignList();
 		}
@@ -64,6 +62,7 @@ public partial class MissionSelector : Control
 		_Missions.Clear();
 		_LoadButton.Disabled = true;
 
+		var pathManager = Context.Instance.PathManager;
 		_Campaigns.AddItem("Original Missions");
 		foreach (var campaign in pathManager.GetCampaignNames())
 		{
@@ -76,8 +75,9 @@ public partial class MissionSelector : Control
 		_Missions.Clear();
 		_LoadButton.Disabled = true;
 
-		var campaignName = _Campaigns.GetItemText((int)idx);
-		var missionNames = pathManager.GetMissionNames(idx == 0 ? null : campaignName);
+		var pathManager = Context.Instance.PathManager;
+		var campaignName = idx == 0 ? null : _Campaigns.GetItemText((int)idx);
+		var missionNames = pathManager.GetResourceNames(ResourceType.Mission, campaignName);
 		foreach (var mission in missionNames)
 		{
 			_Missions.AddItem(mission);

project/code/TMV/UI/ModelSelector.cs

@@ -1,20 +1,18 @@
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
 using Godot;
+using KeepersCompound.LGS;
 
 namespace KeepersCompound.TMV.UI;
 
 public partial class ModelSelector : Control
-{
-	[Signal]
-	public delegate void LoadModelEventHandler(string rootPath, string modelPath);
 
-	private InstallPaths _installPaths;
+{
+	public event ModelSelectedEventHandler ModelSelected;
+	public delegate void ModelSelectedEventHandler(string campaign, string mission);
 
 	private FileDialog _FolderSelect;
 	private LineEdit _FolderPath;
 	private Button _BrowseButton;
+	private ItemList _Campaigns;
 	private ItemList _Models;
 	private Button _LoadButton;
 	private Button _CancelButton;
@@ -28,13 +26,15 @@ public partial class ModelSelector : Control
 		_FolderSelect = GetNode<FileDialog>("%FolderSelect");
 		_FolderPath = GetNode<LineEdit>("%FolderPath");
 		_BrowseButton = GetNode<Button>("%BrowseButton");
+		_Campaigns = GetNode<ItemList>("%Campaigns");
 		_Models = GetNode<ItemList>("%Models");
 		_LoadButton = GetNode<Button>("%LoadButton");
 		_CancelButton = GetNode<Button>("%CancelButton");
 
 		_BrowseButton.Pressed += () => _FolderSelect.Visible = true;
-		_FolderSelect.DirSelected += (string dir) => { _FolderPath.Text = dir; BuildModelList(dir); };
-		_FolderPath.TextSubmitted += BuildModelList;
+		_FolderSelect.DirSelected += SetInstallPath;
+		_FolderPath.TextSubmitted += SetInstallPath;
+		_Campaigns.ItemSelected += BuildModelList;
 		_Models.ItemSelected += (long _) => _LoadButton.Disabled = false;
 		_LoadButton.Pressed += EmitLoadModel;
 		_CancelButton.Pressed += () => Visible = false;
@@ -51,44 +51,57 @@ public partial class ModelSelector : Control
 		}
 	}
 
-	private void BuildModelList(string path)
+	private void SetInstallPath(string path)
 	{
-		_installPaths = new InstallPaths(path);
-		ExtractObjFiles();
-
-		_Models.Clear();
-		_LoadButton.Disabled = true;
-
-		var paths = Directory.GetFiles(_extractedObjectsPath, "*.bin", SearchOption.AllDirectories);
-		foreach (var m in paths.OrderBy(s => s))
+		_FolderPath.Text = path;
+		if (Context.Instance.PathManager.Init(path))
 		{
-			_Models.AddItem(m.TrimPrefix(_extractedObjectsPath));
+			BuildCampaignList();
 		}
 	}
 
-	// TODO: Move this to a resource manager
-	private void ExtractObjFiles()
+	private void BuildCampaignList()
 	{
-		var dir = new DirectoryInfo(_extractedObjectsPath);
-		if (dir.Exists)
-		{
-			dir.Delete(true);
-		}
+		_Campaigns.Clear();
+		_Models.Clear();
+		_LoadButton.Disabled = true;
 
-		var zip = ZipFile.OpenRead(_installPaths.objPath);
-		zip.ExtractToDirectory(_extractedObjectsPath);
+		var pathManager = Context.Instance.PathManager;
+		_Campaigns.AddItem("Original Missions");
+		foreach (var campaign in pathManager.GetCampaignNames())
+		{
+			_Campaigns.AddItem(campaign);
+		}
+	}
+
+	private void BuildModelList(long idx)
+	{
+		_Models.Clear();
+		_LoadButton.Disabled = true;
+
+		var pathManager = Context.Instance.PathManager;
+		var campaignName = idx == 0 ? null : _Campaigns.GetItemText((int)idx);
+		var modelNames = pathManager.GetResourceNames(ResourceType.Object, campaignName);
+		foreach (var model in modelNames)
+		{
+			_Models.AddItem(model);
+		}
 	}
 
 	private void EmitLoadModel()
 	{
-		var selected = _Models.GetSelectedItems();
-		if (selected.IsEmpty())
+		var campaignIdxs = _Campaigns.GetSelectedItems();
+		var modelIdxs = _Models.GetSelectedItems();
+		if (campaignIdxs.IsEmpty() || modelIdxs.IsEmpty())
 		{
 			return;
 		}
 
-		var path = _extractedObjectsPath + _Models.GetItemText(selected[0]);
-		EmitSignal(SignalName.LoadModel, _installPaths.rootPath, path);
+		var campaignIdx = campaignIdxs[0];
+		var modelIdx = modelIdxs[0];
+		var campaignName = campaignIdx == 0 ? null : _Campaigns.GetItemText(campaignIdx);
+		var modelName = _Models.GetItemText(modelIdx);
+		ModelSelected(campaignName, modelName);
 
 		Visible = false;
 	}

project/scenes/model_viewer.tscn

@@ -15,13 +15,15 @@ ssao_enabled = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.110309, 0.187101, -0.461656)
 script = ExtResource("1_dax7s")
 
-[node name="Camera3D" type="Camera3D" parent="."]
-script = ExtResource("2_ov7rc")
-
 [node name="UI" type="CanvasLayer" parent="."]
 
 [node name="ModelSelector" parent="UI" instance=ExtResource("3_ovrmo")]
 unique_name_in_owner = true
 
-[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
+[node name="Environment" type="Node3D" parent="."]
+
+[node name="WorldEnvironment" type="WorldEnvironment" parent="Environment"]
 environment = SubResource("Environment_e4172")
+
+[node name="Camera3D" type="Camera3D" parent="Environment"]
+script = ExtResource("2_ov7rc")

project/scenes/ui/model_selector.tscn

@@ -77,6 +77,12 @@ text = "Browse"
 [node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
 
+[node name="Campaigns" type="ItemList" parent="PanelContainer/MarginContainer/VBoxContainer/HBoxContainer"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(0, 480)
+layout_mode = 2
+size_flags_horizontal = 3
+
 [node name="Models" type="ItemList" parent="PanelContainer/MarginContainer/VBoxContainer/HBoxContainer"]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(0, 480)