SHOW:
|
|
- or go back to the newest paste.
| 1 | Index: ExportSurface.cs | |
| 2 | =================================================================== | |
| 3 | --- ExportSurface.cs (revision 6363) | |
| 4 | +++ ExportSurface.cs (working copy) | |
| 5 | @@ -24,7 +24,7 @@ | |
| 6 | ||
| 7 | public override bool RunImp(Task task, AppEnv appEnv, bool withChildren) | |
| 8 | {
| |
| 9 | - string tempDir = appEnv.TempDir + @"export-surface\"; | |
| 10 | + string tempDir = appEnv.SurfaceTempDir; | |
| 11 | string cutinDir = tempDir + @"rrr_and_airfields_cutin\"; | |
| 12 | string filterByPropertiesDir = tempDir + @"filter-by-properties-luas\"; | |
| 13 | string airfieldSurfaceDir = tempDir + @"airfield-surface\"; | |
| 14 | - | @@ -152,7 +152,7 @@ |
| 14 | + | @@ -48,8 +48,6 @@ |
| 15 | ||
| 16 | if (appEnv.terrainConfig.Lsa5) | |
| 17 | {
| |
| 18 | - tempDir = appEnv.TempDir + @"export-lsa5\"; | |
| 19 | - | + tempDir = appEnv.SurfaceTempDir; |
| 19 | + | - |
| 20 | // apply-surface-types & merge | |
| 21 | string mergedsurface = tempDir + @"merged_surface.ofsh"; | |
| 22 | {
| |
| 23 | - | @@ -252,7 +252,7 @@ |
| 23 | + | @@ -152,7 +150,6 @@ |
| 24 | {
| |
| 25 | string seaMaterial = "Sea4.1"; | |
| 26 | ||
| 27 | - tempDir = appEnv.TempDir + @"export-lsa4-with-vector-data-5\"; | |
| 28 | System.IO.Directory.CreateDirectory(tempDir); | |
| 29 | Tools.Path.CleanupDir(tempDir); | |
| 30 | // apply-surface-types & merge | |
| 31 | @@ -252,7 +249,7 @@ | |
| 32 | - | @@ -562,7 +562,7 @@ |
| 32 | + | |
| 33 | ||
| 34 | // build-surface-by-vector-data-5 | |
| 35 | - string surfaceL0_1 = tempDir + @"surface-L0.ofsh"; | |
| 36 | + string surfaceL0_1 = appEnv.SurfaceL0Output; | |
| 37 | string outputReflectReceiver = appEnv.ReflectReceiverScene; | |
| 38 | {
| |
| 39 | command = new Command(); | |
| 40 | @@ -562,7 +559,7 @@ | |
| 41 | command = MergeOffshoresCommand(cutbysquares.ToArray(), mergedfilename); | |
| 42 | task.AddCommand(command); | |
| 43 | ||
| 44 | - var surfaceL0filename = tempDir + "surfaceL0.ofsh"; | |
| 45 | + var surfaceL0filename = appEnv.SurfaceL0Output; | |
| 46 | var mergedL0filename = tempDir + "mergedL0.ofsh"; | |
| 47 | var finalL0filename = tempDir + "finalL0.ofsh"; | |
| 48 | var cutL0filename = tempDir + "cutL0.ofsh"; |
