Merge pull request #56 from axel7083/feature/start-from-editor

feat: allowing to config emulator executable to start rom

SM64DSe.csproj

@@ -344,6 +344,12 @@
     <Compile Include="src\ui\dialogs\DropdownDialog.Designer.cs">
       <DependentUpon>DropdownDialog.cs</DependentUpon>
     </Compile>
+    <Compile Include="src\ui\dialogs\RunningDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="src\ui\dialogs\RunningDialog.Designer.cs">
+      <DependentUpon>RunningDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="src\ui\dls\DL Editor.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -592,6 +598,9 @@
     <EmbeddedResource Include="src\ui\CodeFixerForm.resx">
       <DependentUpon>CodeFixerForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="src\ui\dialogs\RunningDialog.resx">
+      <DependentUpon>RunningDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="src\ui\dls\DL Editor.resx">
       <DependentUpon>DL Editor.cs</DependentUpon>
     </EmbeddedResource>

src/core/NitroROM.cs

@@ -26,6 +26,7 @@ You should have received a copy of the GNU General Public License along
 using Newtonsoft.Json;
 using System.Diagnostics;
 using System.Windows.Forms;
+using SM64DSe.ui.dialogs;
 
 namespace SM64DSe
 {
@@ -491,7 +492,27 @@ void OnROMBuilt(object sender, EventArgs e) {
         }
 
         public static void RunROM() {
-            BuildROM(true);
+            if (Program.m_IsROMFolder)
+            {
+                BuildROM(true);
+                return;
+            }
+
+            // Stop read write
+            Program.m_ROM.EndRW();
+
+            string executable = Properties.Settings.Default.EmulatorExecutablePath;
+            if (executable == null || executable.Trim() == "")
+            {
+                throw new Exception("Executable not found");
+            }
+
+            if (!File.Exists(executable))
+            {
+                throw new Exception("executable file does not exist.");
+            }
+
+            new RunningDialog(executable).ShowDialog();
         }
 
         public static FileStream GetExtractedStream(string path) {

src/ui/MainForm.cs

@@ -145,7 +145,11 @@ private void LoadROM(string filename)
             btnMore.Enabled = true;
             extractROMButton.Visible = true;
             btnBuildROM.Visible = false;
-            btnRunROM.Visible = false;
+
+            // Show run button if emulator executable is defined
+            string executable = Properties.Settings.Default.EmulatorExecutablePath;
+            btnRunROM.Visible = executable != null && executable.Trim() != "";
+
             btnLZCompressWithHeader.Enabled = true;
             btnLZDecompressWithHeader.Enabled = true;
             btnLZForceCompression.Enabled = true;

src/ui/SettingsForm.cs

@@ -44,6 +44,7 @@ private void SettingsForm_Load(object sender, EventArgs e)
             chkRememberLastUsedModelImportationSettings.Checked = Properties.Settings.Default.RememberLastUsedModelImportationSettings;
             chkRememberLastUsedCollisionTypeAssignments.Checked = Properties.Settings.Default.RememberMaterialCollisionTypeAssignments;
             chkDisableTextureSizeWarning.Checked = Properties.Settings.Default.DisableTextureSizeWarning;
+            emulatorExecutablePath.Text = Properties.Settings.Default.EmulatorExecutablePath;
         }
 
         private void btnOk_Click(object sender, EventArgs e)
@@ -54,7 +55,16 @@ private void btnOk_Click(object sender, EventArgs e)
             Properties.Settings.Default.RememberLastUsedModelImportationSettings = chkRememberLastUsedModelImportationSettings.Checked;
             Properties.Settings.Default.RememberMaterialCollisionTypeAssignments = chkRememberLastUsedCollisionTypeAssignments.Checked;
             Properties.Settings.Default.DisableTextureSizeWarning = chkDisableTextureSizeWarning.Checked;
+            Properties.Settings.Default.EmulatorExecutablePath = this.emulatorExecutablePath.Text;
             Properties.Settings.Default.Save();
         }
+
+        private void browserBtn_Click(object sender, EventArgs e)
+        {
+            if (this.openFileExe.ShowDialog() == DialogResult.OK)
+            {
+                emulatorExecutablePath.Text = this.openFileExe.FileName;
+            }
+        }
     }
 }

src/ui/SettingsForm.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="openFileExe.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

src/ui/dialogs/RunningDialog.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Diagnostics;
+using System.Windows.Forms;
+
+namespace SM64DSe.ui.dialogs
+{
+    public partial class RunningDialog : Form
+    {
+        private string executable;
+        public RunningDialog(string executable)
+        {
+            this.executable = executable;
+            InitializeComponent();
+        }
+
+        protected override void OnShown(EventArgs e)
+        {
+            base.OnShown(e);
+            RunProcessAsync();
+        }
+
+        private void RunProcessAsync()
+        {
+            Process process = new Process();
+            process.StartInfo.FileName = this.executable;
+            process.StartInfo.Arguments = Program.m_ROMPath;
+            process.EnableRaisingEvents = true;
+
+            process.Exited += (sender, e) =>
+            {
+                this.Close();
+                process.Dispose();
+            };
+
+            process.Start();
+        }
+    }
+}