View difference between Paste ID: Knx7qg2s and 54yCyPxG

 Index: AppEnv.cs
 ===================================================================
 --- AppEnv.cs	(revision 6363)
 +++ AppEnv.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; }
 +        }
 +
 +        public string SurfaceTempDir
 +        {
 +            get { return vars["SURFACE_TEMP_DIR"].StringValue; }
 +            set { vars["SURFACE_TEMP_DIR"].Value = value; }
 +        }
 +
          public string RrrSceneOutput
          {
              get { return vars["RRR_SCENE_OUTPUT"].StringValue; }
 Index: Operations/ExportNavigationMesh.cs
 ===================================================================
 --- Operations/ExportNavigationMesh.cs	(revision 6363)
 +++ Operations/ExportNavigationMesh.cs	(working copy)
 @@ -14,5 +14,20 @@
              : base("Navigation Mesh")
          {
          }
 +
 +        public override bool RunImp(Task task, AppEnv appEnv, bool withChildren)
 +        {
 +
 +            Command command = new Command();
 +            command.Type = Command.CommandType.EDTU4;
 +            command.EdtuCommand = "build-navigation-mesh";
 +            string surfaceL0filename = appEnv.SurfaceL0Output;
 +            string navMeshfilename = appEnv.terrainConfig.TerrainCfgDir.AbsoluteByRelativeTcons() + "navigationMesh.navmesh";
 +            command.Args = surfaceL0filename + " " + navMeshfilename;
 +            command.ErrorsFile = appEnv.SurfaceTempDir + @"export-vector-data_errors.ofsh";
 +            task.AddCommand(command);
 +
 +            return true;
 +        }
      }
  }
 Index: Operations/ExportSurface.cs
 ===================================================================
 --- Operations/ExportSurface.cs	(revision 6363)
 +++ Operations/ExportSurface.cs	(working copy)
 @@ -24,7 +24,7 @@
 
          public override bool RunImp(Task task, AppEnv appEnv, bool withChildren)
          {
 -            string tempDir = appEnv.TempDir + @"export-surface\";
 +            string tempDir = appEnv.SurfaceTempDir;
              string cutinDir = tempDir + @"rrr_and_airfields_cutin\";
              string filterByPropertiesDir = tempDir + @"filter-by-properties-luas\";
              string airfieldSurfaceDir = tempDir + @"airfield-surface\";
-@@ -48,10 +48,8 @@
+@@ -48,8 +48,6 @@
 
              if (appEnv.terrainConfig.Lsa5)
              {
 -                tempDir = appEnv.TempDir + @"export-lsa5\";
 -
                  // apply-surface-types & merge
--                string mergedsurface = tempDir + @"merged_surface.ofsh";
+                 string mergedsurface = tempDir + @"merged_surface.ofsh";
-+                string mergedsurface = tempDir.Remove(tempDir.LastIndexOf(tempDir.Split('\\')[tempDir.Split('\\').Length - 2])) + @"export-lsa5\" + @"merged_surface.ofsh";
+
 @@ -152,7 +150,6 @@
-                     List<string> surfaceMeshes = new List<string>();
+
                  string seaMaterial = "Sea4.1";
-@@ -59,7 +57,7 @@
+
-                     foreach (var surface in surfaceL0_)
+
-                     {
+
-                         string surfaceFile = surface.FilenameNoExtension();
+
--                        string surfaceFileRenamed = tempDir + surfaceFile + ".ofsh";
+
-+                        string surfaceFileRenamed = tempDir.Remove(tempDir.LastIndexOf(tempDir.Split('\\')[tempDir.Split('\\').Length - 2])) + @"export-lsa5\" + surfaceFile + ".ofsh";
+
                  }
-                         command = new Command();
+
-                         command.EdtuCommand = "apply-surface-types";
+
-@@ -74,7 +72,7 @@
+
-                     foreach (var airfield in airfields)
+
-                     {
+
-                         string airfieldFile = airfield.FilenameNoExtension();
+
--                        string airfieldFileRenamed = tempDir + airfieldFile + ".ofsh";
+
-+                        string airfieldFileRenamed = tempDir.Remove(tempDir.LastIndexOf(tempDir.Split('\\')[tempDir.Split('\\').Length - 2])) + @"export-lsa5\" + airfieldFile + ".ofsh";
+
                  command = MergeOffshoresCommand(cutbysquares.ToArray(), mergedfilename);
-                         command = new Command();
+
-                         command.EdtuCommand = "apply-surface-types";
+
-@@ -91,8 +89,8 @@
+
 +                var surfaceL0filename = appEnv.SurfaceL0Output;
                  var mergedL0filename = tempDir + "mergedL0.ofsh";
-                 // link-vector-data
+
--                string mergedvectordata = tempDir + @"merged_vectordata.ofsh";
+
--                string linkedvectordata = tempDir + @"merged_vectordata.lnkd";
+
-+                string mergedvectordata = tempDir.Remove(tempDir.LastIndexOf(tempDir.Split('\\')[tempDir.Split('\\').Length - 2])) + @"export-lsa5\" + @"merged_vectordata.ofsh";
+
-+                string linkedvectordata = tempDir.Remove(tempDir.LastIndexOf(tempDir.Split('\\')[tempDir.Split('\\').Length - 2])) + @"export-lsa5\" + @"merged_vectordata.lnkd";
+
 +++ Operations/TerrainConfig.cs	(working copy)
-                     string[] vectordata = PathsFromCategory(appEnv, Project.VECTOR_DATA_5_CATEGORY);
+
-                     command = MergeOffshoresCommand(vectordata, mergedvectordata);
+
-@@ -104,12 +102,12 @@
+
-                                  + linkedvectordata.Enclose() + " "
+
-                                  + "-staticmesh " + mergedsurface.Enclose() + " "
+
-                                  + "-terrain " + AppEnv.Instance.terrainConfig.TerrainCfg.Enclose();
+
--                    command.ErrorsFile = tempDir + @"link-vector-data_errors.ofsh"; ;
+
-+                    command.ErrorsFile = tempDir.Remove(tempDir.LastIndexOf(tempDir.Split('\\')[tempDir.Split('\\').Length - 2])) + @"export-lsa5\" + @"link-vector-data_errors.ofsh"; ;
+
-                     task.AddCommand(command);
+
 @@ -403,6 +405,14 @@
              appEnv.ReferenceExternals = terrainCfgDir + @"SurfaceDetails\" + appEnv.TerrainName + ".external.ofsh";
-                 // build-lsa5
+
--                string lsa5filename = tempDir + @"surface.lsa5";
+
-+                string lsa5filename = tempDir.Remove(tempDir.LastIndexOf(tempDir.Split('\\')[tempDir.Split('\\').Length - 2])) + @"export-lsa5\" + @"surface.lsa5";
+
 +            string surfaceTempFolderName = @"export-surface\";
 +            if (Lsa5)
-                     command.EdtuCommand = "build-lsa5";
++                surfaceTempFolderName = @"export-lsa5\";
-@@ -117,7 +115,7 @@
+
-                                  + linkedvectordata.Enclose() + " "
++                surfaceTempFolderName = @"export-lsa4-with-vector-data-5\";
-                                  + lsa5filename.Enclose() + " "
++            appEnv.SurfaceTempDir += surfaceTempFolderName + "surface_L0.ofsh";
-                                  + "-terrain " + AppEnv.Instance.terrainConfig.TerrainCfg.Enclose();
+
--                    command.ErrorsFile = tempDir + @"build-lsa5_errors.ofsh"; ;
+
-+                    command.ErrorsFile = tempDir.Remove(tempDir.LastIndexOf(tempDir.Split('\\')[tempDir.Split('\\').Length - 2])) + @"export-lsa5\" + @"build-lsa5_errors.ofsh"; ;
+
-                     task.AddCommand(command);
+