View difference between Paste ID: RUWp59XB and KVSLjG3n

-Index: AppEnv.cs
+Index: ExportSurface.cs
 ===================================================================
---- AppEnv.cs	(revision 6363)
+--- ExportSurface.cs	(revision 6363)
-+++ AppEnv.cs	(working copy)
++++ ExportSurface.cs	(working copy)
-@@ -235,6 +235,18 @@
+
-             set { vars["VECTORDATA5_OUTPUT_LNKD"].Value = value; }
+
-         }
+
          {
-+        public string SurfaceL0Output
+
-+        {
+
-+            get { return vars["SURFACE_L0_OUTPUT"].StringValue; }
+
-+            set { vars["SURFACE_L0_OUTPUT"].Value = value; }
+
-+        }
+
-+
+@@ -48,10 +48,10 @@
-+        public string SurfaceTempDir
+
-+        {
+
-+            get { return vars["SURFACE_TEMP_DIR"].StringValue; }
+
-+            set { vars["SURFACE_TEMP_DIR"].Value = value; }
+
-+        }
++                string Lsa5TempDir = appEnv.TempDir + @"export-lsa5\";
-+
+
-         public string RrrSceneOutput
+
 -                string mergedsurface = tempDir + @"merged_surface.ofsh";
-             get { return vars["RRR_SCENE_OUTPUT"].StringValue; }
++                string mergedsurface = Lsa5TempDir + @"merged_surface.ofsh";
-Index: Operations/ExportNavigationMesh.cs
+
                      List<string> surfaceMeshes = new List<string>();
---- Operations/ExportNavigationMesh.cs	(revision 6363)
+
-+++ Operations/ExportNavigationMesh.cs	(working copy)
+@@ -59,7 +59,7 @@
-@@ -14,5 +14,20 @@
+                     foreach (var surface in surfaceL0_)
-             : base("Navigation Mesh")
+                     {
                          string surfaceFile = surface.FilenameNoExtension();
-         }
+-                        string surfaceFileRenamed = tempDir + surfaceFile + ".ofsh";
-+
++                        string surfaceFileRenamed = Lsa5TempDir + surfaceFile + ".ofsh";
-+        public override bool RunImp(Task task, AppEnv appEnv, bool withChildren)
+
-+        {
+                         command = new Command();
-+
+                         command.EdtuCommand = "apply-surface-types";
-+            Command command = new Command();
+@@ -74,7 +74,7 @@
-+            command.Type = Command.CommandType.EDTU4;
+                     foreach (var airfield in airfields)
-+            command.EdtuCommand = "build-navigation-mesh";
+                     {
-+            string surfaceL0filename = appEnv.SurfaceL0Output;
+                         string airfieldFile = airfield.FilenameNoExtension();
-+            string navMeshfilename = appEnv.terrainConfig.TerrainCfgDir.AbsoluteByRelativeTcons() + "navigationMesh.navmesh";
+-                        string airfieldFileRenamed = tempDir + airfieldFile + ".ofsh";
-+            command.Args = surfaceL0filename + " " + navMeshfilename;
++                        string airfieldFileRenamed = Lsa5TempDir + airfieldFile + ".ofsh";
-+            command.ErrorsFile = appEnv.SurfaceTempDir + @"export-vector-data_errors.ofsh";
+
-+            task.AddCommand(command);
+                         command = new Command();
-+
+                         command.EdtuCommand = "apply-surface-types";
-+            return true;
+@@ -91,8 +91,8 @@
-+        }
+
-     }
+
- }
+                 // link-vector-data
-Index: Operations/ExportSurface.cs
+-                string mergedvectordata = tempDir + @"merged_vectordata.ofsh";
 -                string linkedvectordata = tempDir + @"merged_vectordata.lnkd";
---- Operations/ExportSurface.cs	(revision 6363)
++                string mergedvectordata = Lsa5TempDir + @"merged_vectordata.ofsh";
-+++ Operations/ExportSurface.cs	(working copy)
++                string linkedvectordata = Lsa5TempDir + @"merged_vectordata.lnkd";
                  {
                      string[] vectordata = PathsFromCategory(appEnv, Project.VECTOR_DATA_5_CATEGORY);
                      command = MergeOffshoresCommand(vectordata, mergedvectordata);
 @@ -104,12 +104,12 @@
                                   + linkedvectordata.Enclose() + " "
                                   + "-staticmesh " + mergedsurface.Enclose() + " "
                                   + "-terrain " + AppEnv.Instance.terrainConfig.TerrainCfg.Enclose();
 -                    command.ErrorsFile = tempDir + @"link-vector-data_errors.ofsh"; ;
 +                    command.ErrorsFile = Lsa5TempDir + @"link-vector-data_errors.ofsh"; ;
-@@ -48,8 +48,6 @@
+                     task.AddCommand(command);
                  }
 
                  // build-lsa5
 -                string lsa5filename = tempDir + @"surface.lsa5";
--
++                string lsa5filename = Lsa5TempDir + @"surface.lsa5";
                  {
-                 string mergedsurface = tempDir + @"merged_surface.ofsh";
+
                      command.EdtuCommand = "build-lsa5";
-@@ -152,7 +150,6 @@
+@@ -117,7 +117,7 @@
                                   + linkedvectordata.Enclose() + " "
                                   + lsa5filename.Enclose() + " "
                                   + "-terrain " + AppEnv.Instance.terrainConfig.TerrainCfg.Enclose();
 -                    command.ErrorsFile = tempDir + @"build-lsa5_errors.ofsh"; ;
 +                    command.ErrorsFile = Lsa5TempDir + @"build-lsa5_errors.ofsh"; ;
                      task.AddCommand(command);
                  }
-@@ -252,7 +249,7 @@
+
 @@ -127,9 +127,9 @@
                      command.Type = Command.CommandType.EDTU4;
                      command.EdtuCommand = "export-vector-data";
                      command.Args = linkedvectordata.Enclose() + " "
 -                                   + (tempDir + @"vectordata_view.ofsh").Enclose()
 +                                   + (Lsa5TempDir + @"vectordata_view.ofsh").Enclose()
                                     + " -terrain " + AppEnv.Instance.terrainConfig.TerrainCfg.Enclose();
 -                    command.ErrorsFile = tempDir + @"export-vector-data_errors.ofsh";
-@@ -562,7 +559,7 @@
++                    command.ErrorsFile = Lsa5TempDir + @"export-vector-data_errors.ofsh";
                      task.AddCommand(command);
                  }
 
 @@ -142,7 +142,7 @@
                  command.Args = lsa5filename.Enclose() + " "
                               + lsa4filename.Enclose() + " "
                               + "-terrain " + AppEnv.Instance.terrainConfig.TerrainCfg.Enclose();
-                 var cutL0filename = tempDir + "cutL0.ofsh";
+-                command.ErrorsFile = tempDir + @"lsa5-lsa4_errors.ofsh"; ;
-Index: Operations/TerrainConfig.cs
++                command.ErrorsFile = Lsa5TempDir + @"lsa5-lsa4_errors.ofsh"; ;
                  task.AddCommand(command);
---- Operations/TerrainConfig.cs	(revision 6363)
+
-+++ Operations/TerrainConfig.cs	(working copy)
+                 return true;
-@@ -305,6 +305,8 @@
+@@ -152,7 +152,6 @@
-             AddNewFileVariableIfNotFound(appEnv.vars, "RRR_OUTPUT");
+
-             AddNewFileVariableIfNotFound(appEnv.vars, "VECTORDATA5_OUTPUT");
+
-             AddNewFileVariableIfNotFound(appEnv.vars, "VECTORDATA5_OUTPUT_LNKD");
+
-+            AddNewFileVariableIfNotFound(appEnv.vars, "SURFACE_L0_OUTPUT");
+
-+            AddNewFileVariableIfNotFound(appEnv.vars, "SURFACE_TEMP_DIR");
+
-             AddNewFileVariableIfNotFound(appEnv.vars, "RRR_SCENE_OUTPUT");
+
-             AddNewFileVariableIfNotFound(appEnv.vars, "RRR_DETAILS_OUTPUT");
+
-             AddNewFileVariableIfNotFound(appEnv.vars, "RRR_POWERLINES_OUTPUT");
+@@ -252,7 +251,7 @@
-@@ -403,6 +405,13 @@
+
-             appEnv.ReferenceExternals = terrainCfgDir + @"SurfaceDetails\" + appEnv.TerrainName + ".external.ofsh";
+
-             appEnv.TreePreviewArchive = terrainCfgDir + @"SurfaceDetails\Trees.preview.zip";
+
 -                string surfaceL0_1 = tempDir + @"surface-L0.ofsh";
-+            appEnv.SurfaceTempDir = tempDir;
+
-+            if (VectorData5)
+
-+                    appEnv.SurfaceTempDir += @"export-lsa4-with-vector-data-5\";
+
-+            else
+
-+                    appEnv.SurfaceTempDir += @"export-surface\";
+@@ -562,7 +561,7 @@
-+            appEnv.SurfaceL0Output = appEnv.SurfaceTempDir + "surface-L0.ofsh";
+
-+
+
-             System.IO.DirectoryInfo dirInfo = null;
+
-             try
+
-             {
+
                  var mergedL0filename = tempDir + "mergedL0.ofsh";
                  var finalL0filename = tempDir + "finalL0.ofsh";
                  var cutL0filename = tempDir + "cutL0.ofsh";