From 47cf4c3cb992b9e219d0e2483087830222c7b872 Mon Sep 17 00:00:00 2001 From: masterofpuppets152001 Date: Sat, 4 May 2013 16:54:34 +0000 Subject: [PATCH] Early Vid plugin, is this how you want it Adelikat? --- .../BizHawk.MultiClient.csproj | 9 + BizHawk.MultiClient/MainForm.Designer.cs | 40 +- BizHawk.MultiClient/MainForm.cs | 5 + .../tools/N64VideoPluginconfig.Designer.cs | 539 ++++++++++++++++++ .../tools/N64VideoPluginconfig.cs | 24 + .../tools/N64VideoPluginconfig.resx | 120 ++++ 6 files changed, 722 insertions(+), 15 deletions(-) create mode 100644 BizHawk.MultiClient/tools/N64VideoPluginconfig.Designer.cs create mode 100644 BizHawk.MultiClient/tools/N64VideoPluginconfig.cs create mode 100644 BizHawk.MultiClient/tools/N64VideoPluginconfig.resx diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index a58d174ec4..2e64108a68 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -441,6 +441,12 @@ Component + + Form + + + N64VideoPluginconfig.cs + Form @@ -638,6 +644,9 @@ SNESOptions.cs + + N64VideoPluginconfig.cs + HexColor.cs diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index c0ddf1f871..a673821c74 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -332,6 +332,7 @@ this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem(); this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem(); this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.tempN64PluginControlToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.StatusSlot0.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); @@ -1798,7 +1799,8 @@ this.luaConsoleToolStripMenuItem, this.cheatsToolStripMenuItem, this.toolStripSeparator29, - this.createDualGBXMLToolStripMenuItem}); + this.createDualGBXMLToolStripMenuItem, + this.tempN64PluginControlToolStripMenuItem}); this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 19); this.toolsToolStripMenuItem.Text = "&Tools"; @@ -1808,20 +1810,20 @@ // this.toolBoxToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox; this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem"; - this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.toolBoxToolStripMenuItem.Text = "&Tool Box"; this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click); // // toolStripSeparator12 // this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(186, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(206, 6); // // rAMWatchToolStripMenuItem // this.rAMWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem"; - this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.rAMWatchToolStripMenuItem.Text = "RAM &Watch"; this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click); // @@ -1829,7 +1831,7 @@ // this.rAMSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search; this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem"; - this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.rAMSearchToolStripMenuItem.Text = "RAM &Search"; this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click); // @@ -1837,7 +1839,7 @@ // this.rAMPokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem"; - this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.rAMPokeToolStripMenuItem.Text = "RAM &Poke"; this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click); // @@ -1845,7 +1847,7 @@ // this.hexEditorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem"; - this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click); // @@ -1853,7 +1855,7 @@ // this.traceLoggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.pencil; this.traceLoggerToolStripMenuItem.Name = "traceLoggerToolStripMenuItem"; - this.traceLoggerToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.traceLoggerToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.traceLoggerToolStripMenuItem.Text = "Trace &Logger"; this.traceLoggerToolStripMenuItem.Click += new System.EventHandler(this.traceLoggerToolStripMenuItem_Click); // @@ -1861,7 +1863,7 @@ // this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; this.tAStudioToolStripMenuItem.Name = "tAStudioToolStripMenuItem"; - this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.tAStudioToolStripMenuItem.Text = "&TAStudio"; this.tAStudioToolStripMenuItem.Click += new System.EventHandler(this.tAStudioToolStripMenuItem_Click); // @@ -1869,20 +1871,20 @@ // this.virtualPadToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; this.virtualPadToolStripMenuItem.Name = "virtualPadToolStripMenuItem"; - this.virtualPadToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.virtualPadToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.virtualPadToolStripMenuItem.Text = "Virtual Pad"; this.virtualPadToolStripMenuItem.Click += new System.EventHandler(this.virtualPadToolStripMenuItem_Click); // // toolStripSeparator11 // this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(186, 6); + this.toolStripSeparator11.Size = new System.Drawing.Size(206, 6); // // luaConsoleToolStripMenuItem // this.luaConsoleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua; this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem"; - this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.luaConsoleToolStripMenuItem.Text = "Lua Console"; this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click); // @@ -1890,19 +1892,19 @@ // this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; - this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.cheatsToolStripMenuItem.Text = "Cheats"; this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click); // // toolStripSeparator29 // this.toolStripSeparator29.Name = "toolStripSeparator29"; - this.toolStripSeparator29.Size = new System.Drawing.Size(186, 6); + this.toolStripSeparator29.Size = new System.Drawing.Size(206, 6); // // createDualGBXMLToolStripMenuItem // this.createDualGBXMLToolStripMenuItem.Name = "createDualGBXMLToolStripMenuItem"; - this.createDualGBXMLToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.createDualGBXMLToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.createDualGBXMLToolStripMenuItem.Text = "Create Dual GB XML..."; this.createDualGBXMLToolStripMenuItem.Click += new System.EventHandler(this.createDualGBXMLToolStripMenuItem_Click); // @@ -2880,6 +2882,13 @@ this.cmiShowMenu.Text = "Show Menu"; this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click); // + // tempN64PluginControlToolStripMenuItem + // + this.tempN64PluginControlToolStripMenuItem.Name = "tempN64PluginControlToolStripMenuItem"; + this.tempN64PluginControlToolStripMenuItem.Size = new System.Drawing.Size(209, 22); + this.tempN64PluginControlToolStripMenuItem.Text = "Temp N64 Plugin Control"; + this.tempN64PluginControlToolStripMenuItem.Click += new System.EventHandler(this.tempN64PluginControlToolStripMenuItem_Click); + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); @@ -3223,6 +3232,7 @@ private System.Windows.Forms.ToolStripMenuItem createDualGBXMLToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem n64ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem videoConfigToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem tempN64PluginControlToolStripMenuItem; } } diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 8bfff13147..1290bf011b 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -5391,5 +5391,10 @@ namespace BizHawk.MultiClient new N64VideoConfig().ShowDialog(); ; } + + private void tempN64PluginControlToolStripMenuItem_Click(object sender, EventArgs e) + { + new BizHawk.MultiClient.tools.N64VideoPluginconfig().ShowDialog(); + } } } diff --git a/BizHawk.MultiClient/tools/N64VideoPluginconfig.Designer.cs b/BizHawk.MultiClient/tools/N64VideoPluginconfig.Designer.cs new file mode 100644 index 0000000000..55967126f9 --- /dev/null +++ b/BizHawk.MultiClient/tools/N64VideoPluginconfig.Designer.cs @@ -0,0 +1,539 @@ +namespace BizHawk.MultiClient.tools +{ + partial class N64VideoPluginconfig + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.N64plugintabcontrol = new System.Windows.Forms.TabControl(); + this.N64vpluginglobaltab = new System.Windows.Forms.TabPage(); + this.label3 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.VideoResolutionComboBox = new System.Windows.Forms.ComboBox(); + this.PluginComboBox = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.Rice160tab = new System.Windows.Forms.TabPage(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.checkBox4 = new System.Windows.Forms.CheckBox(); + this.checkBox3 = new System.Windows.Forms.CheckBox(); + this.checkBox2 = new System.Windows.Forms.CheckBox(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.label4 = new System.Windows.Forms.Label(); + this.tabPage3 = new System.Windows.Forms.TabPage(); + this.label5 = new System.Windows.Forms.Label(); + this.tabPage4 = new System.Windows.Forms.TabPage(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.checkBox8 = new System.Windows.Forms.CheckBox(); + this.checkBox7 = new System.Windows.Forms.CheckBox(); + this.comboBox3 = new System.Windows.Forms.ComboBox(); + this.comboBox2 = new System.Windows.Forms.ComboBox(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.label8 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.checkBox6 = new System.Windows.Forms.CheckBox(); + this.checkBox5 = new System.Windows.Forms.CheckBox(); + this.JaboD3D8161tab = new System.Windows.Forms.TabPage(); + this.Glide64finaltab = new System.Windows.Forms.TabPage(); + this.button1 = new System.Windows.Forms.Button(); + this.button2 = new System.Windows.Forms.Button(); + this.N64plugintabcontrol.SuspendLayout(); + this.N64vpluginglobaltab.SuspendLayout(); + this.Rice160tab.SuspendLayout(); + this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.tabPage2.SuspendLayout(); + this.tabPage3.SuspendLayout(); + this.tabPage4.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.SuspendLayout(); + // + // N64plugintabcontrol + // + this.N64plugintabcontrol.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.N64plugintabcontrol.Controls.Add(this.N64vpluginglobaltab); + this.N64plugintabcontrol.Controls.Add(this.Rice160tab); + this.N64plugintabcontrol.Controls.Add(this.JaboD3D8161tab); + this.N64plugintabcontrol.Controls.Add(this.Glide64finaltab); + this.N64plugintabcontrol.Location = new System.Drawing.Point(-2, -2); + this.N64plugintabcontrol.Name = "N64plugintabcontrol"; + this.N64plugintabcontrol.SelectedIndex = 0; + this.N64plugintabcontrol.Size = new System.Drawing.Size(580, 365); + this.N64plugintabcontrol.TabIndex = 0; + // + // N64vpluginglobaltab + // + this.N64vpluginglobaltab.Controls.Add(this.label3); + this.N64vpluginglobaltab.Controls.Add(this.label2); + this.N64vpluginglobaltab.Controls.Add(this.VideoResolutionComboBox); + this.N64vpluginglobaltab.Controls.Add(this.PluginComboBox); + this.N64vpluginglobaltab.Controls.Add(this.label1); + this.N64vpluginglobaltab.Location = new System.Drawing.Point(4, 22); + this.N64vpluginglobaltab.Name = "N64vpluginglobaltab"; + this.N64vpluginglobaltab.Padding = new System.Windows.Forms.Padding(3); + this.N64vpluginglobaltab.Size = new System.Drawing.Size(572, 339); + this.N64vpluginglobaltab.TabIndex = 0; + this.N64vpluginglobaltab.Text = "Global"; + this.N64vpluginglobaltab.UseVisualStyleBackColor = true; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(54, 199); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(103, 13); + this.label3.TabIndex = 14; + this.label3.Text = "More Global Options"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(10, 75); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(87, 13); + this.label2.TabIndex = 13; + this.label2.Text = "Video Resolution"; + // + // VideoResolutionComboBox + // + this.VideoResolutionComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.VideoResolutionComboBox.FormattingEnabled = true; + this.VideoResolutionComboBox.Items.AddRange(new object[] { + "320 x 240", + "400 x 300", + "480 x 360", + "512 x 384", + "640 x 480", + "800 x 600", + "1024 x 768", + "1152 x 864", + "1280 x 960", + "1400 x 1050", + "1600 x 1200", + "1920 x 1440", + "2048 x 1536"}); + this.VideoResolutionComboBox.Location = new System.Drawing.Point(13, 91); + this.VideoResolutionComboBox.Name = "VideoResolutionComboBox"; + this.VideoResolutionComboBox.Size = new System.Drawing.Size(136, 21); + this.VideoResolutionComboBox.TabIndex = 12; + // + // PluginComboBox + // + this.PluginComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.PluginComboBox.FormattingEnabled = true; + this.PluginComboBox.Items.AddRange(new object[] { + "Rice 1.6.0", + "Jabo\'s Direct3D8 1.6.1", + "Glide64 Final"}); + this.PluginComboBox.Location = new System.Drawing.Point(13, 34); + this.PluginComboBox.Name = "PluginComboBox"; + this.PluginComboBox.Size = new System.Drawing.Size(173, 21); + this.PluginComboBox.TabIndex = 2; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(10, 18); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(99, 13); + this.label1.TabIndex = 1; + this.label1.Text = "Active Video Plugin"; + // + // Rice160tab + // + this.Rice160tab.Controls.Add(this.tabControl1); + this.Rice160tab.Location = new System.Drawing.Point(4, 22); + this.Rice160tab.Name = "Rice160tab"; + this.Rice160tab.Padding = new System.Windows.Forms.Padding(3); + this.Rice160tab.Size = new System.Drawing.Size(572, 339); + this.Rice160tab.TabIndex = 1; + this.Rice160tab.Text = "Rice 1.6.0"; + this.Rice160tab.UseVisualStyleBackColor = true; + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Controls.Add(this.tabPage3); + this.tabControl1.Controls.Add(this.tabPage4); + this.tabControl1.Location = new System.Drawing.Point(0, 0); + this.tabControl1.Multiline = true; + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(572, 339); + this.tabControl1.TabIndex = 0; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.checkBox4); + this.tabPage1.Controls.Add(this.checkBox3); + this.tabPage1.Controls.Add(this.checkBox2); + this.tabPage1.Controls.Add(this.checkBox1); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(564, 313); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "General Options"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // checkBox4 + // + this.checkBox4.AutoSize = true; + this.checkBox4.Location = new System.Drawing.Point(32, 67); + this.checkBox4.Name = "checkBox4"; + this.checkBox4.Size = new System.Drawing.Size(108, 17); + this.checkBox4.TabIndex = 3; + this.checkBox4.Text = "Enable Mip Maps"; + this.checkBox4.UseVisualStyleBackColor = true; + // + // checkBox3 + // + this.checkBox3.AutoSize = true; + this.checkBox3.Location = new System.Drawing.Point(32, 90); + this.checkBox3.Name = "checkBox3"; + this.checkBox3.Size = new System.Drawing.Size(83, 17); + this.checkBox3.TabIndex = 2; + this.checkBox3.Text = "Enable SSE"; + this.checkBox3.UseVisualStyleBackColor = true; + // + // checkBox2 + // + this.checkBox2.AutoSize = true; + this.checkBox2.Location = new System.Drawing.Point(32, 113); + this.checkBox2.Name = "checkBox2"; + this.checkBox2.Size = new System.Drawing.Size(104, 17); + this.checkBox2.TabIndex = 1; + this.checkBox2.Text = "WinFrame Mode"; + this.checkBox2.UseVisualStyleBackColor = true; + // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.Location = new System.Drawing.Point(32, 44); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(80, 17); + this.checkBox1.TabIndex = 0; + this.checkBox1.Text = "Enable Fog"; + this.checkBox1.UseVisualStyleBackColor = true; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.label4); + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(564, 313); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "Direct X"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(121, 163); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(331, 13); + this.label4.TabIndex = 0; + this.label4.Text = "Dont think these are needed, should be handle by Bizhawk\'s config?"; + // + // tabPage3 + // + this.tabPage3.Controls.Add(this.label5); + this.tabPage3.Location = new System.Drawing.Point(4, 22); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Size = new System.Drawing.Size(564, 313); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "Texture Enhancement"; + this.tabPage3.UseVisualStyleBackColor = true; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(119, 129); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(103, 13); + this.label5.TabIndex = 0; + this.label5.Text = "Do we support that?"; + // + // tabPage4 + // + this.tabPage4.Controls.Add(this.groupBox1); + this.tabPage4.Controls.Add(this.checkBox6); + this.tabPage4.Controls.Add(this.checkBox5); + this.tabPage4.Location = new System.Drawing.Point(4, 22); + this.tabPage4.Name = "tabPage4"; + this.tabPage4.Size = new System.Drawing.Size(564, 313); + this.tabPage4.TabIndex = 3; + this.tabPage4.Text = "Game Default Options"; + this.tabPage4.UseVisualStyleBackColor = true; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.checkBox8); + this.groupBox1.Controls.Add(this.checkBox7); + this.groupBox1.Controls.Add(this.comboBox3); + this.groupBox1.Controls.Add(this.comboBox2); + this.groupBox1.Controls.Add(this.comboBox1); + this.groupBox1.Controls.Add(this.label8); + this.groupBox1.Controls.Add(this.label7); + this.groupBox1.Controls.Add(this.label6); + this.groupBox1.Location = new System.Drawing.Point(72, 98); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(398, 202); + this.groupBox1.TabIndex = 2; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "N64 Frame Buffer Effect Emulation Options"; + // + // checkBox8 + // + this.checkBox8.AutoSize = true; + this.checkBox8.Location = new System.Drawing.Point(26, 168); + this.checkBox8.Name = "checkBox8"; + this.checkBox8.Size = new System.Drawing.Size(268, 17); + this.checkBox8.TabIndex = 7; + this.checkBox8.Text = "Double the Resolution for Small Render-to-Textures"; + this.checkBox8.UseVisualStyleBackColor = true; + // + // checkBox7 + // + this.checkBox7.AutoSize = true; + this.checkBox7.Location = new System.Drawing.Point(26, 145); + this.checkBox7.Name = "checkBox7"; + this.checkBox7.Size = new System.Drawing.Size(226, 17); + this.checkBox7.TabIndex = 6; + this.checkBox7.Text = "Automatic Write Back Overlapped Texture"; + this.checkBox7.UseVisualStyleBackColor = true; + // + // comboBox3 + // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox3.FormattingEnabled = true; + this.comboBox3.Items.AddRange(new object[] { + "None (default)", + "Hide Render-to-texture Effects", + "Basic Render-to-texture", + "Basic & Write Back", + "Write Back & Reload"}); + this.comboBox3.Location = new System.Drawing.Point(215, 54); + this.comboBox3.Name = "comboBox3"; + this.comboBox3.Size = new System.Drawing.Size(121, 21); + this.comboBox3.TabIndex = 5; + // + // comboBox2 + // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox2.FormattingEnabled = true; + this.comboBox2.Items.AddRange(new object[] { + "Every Frame (default)", + "Every 2 Frames", + "Every 3 Frames", + "Every 4 Frames", + "Every 5 Frames", + "Every 6 Frames", + "Every 7 Frames", + "Every 8 Frames"}); + this.comboBox2.Location = new System.Drawing.Point(215, 81); + this.comboBox2.Name = "comboBox2"; + this.comboBox2.Size = new System.Drawing.Size(121, 21); + this.comboBox2.TabIndex = 4; + // + // comboBox1 + // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Items.AddRange(new object[] { + "None (default)", + "Hide Framebuffer Effects", + "Basic Framebuffer", + "Basic & Write Back", + "Write Back & Reload", + "Write Back Every Frame", + "With Emulator", + "Basic Framebuffer & With Emulator", + "With Emulator Read Only", + "With Emulator Write Only"}); + this.comboBox1.Location = new System.Drawing.Point(215, 24); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(121, 21); + this.comboBox1.TabIndex = 3; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(25, 62); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(159, 13); + this.label8.TabIndex = 2; + this.label8.Text = "Rendering to Texture Emulation:"; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(25, 89); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(126, 13); + this.label7.TabIndex = 1; + this.label7.Text = "Frame Buffer Write Back:"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(25, 32); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(142, 13); + this.label6.TabIndex = 0; + this.label6.Text = "N64 Frame Buffer Emulation:"; + // + // checkBox6 + // + this.checkBox6.AutoSize = true; + this.checkBox6.Location = new System.Drawing.Point(28, 65); + this.checkBox6.Name = "checkBox6"; + this.checkBox6.Size = new System.Drawing.Size(106, 17); + this.checkBox6.TabIndex = 1; + this.checkBox6.Text = "Normal Combiner"; + this.checkBox6.UseVisualStyleBackColor = true; + // + // checkBox5 + // + this.checkBox5.AutoSize = true; + this.checkBox5.Location = new System.Drawing.Point(28, 31); + this.checkBox5.Name = "checkBox5"; + this.checkBox5.Size = new System.Drawing.Size(98, 17); + this.checkBox5.TabIndex = 0; + this.checkBox5.Text = "Normal Blender"; + this.checkBox5.UseVisualStyleBackColor = true; + // + // JaboD3D8161tab + // + this.JaboD3D8161tab.Location = new System.Drawing.Point(4, 22); + this.JaboD3D8161tab.Name = "JaboD3D8161tab"; + this.JaboD3D8161tab.Size = new System.Drawing.Size(572, 339); + this.JaboD3D8161tab.TabIndex = 2; + this.JaboD3D8161tab.Text = "Jabo\'s Direct3D8 1.6.1"; + this.JaboD3D8161tab.UseVisualStyleBackColor = true; + // + // Glide64finaltab + // + this.Glide64finaltab.Location = new System.Drawing.Point(4, 22); + this.Glide64finaltab.Name = "Glide64finaltab"; + this.Glide64finaltab.Size = new System.Drawing.Size(572, 339); + this.Glide64finaltab.TabIndex = 3; + this.Glide64finaltab.Text = "Glide64 Final"; + this.Glide64finaltab.UseVisualStyleBackColor = true; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(365, 373); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 1; + this.button1.Text = "Save"; + this.button1.UseVisualStyleBackColor = true; + // + // button2 + // + this.button2.Location = new System.Drawing.Point(461, 373); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(75, 23); + this.button2.TabIndex = 2; + this.button2.Text = "Close"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); + // + // N64VideoPluginconfig + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(577, 408); + this.Controls.Add(this.button2); + this.Controls.Add(this.button1); + this.Controls.Add(this.N64plugintabcontrol); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.Name = "N64VideoPluginconfig"; + this.Text = "Video Plugin Config"; + this.N64plugintabcontrol.ResumeLayout(false); + this.N64vpluginglobaltab.ResumeLayout(false); + this.N64vpluginglobaltab.PerformLayout(); + this.Rice160tab.ResumeLayout(false); + this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.tabPage1.PerformLayout(); + this.tabPage2.ResumeLayout(false); + this.tabPage2.PerformLayout(); + this.tabPage3.ResumeLayout(false); + this.tabPage3.PerformLayout(); + this.tabPage4.ResumeLayout(false); + this.tabPage4.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.TabControl N64plugintabcontrol; + private System.Windows.Forms.TabPage N64vpluginglobaltab; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TabPage Rice160tab; + private System.Windows.Forms.TabPage JaboD3D8161tab; + private System.Windows.Forms.TabPage Glide64finaltab; + private System.Windows.Forms.ComboBox PluginComboBox; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.ComboBox VideoResolutionComboBox; + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.CheckBox checkBox4; + private System.Windows.Forms.CheckBox checkBox3; + private System.Windows.Forms.CheckBox checkBox2; + private System.Windows.Forms.CheckBox checkBox1; + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.TabPage tabPage3; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.TabPage tabPage4; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.CheckBox checkBox8; + private System.Windows.Forms.CheckBox checkBox7; + private System.Windows.Forms.ComboBox comboBox3; + private System.Windows.Forms.ComboBox comboBox2; + private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.CheckBox checkBox6; + private System.Windows.Forms.CheckBox checkBox5; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.Button button2; + } +} \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/N64VideoPluginconfig.cs b/BizHawk.MultiClient/tools/N64VideoPluginconfig.cs new file mode 100644 index 0000000000..c684771e26 --- /dev/null +++ b/BizHawk.MultiClient/tools/N64VideoPluginconfig.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace BizHawk.MultiClient.tools +{ + public partial class N64VideoPluginconfig : Form + { + public N64VideoPluginconfig() + { + InitializeComponent(); + } + + private void button2_Click(object sender, EventArgs e) + { + Close(); + } + } +} diff --git a/BizHawk.MultiClient/tools/N64VideoPluginconfig.resx b/BizHawk.MultiClient/tools/N64VideoPluginconfig.resx new file mode 100644 index 0000000000..29dcb1b3a3 --- /dev/null +++ b/BizHawk.MultiClient/tools/N64VideoPluginconfig.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file