Import TB CSV objects file

GameRealisticMap.Arma3/IO/ProjectDrive.cs

@@ -148,7 +148,7 @@ public IEnumerable<string> FindAll(string pattern)
         {
             var physical = Directory.GetFiles(mountPath, pattern, SearchOption.AllDirectories)
                 .Select(file => file.Substring(mountPath.Length).TrimStart('\\'))
-                .Where(file => !file.StartsWith("temp\\", StringComparison.OrdinalIgnoreCase));
+                .Where(file => !file.StartsWith("temp\\", StringComparison.OrdinalIgnoreCase) && !file.StartsWith("grm-temp\\", StringComparison.OrdinalIgnoreCase));
             if (secondarySource != null)
             {
                 return secondarySource.FindAll(pattern).Concat(physical).Distinct(StringComparer.OrdinalIgnoreCase);

GameRealisticMap.Arma3/TerrainBuilder/AmbiguousModelName.cs

@@ -0,0 +1,16 @@
+namespace GameRealisticMap.Arma3.TerrainBuilder
+{
+    public sealed class AmbiguousModelName : ApplicationException
+    {
+        public AmbiguousModelName(string name, IReadOnlyCollection<string> candidates)
+            : base($"Name '{name}' matches multiples files : '{string.Join("', '", candidates)}'")
+        {
+            Name = name;
+            Candidates = candidates;
+        }
+
+        public string Name { get; }
+
+        public IReadOnlyCollection<string> Candidates { get; }
+    }
+}

GameRealisticMap.Arma3/TerrainBuilder/IModelInfoLibrary.cs

@@ -6,8 +6,12 @@ public interface IModelInfoLibrary
     {
         ModelInfo ResolveByName(string name);
 
+        bool TryResolveByName(string name, [MaybeNullWhen(false)] out ModelInfo model);
+
         ModelInfo ResolveByPath(string path);
 
         bool TryResolveByPath(string path, [MaybeNullWhen(false)] out ModelInfo model);
+
+        bool TryRegister(string name, string path);
     }
 }

GameRealisticMap.Arma3/TerrainBuilder/ModelInfoLibrary.cs

@@ -24,6 +24,11 @@ public ModelInfoLibrary(IGameFileSystem fileSystem)
             this.fileSystem = fileSystem;
         }
 
+        public bool TryResolveByName(string name, [MaybeNullWhen(false)] out ModelInfo model)
+        {
+            return indexByName.TryGetValue(name, out model);
+        }
+
         public ModelInfo ResolveByName(string name)
         {
             if (!indexByName.TryGetValue(name, out var modelInfo))
@@ -35,7 +40,7 @@ public ModelInfo ResolveByName(string name)
                 }
                 if (candidates.Count > 1)
                 {
-                    throw new ApplicationException($"Name '{name}' matches multiples files : '{string.Join("', '", candidates)}'");
+                    throw new AmbiguousModelName(name, candidates);
                 }
                 throw new ApplicationException($"Unknown model '{name}'");
             }
@@ -215,5 +220,18 @@ public Task Save()
             Directory.CreateDirectory(Path.GetDirectoryName(DefaultCachePath)!);
             return SaveTo(DefaultCachePath);
         }
+
+        public bool TryRegister(string name, string path)
+        {
+            var odol = ReadModelInfoOnly(path);
+            if (odol == null)
+            {
+                return false;
+            }
+
+            var model = new ModelInfo(name, path, odol.BoundingCenter.Vector3);
+            indexByName.Add(name, model);
+            return true;
+        }
     }
 }

GameRealisticMap.Studio/Labels.fr.resx

@@ -1108,4 +1108,25 @@ Dernière génération le {1}</value>
   <data name="PartHasBeenAlreadyImported" xml:space="preserve">
     <value>La partie #{0} a déjà été importée.</value>
   </data>
+  <data name="RelativeElevation" xml:space="preserve">
+    <value>Positon relative (au sol)</value>
+  </data>
+  <data name="NoValidObjectDefinitionFoundInFile" xml:space="preserve">
+    <value>Aucune définition valide d'objet n'a été trouvé dans le fichier.</value>
+  </data>
+  <data name="NumObjectsToImport" xml:space="preserve">
+    <value>{0} objets à importer</value>
+  </data>
+  <data name="ImportObjectsFromFile" xml:space="preserve">
+    <value>Importer des objets depuis un fichier</value>
+  </data>
+  <data name="ImportsObjects" xml:space="preserve">
+    <value>Importer les objets</value>
+  </data>
+  <data name="ElevationMode" xml:space="preserve">
+    <value>Mode d'altitude</value>
+  </data>
+  <data name="AbsoluteElevation" xml:space="preserve">
+    <value>Position absolue</value>
+  </data>
 </root>

GameRealisticMap.Studio/Labels.resx

@@ -1108,4 +1108,25 @@ Last generated on {1}</value>
   <data name="ImportNextPartPrompt" xml:space="preserve">
     <value>Click on Refresh button when part #{0} is copied to continue import.</value>
   </data>
+  <data name="ImportObjectsFromFile" xml:space="preserve">
+    <value>Import objects from file</value>
+  </data>
+  <data name="ImportsObjects" xml:space="preserve">
+    <value>Import objects</value>
+  </data>
+  <data name="RelativeElevation" xml:space="preserve">
+    <value>Relative elevation (to ground)</value>
+  </data>
+  <data name="AbsoluteElevation" xml:space="preserve">
+    <value>Absolute elevation</value>
+  </data>
+  <data name="ElevationMode" xml:space="preserve">
+    <value>Elevation mode</value>
+  </data>
+  <data name="NoValidObjectDefinitionFoundInFile" xml:space="preserve">
+    <value>No valid object definition found in file.</value>
+  </data>
+  <data name="NumObjectsToImport" xml:space="preserve">
+    <value>{0} objects to import</value>
+  </data>
 </root>

GameRealisticMap.Studio/Modules/Arma3WorldEditor/ViewModels/AmbiguousItem.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Threading.Tasks;
+
+namespace GameRealisticMap.Studio.Modules.Arma3WorldEditor.ViewModels
+{
+    internal class AmbiguousItem
+    {
+        private readonly FileImporterViewModel parent;
+
+        public AmbiguousItem(FileImporterViewModel parent, string name, string path, Uri preview)
+        {
+            this.parent = parent;
+            Name = name;
+            Path = path;
+            Preview = preview;
+        }
+
+        public string Name { get; }
+
+        public string Path { get; }
+
+        public Uri Preview { get; }
+
+        public Task Resolve()
+        {
+            return parent.Resolve(Name,Path);
+        }
+    }
+}

GameRealisticMap.Studio/Modules/Arma3WorldEditor/ViewModels/Arma3WorldEditorViewModel.cs

@@ -13,11 +13,15 @@
 using GameRealisticMap.Arma3.GameEngine;
 using GameRealisticMap.Arma3.GameLauncher;
 using GameRealisticMap.Arma3.IO;
+using GameRealisticMap.Arma3.TerrainBuilder;
+using GameRealisticMap.ElevationModel;
+using GameRealisticMap.Reporting;
 using GameRealisticMap.Studio.Modules.Arma3Data;
 using GameRealisticMap.Studio.Modules.Arma3Data.Services;
 using GameRealisticMap.Studio.Modules.Reporting;
 using GameRealisticMap.Studio.Toolkit;
 using Gemini.Framework;
+using Microsoft.Win32;
 
 namespace GameRealisticMap.Studio.Modules.Arma3WorldEditor.ViewModels
 {
@@ -178,6 +182,8 @@ public float? SizeInMeters
 
         public IGameFileSystem GameFileSystem => arma3Data.ProjectDrive;
 
+        public IModelInfoLibrary Library => arma3Data.Library;
+
         public List<ModDependencyDefinition> Dependencies { get; set; } = new List<ModDependencyDefinition>();
 
         public List<RevisionHistoryEntry> Backups
@@ -268,16 +274,61 @@ public Task ImportEden()
             return windowManager.ShowDialogAsync(new EdenImporterViewModel(this));
         }
 
+        public Task ImportFile()
+        {
+            var dialog = new OpenFileDialog();
+            dialog.Filter = "Text File|*.txt";
+            if (dialog.ShowDialog() == true)
+            {
+                return windowManager.ShowDialogAsync(new FileImporterViewModel(this, dialog.FileName));
+            }
+            return Task.CompletedTask;
+        }
+
         internal void Apply(WrpEditBatch batch)
+        {
+            IoC.Get<IProgressTool>().RunTask("Import", task => {
+                Apply(batch, task);
+                return Task.CompletedTask;
+            }, false);
+        }
+
+        internal void Apply(List<TerrainBuilderObject> list)
+        {
+            IoC.Get<IProgressTool>().RunTask("Import", async task =>
+            {
+                if (World == null)
+                {
+                    return;
+                }
+                await arma3Data.SaveLibraryCache();
+                var size = World.TerrainRangeX;
+                var grid = new ElevationGrid(size, CellSize!.Value);
+                for (int x = 0; x < size; x++)
+                {
+                    for (int y = 0; y < size; y++)
+                    {
+                        grid[x, y] = World.Elevation[x + (y * size)];
+                    }
+                }
+                var batch = new WrpEditBatch();
+                batch.Add.AddRange(list
+                    .ProgressStep(task, "ToWrpObject")
+                    .Select(l => l.ToWrpObject(grid))
+                    .Select(o => new WrpAddObject(o.Transform.Matrix, o.Model)));
+                Apply(batch, task);
+            }, false);
+        }
+
+        private void Apply(WrpEditBatch batch, IProgressTaskUI task)
         {
             if (World == null)
             {
                 return;
             }
-            using var task = IoC.Get<IProgressTool>().StartTask("Import");
             var processor = new WrpEditProcessor(task);
             processor.Process(World, batch);
-            if ( ConfigFile != null)
+            if (ConfigFile != null)
             {
                 if (Backups.Count > 0)
                 {
@@ -309,5 +360,7 @@ public void ClearActive()
                 entry.IsActive = false;
             }
         }
+
+
     }
 }

GameRealisticMap.Studio/Modules/Arma3WorldEditor/ViewModels/EdenImporterViewModel.cs

@@ -172,7 +172,7 @@ public Task ClipboardImport()
         {
             if (Batch != null)
             {
-                _ = Task.Run(() => parent.Apply(Batch));
+                parent.Apply(Batch);
             }
             return TryCloseAsync(true);
         }