Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: ExportSurface.cs
- ===================================================================
- --- ExportSurface.cs (revision 6363)
- +++ 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,10 @@
- if (appEnv.terrainConfig.Lsa5)
- {
- - tempDir = appEnv.TempDir + @"export-lsa5\";
- + string Lsa5TempDir = appEnv.TempDir + @"export-lsa5\";
- // apply-surface-types & merge
- - string mergedsurface = tempDir + @"merged_surface.ofsh";
- + string mergedsurface = Lsa5TempDir + @"merged_surface.ofsh";
- {
- List<string> surfaceMeshes = new List<string>();
- @@ -59,7 +59,7 @@
- foreach (var surface in surfaceL0_)
- {
- string surfaceFile = surface.FilenameNoExtension();
- - string surfaceFileRenamed = tempDir + surfaceFile + ".ofsh";
- + string surfaceFileRenamed = Lsa5TempDir + surfaceFile + ".ofsh";
- command = new Command();
- command.EdtuCommand = "apply-surface-types";
- @@ -74,7 +74,7 @@
- foreach (var airfield in airfields)
- {
- string airfieldFile = airfield.FilenameNoExtension();
- - string airfieldFileRenamed = tempDir + airfieldFile + ".ofsh";
- + string airfieldFileRenamed = Lsa5TempDir + airfieldFile + ".ofsh";
- command = new Command();
- command.EdtuCommand = "apply-surface-types";
- @@ -91,8 +91,8 @@
- // link-vector-data
- - string mergedvectordata = tempDir + @"merged_vectordata.ofsh";
- - string linkedvectordata = tempDir + @"merged_vectordata.lnkd";
- + string mergedvectordata = Lsa5TempDir + @"merged_vectordata.ofsh";
- + 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"; ;
- task.AddCommand(command);
- }
- // build-lsa5
- - string lsa5filename = tempDir + @"surface.lsa5";
- + string lsa5filename = Lsa5TempDir + @"surface.lsa5";
- {
- command = new Command();
- command.EdtuCommand = "build-lsa5";
- @@ -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);
- }
- @@ -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";
- + 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();
- - command.ErrorsFile = tempDir + @"lsa5-lsa4_errors.ofsh"; ;
- + command.ErrorsFile = Lsa5TempDir + @"lsa5-lsa4_errors.ofsh"; ;
- task.AddCommand(command);
- return true;
- @@ -152,7 +152,6 @@
- {
- string seaMaterial = "Sea4.1";
- - tempDir = appEnv.TempDir + @"export-lsa4-with-vector-data-5\";
- System.IO.Directory.CreateDirectory(tempDir);
- Tools.Path.CleanupDir(tempDir);
- // apply-surface-types & merge
- @@ -252,7 +251,7 @@
- }
- // build-surface-by-vector-data-5
- - string surfaceL0_1 = tempDir + @"surface-L0.ofsh";
- + string surfaceL0_1 = appEnv.SurfaceL0Output;
- string outputReflectReceiver = appEnv.ReflectReceiverScene;
- {
- command = new Command();
- @@ -562,7 +561,7 @@
- command = MergeOffshoresCommand(cutbysquares.ToArray(), mergedfilename);
- task.AddCommand(command);
- - var surfaceL0filename = tempDir + "surfaceL0.ofsh";
- + var surfaceL0filename = appEnv.SurfaceL0Output;
- var mergedL0filename = tempDir + "mergedL0.ofsh";
- var finalL0filename = tempDir + "finalL0.ofsh";
- var cutL0filename = tempDir + "cutL0.ofsh";
Advertisement
Add Comment
Please, Sign In to add comment
