Reverted last change for map compilation where extension was omitted. Instead the file browser dialog was fixed because it was using the wrong .smt extension instead of .smf

Author: adras

MapCreationTool/MapCreationTool/Controls/CompilationSettingsControl.xaml

@@ -15,7 +15,7 @@
         <StackPanel Orientation="Vertical">
 
             <compile:ValueCompileSetting SettingName="Output file" SettingDescription="The output smf file to create. E.g Zero-Prime.smf (REQUIRED)" DataContext="{Binding CompilationSettings}"
-                                         SettingDialogType="Save" FileDialogFilter="smf files (*.smf)|*.smt|All files (*.*)|*.*"
+                                         SettingDialogType="Save" FileDialogFilter="smf files (*.smf)|*.smf|All files (*.*)|*.*"
                                          SettingEnabledLocked="true" SettingIsEnabled="True"  
                                          SettingValue="{Binding Path=OutSmfFilePath, Mode=TwoWay}"></compile:ValueCompileSetting>
             <compile:ValueCompileSetting SettingName="Include texture" SettingDescription="The diffuse map file to use. (REQUIRED)" DataContext="{Binding CompilationSettings}"

MapCreationTool/MapCreationTool/Controls/CompileMapControl.xaml.cs

@@ -76,7 +76,6 @@ private void Compiler_CompilationResult(object sender, MapCompilerState state, M
         {
             CompilationResults += message + "\n";
             Dispatcher.Invoke(() => scrollViewer.ScrollToBottom());
-
         }
 
         private void CompileDeployControl_OnExecuteAction(object sender, ActionTypes actionType)

MapCreationTool/MapCreationTool/MapConverter/ProjectSettingsToCompilerSettingsConverter.cs

@@ -42,10 +42,7 @@ public static PyMapCompilerSettings Convert(ProjectSettings projectSettings)
             PyMapCompilerSettings settings = new PyMapCompilerSettings();
             SettingsAdder adder = new SettingsAdder(settings);
 
-            // we don't want the outsmfFilepath to have any extension. Therefore we remove it. It will be automatically added by pymapconv again
-            string outSmtPath = PathHelper.GetFilePathWithoutExtension(compSettings.OutSmfFilePath);
-
-            adder.AddSettingIfSet("-o", outSmtPath, true);
+            adder.AddSettingIfSet("-o", compSettings.OutSmfFilePath, true);
             adder.AddSettingIfSet("-t", compSettings.DiffuseMapName, true);
             adder.AddSettingIfSet("-a", compSettings.HeightMapName, true);
             adder.AddSettingIfSet("-m", compSettings.MetalMapName, compSettings.UseMetalMap);

MapCreationTool/MapCreationTool/Models/ProjectSettings.cs

@@ -14,7 +14,7 @@ namespace MapCreationTool.Models
 	public class ProjectSettings : PropertyChangedBase
 	{
 		public const string DEFAULT_FILE_NAME = "MapCreationTool.xml";
-		public const string GEO_VENT_FILE_NAME = "geovent.bmp";
+		public const string GEO_VENT_FILE_NAME = @"PyMapConv\geovent.bmp";
 
 		private string startLocations;
 		private MapPathInformation mapPathInformation;