diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index e9dd4a99af..1c1c4ac85b 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -261,9 +261,48 @@ namespace BizHawk.MultiClient public string FFMpegPath = "%exe%/dll/ffmpeg.exe"; //N64 Config Settings + public string N64VidPlugin = "Rice"; public int N64VideoSizeX = 320; public int N64VideoSizeY = 240; + + public int RiceFrameBufferSetting = 0; + public int RiceFrameBufferWriteBackControl = 0; + public int RiceRenderToTexture = 0; + public int RiceScreenUpdateSetting = 4; + public int RiceMipmapping = 2; + public int RiceFogMethod = 0; + public int RiceForceTextureFilter = 0; + public int RiceTextureEnhancement = 0; + public int RiceTextureEnhancementControl = 0; + public int RiceTextureQuality = 0; + public int RiceOpenGLDepthBufferSetting = 16; + public int RiceMultiSampling = 0; + public int RiceColorQuality = 0; + public int RiceOpenGLRenderSetting = 0; + public int RiceAnisotropicFiltering = 0; + + + public bool RiceNormalAlphaBlender = false; + public bool RiceFastTextureLoading = false; + public bool RiceAccurateTextureMapping = true; + public bool RiceInN64Resolution = false; + public bool RiceSaveVRAM = false; + public bool RiceDoubleSizeForSmallTxtrBuf = false; + public bool RiceDefaultCombinerDisable = false; + public bool RiceEnableHacks = true; + public bool RiceWinFrameMode = false; + public bool RiceFullTMEMEmulation = false; + public bool RiceOpenGLVertexClipper = false; + public bool RiceEnableSSE = true; + public bool RiceEnableVertexShader = false; + public bool RiceSkipFrame = false; + public bool RiceTexRectOnly = false; + public bool RiceSmallTextureOnly = false; + public bool RiceLoadHiResCRCOnly = true; + public bool RiceLoadHiResTextures = false; + public bool RiceDumpTexturesToFiles = false; + // General Client Settings public int Input_Hotkey_OverrideOptions = 0; public bool StackOSDMessages = true; diff --git a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs index ec0ff59e47..c47877289e 100644 --- a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs +++ b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs @@ -28,6 +28,8 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(N64VideoPluginconfig)); this.N64plugintabcontrol = new System.Windows.Forms.TabControl(); this.N64vpluginglobaltab = new System.Windows.Forms.TabPage(); this.label3 = new System.Windows.Forms.Label(); @@ -35,42 +37,76 @@ 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.RiceTabPage = new System.Windows.Forms.TabPage(); + this.RiceTabControl = new System.Windows.Forms.TabControl(); + this.RiceGeneral = new System.Windows.Forms.TabPage(); + this.label15 = new System.Windows.Forms.Label(); + this.RiceScreenUpdateSetting_Combo = new System.Windows.Forms.ComboBox(); + this.label14 = new System.Windows.Forms.Label(); + this.RiceMultiSampling_Combo = new System.Windows.Forms.ComboBox(); + this.label13 = new System.Windows.Forms.Label(); + this.RiceOpenGLRenderSetting_Combo = new System.Windows.Forms.ComboBox(); + this.label11 = new System.Windows.Forms.Label(); + this.RiceColorQuality_Combo = new System.Windows.Forms.ComboBox(); + this.label10 = new System.Windows.Forms.Label(); + this.RiceOpenGLDepthBufferSetting_Combo = new System.Windows.Forms.ComboBox(); + this.label9 = new System.Windows.Forms.Label(); + this.RiceTextureQuality_Combo = new System.Windows.Forms.ComboBox(); + this.RiceEnableVertexShader_CB = new System.Windows.Forms.CheckBox(); + this.RiceSkipFrame_CB = new System.Windows.Forms.CheckBox(); + this.RiceEnableHacks_CB = new System.Windows.Forms.CheckBox(); + this.RiceFullTMEMEmulation_CB = new System.Windows.Forms.CheckBox(); + this.RiceOpenGLVertexClipper_CB = new System.Windows.Forms.CheckBox(); + this.AnisotropicFiltering_LB = new System.Windows.Forms.Label(); + this.RiceAnisotropicFiltering_TB = new System.Windows.Forms.TrackBar(); 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.RiceFogMethod_Combo = new System.Windows.Forms.ComboBox(); + this.label5 = new System.Windows.Forms.Label(); + this.RiceMipmapping_Combo = new System.Windows.Forms.ComboBox(); + this.RiceWinFrameMode_CB = new System.Windows.Forms.CheckBox(); + this.RiceInN64Resolution_CB = new System.Windows.Forms.CheckBox(); + this.RiceFastTextureLoading_CB = new System.Windows.Forms.CheckBox(); + this.RiceAccurateTextureMapping_CB = new System.Windows.Forms.CheckBox(); + this.RiceSaveVRAM_CB = new System.Windows.Forms.CheckBox(); + this.RiceEnableSSE_CB = new System.Windows.Forms.CheckBox(); + this.RiceGameDefaultTab = new System.Windows.Forms.TabPage(); + this.RiceNormalAlphaBlender_CB = new System.Windows.Forms.CheckBox(); + this.RiceDefaultCombinerDisable_CB = new System.Windows.Forms.CheckBox(); + this.RiceFrameBuffer_GroupBox = new System.Windows.Forms.GroupBox(); + this.label16 = new System.Windows.Forms.Label(); + this.label17 = new System.Windows.Forms.Label(); + this.label18 = new System.Windows.Forms.Label(); + this.RiceFrameBufferWriteBackControl_Combo = new System.Windows.Forms.ComboBox(); + this.RiceFrameBufferSetting_Combo = new System.Windows.Forms.ComboBox(); + this.RiceDoubleSizeForSmallTxtrBuf_CB = new System.Windows.Forms.CheckBox(); + this.RiceRenderToTexture_Combo = new System.Windows.Forms.ComboBox(); + this.RiceTextureEnhancementTab = new System.Windows.Forms.TabPage(); + this.label12 = new System.Windows.Forms.Label(); + this.RiceForceTextureFilter_Combo = new System.Windows.Forms.ComboBox(); + this.label8 = new System.Windows.Forms.Label(); + this.RiceTextureEnhancementControl_Combo = new System.Windows.Forms.ComboBox(); + this.label7 = new System.Windows.Forms.Label(); + this.RiceTextureEnhancement_Combo = new System.Windows.Forms.ComboBox(); + this.RiceTexRectOnly_CB = new System.Windows.Forms.CheckBox(); + this.RiceSmallTextureOnly_CB = new System.Windows.Forms.CheckBox(); + this.RiceLoadHiResCRCOnly_CB = new System.Windows.Forms.CheckBox(); + this.RiceLoadHiResTextures_CB = new System.Windows.Forms.CheckBox(); + this.RiceDumpTexturesToFiles_CB = new System.Windows.Forms.CheckBox(); + this.RiceGameSpecificTab = new System.Windows.Forms.TabPage(); + this.label4 = new System.Windows.Forms.Label(); this.button1 = new System.Windows.Forms.Button(); - this.button2 = new System.Windows.Forms.Button(); + this.CancelBT = new System.Windows.Forms.Button(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); 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.RiceTabPage.SuspendLayout(); + this.RiceTabControl.SuspendLayout(); + this.RiceGeneral.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.RiceAnisotropicFiltering_TB)).BeginInit(); + this.RiceGameDefaultTab.SuspendLayout(); + this.RiceFrameBuffer_GroupBox.SuspendLayout(); + this.RiceTextureEnhancementTab.SuspendLayout(); + this.RiceGameSpecificTab.SuspendLayout(); this.SuspendLayout(); // // N64plugintabcontrol @@ -79,9 +115,7 @@ | 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.Controls.Add(this.RiceTabPage); this.N64plugintabcontrol.Location = new System.Drawing.Point(-2, -2); this.N64plugintabcontrol.Name = "N64plugintabcontrol"; this.N64plugintabcontrol.SelectedIndex = 0; @@ -149,9 +183,8 @@ 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"}); + "Rice", + "Glide64"}); this.PluginComboBox.Location = new System.Drawing.Point(13, 34); this.PluginComboBox.Name = "PluginComboBox"; this.PluginComboBox.Size = new System.Drawing.Size(173, 21); @@ -166,193 +199,526 @@ this.label1.TabIndex = 1; this.label1.Text = "Active Video Plugin"; // - // Rice160tab + // RiceTabPage // - 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; + this.RiceTabPage.Controls.Add(this.RiceTabControl); + this.RiceTabPage.Location = new System.Drawing.Point(4, 22); + this.RiceTabPage.Name = "RiceTabPage"; + this.RiceTabPage.Size = new System.Drawing.Size(572, 339); + this.RiceTabPage.TabIndex = 4; + this.RiceTabPage.Text = "Rice"; + this.RiceTabPage.UseVisualStyleBackColor = true; // - // tabControl1 + // RiceTabControl // - 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; + this.RiceTabControl.Controls.Add(this.RiceGeneral); + this.RiceTabControl.Controls.Add(this.RiceGameDefaultTab); + this.RiceTabControl.Controls.Add(this.RiceTextureEnhancementTab); + this.RiceTabControl.Controls.Add(this.RiceGameSpecificTab); + this.RiceTabControl.Location = new System.Drawing.Point(0, 3); + this.RiceTabControl.Name = "RiceTabControl"; + this.RiceTabControl.SelectedIndex = 0; + this.RiceTabControl.Size = new System.Drawing.Size(572, 336); + this.RiceTabControl.TabIndex = 0; // - // tabPage1 + // RiceGeneral // - 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; + this.RiceGeneral.Controls.Add(this.label15); + this.RiceGeneral.Controls.Add(this.RiceScreenUpdateSetting_Combo); + this.RiceGeneral.Controls.Add(this.label14); + this.RiceGeneral.Controls.Add(this.RiceMultiSampling_Combo); + this.RiceGeneral.Controls.Add(this.label13); + this.RiceGeneral.Controls.Add(this.RiceOpenGLRenderSetting_Combo); + this.RiceGeneral.Controls.Add(this.label11); + this.RiceGeneral.Controls.Add(this.RiceColorQuality_Combo); + this.RiceGeneral.Controls.Add(this.label10); + this.RiceGeneral.Controls.Add(this.RiceOpenGLDepthBufferSetting_Combo); + this.RiceGeneral.Controls.Add(this.label9); + this.RiceGeneral.Controls.Add(this.RiceTextureQuality_Combo); + this.RiceGeneral.Controls.Add(this.RiceEnableVertexShader_CB); + this.RiceGeneral.Controls.Add(this.RiceSkipFrame_CB); + this.RiceGeneral.Controls.Add(this.RiceEnableHacks_CB); + this.RiceGeneral.Controls.Add(this.RiceFullTMEMEmulation_CB); + this.RiceGeneral.Controls.Add(this.RiceOpenGLVertexClipper_CB); + this.RiceGeneral.Controls.Add(this.AnisotropicFiltering_LB); + this.RiceGeneral.Controls.Add(this.RiceAnisotropicFiltering_TB); + this.RiceGeneral.Controls.Add(this.label6); + this.RiceGeneral.Controls.Add(this.RiceFogMethod_Combo); + this.RiceGeneral.Controls.Add(this.label5); + this.RiceGeneral.Controls.Add(this.RiceMipmapping_Combo); + this.RiceGeneral.Controls.Add(this.RiceWinFrameMode_CB); + this.RiceGeneral.Controls.Add(this.RiceInN64Resolution_CB); + this.RiceGeneral.Controls.Add(this.RiceFastTextureLoading_CB); + this.RiceGeneral.Controls.Add(this.RiceAccurateTextureMapping_CB); + this.RiceGeneral.Controls.Add(this.RiceSaveVRAM_CB); + this.RiceGeneral.Controls.Add(this.RiceEnableSSE_CB); + this.RiceGeneral.Location = new System.Drawing.Point(4, 22); + this.RiceGeneral.Name = "RiceGeneral"; + this.RiceGeneral.Padding = new System.Windows.Forms.Padding(3); + this.RiceGeneral.Size = new System.Drawing.Size(564, 310); + this.RiceGeneral.TabIndex = 0; + this.RiceGeneral.Text = "General"; + this.RiceGeneral.UseVisualStyleBackColor = true; // - // checkBox4 + // label15 // - 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; + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(287, 204); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(118, 13); + this.label15.TabIndex = 36; + this.label15.Text = "Screen Update Setting:"; + this.label15.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.toolTip1.SetToolTip(this.label15, "Control when the screen will be updated.\r\n\r\nDefault: First CI change"); // - // checkBox3 + // RiceScreenUpdateSetting_Combo // - 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; + this.RiceScreenUpdateSetting_Combo.DisplayMember = "0,1,2,3"; + this.RiceScreenUpdateSetting_Combo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.RiceScreenUpdateSetting_Combo.FormattingEnabled = true; + this.RiceScreenUpdateSetting_Combo.Items.AddRange(new object[] { + "ROM default", + "VI origin update", + "VI origin change", + "CI change", + "First CI change", + "First primitive draw", + "Before screen clear", + "After screen drawn"}); + this.RiceScreenUpdateSetting_Combo.Location = new System.Drawing.Point(409, 201); + this.RiceScreenUpdateSetting_Combo.Name = "RiceScreenUpdateSetting_Combo"; + this.RiceScreenUpdateSetting_Combo.Size = new System.Drawing.Size(121, 21); + this.RiceScreenUpdateSetting_Combo.TabIndex = 35; + this.toolTip1.SetToolTip(this.RiceScreenUpdateSetting_Combo, "Control when the screen will be updated.\r\n\r\nDefault: First CI change"); // - // checkBox2 + // label14 // - 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; + this.label14.AutoSize = true; + this.label14.Location = new System.Drawing.Point(326, 177); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(75, 13); + this.label14.TabIndex = 34; + this.label14.Text = "MultiSampling:"; + this.label14.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.toolTip1.SetToolTip(this.label14, "Enable/Disable MultiSampling.\r\n\r\nDefault: Off"); // - // checkBox1 + // RiceMultiSampling_Combo // - 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; + this.RiceMultiSampling_Combo.DisplayMember = "0,1,2,3"; + this.RiceMultiSampling_Combo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.RiceMultiSampling_Combo.FormattingEnabled = true; + this.RiceMultiSampling_Combo.Items.AddRange(new object[] { + "Off", + "2x", + "4x", + "8x", + "16x"}); + this.RiceMultiSampling_Combo.Location = new System.Drawing.Point(409, 174); + this.RiceMultiSampling_Combo.Name = "RiceMultiSampling_Combo"; + this.RiceMultiSampling_Combo.Size = new System.Drawing.Size(121, 21); + this.RiceMultiSampling_Combo.TabIndex = 33; + this.toolTip1.SetToolTip(this.RiceMultiSampling_Combo, "Enable/Disable MultiSampling.\r\n\r\nDefault: Off"); // - // tabPage2 + // label13 // - 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; + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(287, 150); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(118, 13); + this.label13.TabIndex = 32; + this.label13.Text = "OpenGLRenderSetting:"; + this.label13.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.toolTip1.SetToolTip(this.label13, "OpenGL level to support.\r\n\r\nDefault: Auto"); // - // label4 + // RiceOpenGLRenderSetting_Combo // - 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?"; + this.RiceOpenGLRenderSetting_Combo.DisplayMember = "0,1,2,3"; + this.RiceOpenGLRenderSetting_Combo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.RiceOpenGLRenderSetting_Combo.FormattingEnabled = true; + this.RiceOpenGLRenderSetting_Combo.Items.AddRange(new object[] { + "Auto", + "OGL_1.1", + "OGL_1.2", + "OGL_1.3", + "OGL_1.4", + "OGL_1.4_V2", + "OGL_TNT2", + "NVIDIA_OGL", + "OpenGL Fragment Program Extension"}); + this.RiceOpenGLRenderSetting_Combo.Location = new System.Drawing.Point(409, 147); + this.RiceOpenGLRenderSetting_Combo.Name = "RiceOpenGLRenderSetting_Combo"; + this.RiceOpenGLRenderSetting_Combo.Size = new System.Drawing.Size(121, 21); + this.RiceOpenGLRenderSetting_Combo.TabIndex = 31; + this.toolTip1.SetToolTip(this.RiceOpenGLRenderSetting_Combo, "OpenGL level to support.\r\n\r\nDefault: Auto"); // - // tabPage3 + // label11 // - 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; + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(326, 123); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(69, 13); + this.label11.TabIndex = 30; + this.label11.Text = "Color Quality:"; + this.label11.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.toolTip1.SetToolTip(this.label11, "Color bit depth for rendering window.\r\n\r\nDefault: 32-bits"); + // + // RiceColorQuality_Combo + // + this.RiceColorQuality_Combo.DisplayMember = "0,1,2,3"; + this.RiceColorQuality_Combo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.RiceColorQuality_Combo.FormattingEnabled = true; + this.RiceColorQuality_Combo.Items.AddRange(new object[] { + "32-bits", + "16-bits"}); + this.RiceColorQuality_Combo.Location = new System.Drawing.Point(409, 120); + this.RiceColorQuality_Combo.Name = "RiceColorQuality_Combo"; + this.RiceColorQuality_Combo.Size = new System.Drawing.Size(121, 21); + this.RiceColorQuality_Combo.TabIndex = 29; + this.toolTip1.SetToolTip(this.RiceColorQuality_Combo, "Color bit depth for rendering window.\r\n\r\nDefault: 32-bits"); + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Location = new System.Drawing.Point(326, 96); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(77, 13); + this.label10.TabIndex = 28; + this.label10.Text = "Z-buffer depth:"; + this.label10.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.toolTip1.SetToolTip(this.label10, "Z-buffer depth.\r\n\r\nDefault: 16-bits"); + // + // RiceOpenGLDepthBufferSetting_Combo + // + this.RiceOpenGLDepthBufferSetting_Combo.DisplayMember = "0,1,2,3"; + this.RiceOpenGLDepthBufferSetting_Combo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.RiceOpenGLDepthBufferSetting_Combo.FormattingEnabled = true; + this.RiceOpenGLDepthBufferSetting_Combo.Items.AddRange(new object[] { + "16-bits", + "32-bits"}); + this.RiceOpenGLDepthBufferSetting_Combo.Location = new System.Drawing.Point(409, 93); + this.RiceOpenGLDepthBufferSetting_Combo.Name = "RiceOpenGLDepthBufferSetting_Combo"; + this.RiceOpenGLDepthBufferSetting_Combo.Size = new System.Drawing.Size(121, 21); + this.RiceOpenGLDepthBufferSetting_Combo.TabIndex = 27; + this.toolTip1.SetToolTip(this.RiceOpenGLDepthBufferSetting_Combo, "Z-buffer depth.\r\n\r\nDefault: 16-bits"); + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(298, 70); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(105, 13); + this.label9.TabIndex = 26; + this.label9.Text = "Texture Color Depth:"; + this.label9.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.toolTip1.SetToolTip(this.label9, "Color bit depth to use for textures.\r\n\r\nDefault: Default"); + // + // RiceTextureQuality_Combo + // + this.RiceTextureQuality_Combo.DisplayMember = "0,1,2,3"; + this.RiceTextureQuality_Combo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.RiceTextureQuality_Combo.FormattingEnabled = true; + this.RiceTextureQuality_Combo.Items.AddRange(new object[] { + "Default", + "32-bits", + "16-bits"}); + this.RiceTextureQuality_Combo.Location = new System.Drawing.Point(409, 66); + this.RiceTextureQuality_Combo.Name = "RiceTextureQuality_Combo"; + this.RiceTextureQuality_Combo.Size = new System.Drawing.Size(121, 21); + this.RiceTextureQuality_Combo.TabIndex = 25; + this.toolTip1.SetToolTip(this.RiceTextureQuality_Combo, "Color bit depth to use for textures.\r\n\r\nDefault: Default"); + // + // RiceEnableVertexShader_CB + // + this.RiceEnableVertexShader_CB.AutoSize = true; + this.RiceEnableVertexShader_CB.Location = new System.Drawing.Point(23, 223); + this.RiceEnableVertexShader_CB.Name = "RiceEnableVertexShader_CB"; + this.RiceEnableVertexShader_CB.Size = new System.Drawing.Size(93, 17); + this.RiceEnableVertexShader_CB.TabIndex = 24; + this.RiceEnableVertexShader_CB.Text = "Vertex Shader"; + this.toolTip1.SetToolTip(this.RiceEnableVertexShader_CB, "Use GPU vertex shader.\r\n\r\nDefault: Off"); + this.RiceEnableVertexShader_CB.UseVisualStyleBackColor = true; + // + // RiceSkipFrame_CB + // + this.RiceSkipFrame_CB.AutoSize = true; + this.RiceSkipFrame_CB.Location = new System.Drawing.Point(23, 246); + this.RiceSkipFrame_CB.Name = "RiceSkipFrame_CB"; + this.RiceSkipFrame_CB.Size = new System.Drawing.Size(79, 17); + this.RiceSkipFrame_CB.TabIndex = 23; + this.RiceSkipFrame_CB.Text = "Skip Frame"; + this.toolTip1.SetToolTip(this.RiceSkipFrame_CB, "If this option is enabled, the plugin will skip every other frame.\r\n\r\nDefault: Of" + + "f"); + this.RiceSkipFrame_CB.UseVisualStyleBackColor = true; + // + // RiceEnableHacks_CB + // + this.RiceEnableHacks_CB.AutoSize = true; + this.RiceEnableHacks_CB.Location = new System.Drawing.Point(23, 154); + this.RiceEnableHacks_CB.Name = "RiceEnableHacks_CB"; + this.RiceEnableHacks_CB.Size = new System.Drawing.Size(166, 17); + this.RiceEnableHacks_CB.TabIndex = 17; + this.RiceEnableHacks_CB.Text = "Enable game-specific settings"; + this.toolTip1.SetToolTip(this.RiceEnableHacks_CB, "Enable game-specific settings from INI file.\r\n\r\nDefault: On"); + this.RiceEnableHacks_CB.UseVisualStyleBackColor = true; + // + // RiceFullTMEMEmulation_CB + // + this.RiceFullTMEMEmulation_CB.AutoSize = true; + this.RiceFullTMEMEmulation_CB.Location = new System.Drawing.Point(23, 177); + this.RiceFullTMEMEmulation_CB.Name = "RiceFullTMEMEmulation_CB"; + this.RiceFullTMEMEmulation_CB.Size = new System.Drawing.Size(170, 17); + this.RiceFullTMEMEmulation_CB.TabIndex = 16; + this.RiceFullTMEMEmulation_CB.Text = "Full Texture Memory Emulation"; + this.toolTip1.SetToolTip(this.RiceFullTMEMEmulation_CB, "N64 Texture Memory Full Emulation.\r\nMay fix some games, may break others.\r\n\r\nDefa" + + "ult: Off"); + this.RiceFullTMEMEmulation_CB.UseVisualStyleBackColor = true; + // + // RiceOpenGLVertexClipper_CB + // + this.RiceOpenGLVertexClipper_CB.AutoSize = true; + this.RiceOpenGLVertexClipper_CB.Location = new System.Drawing.Point(23, 200); + this.RiceOpenGLVertexClipper_CB.Name = "RiceOpenGLVertexClipper_CB"; + this.RiceOpenGLVertexClipper_CB.Size = new System.Drawing.Size(91, 17); + this.RiceOpenGLVertexClipper_CB.TabIndex = 15; + this.RiceOpenGLVertexClipper_CB.Text = "Vertex Clipper"; + this.toolTip1.SetToolTip(this.RiceOpenGLVertexClipper_CB, "Enable vertex clipper for fog operations.\r\n\r\nDefault: Off"); + this.RiceOpenGLVertexClipper_CB.UseVisualStyleBackColor = true; + // + // AnisotropicFiltering_LB + // + this.AnisotropicFiltering_LB.AutoSize = true; + this.AnisotropicFiltering_LB.Location = new System.Drawing.Point(287, 247); + this.AnisotropicFiltering_LB.Name = "AnisotropicFiltering_LB"; + this.AnisotropicFiltering_LB.Size = new System.Drawing.Size(116, 13); + this.AnisotropicFiltering_LB.TabIndex = 14; + this.AnisotropicFiltering_LB.Text = "Anisotropic Filtering: 00"; + this.toolTip1.SetToolTip(this.AnisotropicFiltering_LB, resources.GetString("AnisotropicFiltering_LB.ToolTip")); + // + // RiceAnisotropicFiltering_TB + // + this.RiceAnisotropicFiltering_TB.AutoSize = false; + this.RiceAnisotropicFiltering_TB.Location = new System.Drawing.Point(409, 235); + this.RiceAnisotropicFiltering_TB.Margin = new System.Windows.Forms.Padding(0); + this.RiceAnisotropicFiltering_TB.Maximum = 16; + this.RiceAnisotropicFiltering_TB.Name = "RiceAnisotropicFiltering_TB"; + this.RiceAnisotropicFiltering_TB.Size = new System.Drawing.Size(121, 25); + this.RiceAnisotropicFiltering_TB.TabIndex = 13; + this.toolTip1.SetToolTip(this.RiceAnisotropicFiltering_TB, resources.GetString("RiceAnisotropicFiltering_TB.ToolTip")); + this.RiceAnisotropicFiltering_TB.Scroll += new System.EventHandler(this.RiceAnisotropicFiltering_TB_Scroll_1); + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(336, 44); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(67, 13); + this.label6.TabIndex = 12; + this.label6.Text = "Fog Method:"; + this.label6.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.toolTip1.SetToolTip(this.label6, "Enable, Disable or Force fog generation.\r\n\r\nDefault: Disabled"); + // + // RiceFogMethod_Combo + // + this.RiceFogMethod_Combo.DisplayMember = "0,1,2,3"; + this.RiceFogMethod_Combo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.RiceFogMethod_Combo.FormattingEnabled = true; + this.RiceFogMethod_Combo.Items.AddRange(new object[] { + "Disabled", + "Enabled (N64 choose)", + "Force Fog"}); + this.RiceFogMethod_Combo.Location = new System.Drawing.Point(409, 39); + this.RiceFogMethod_Combo.Name = "RiceFogMethod_Combo"; + this.RiceFogMethod_Combo.Size = new System.Drawing.Size(121, 21); + this.RiceFogMethod_Combo.TabIndex = 11; + this.toolTip1.SetToolTip(this.RiceFogMethod_Combo, "Enable, Disable or Force fog generation.\r\n\r\nDefault: Disabled"); // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(119, 129); + this.label5.Location = new System.Drawing.Point(314, 21); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(103, 13); - this.label5.TabIndex = 0; - this.label5.Text = "Do we support that?"; + this.label5.Size = new System.Drawing.Size(89, 13); + this.label5.TabIndex = 10; + this.label5.Text = "Use Mipmapping:"; + this.label5.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.toolTip1.SetToolTip(this.label5, "Allows textures to look nicer viewed from far away.\r\nCan also increase performanc" + + "e in some case.\r\n\r\nDefault: Bilinear\r\n"); // - // tabPage4 + // RiceMipmapping_Combo // - 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; + this.RiceMipmapping_Combo.DisplayMember = "0,1,2,3"; + this.RiceMipmapping_Combo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.RiceMipmapping_Combo.FormattingEnabled = true; + this.RiceMipmapping_Combo.Items.AddRange(new object[] { + "None", + "Nearest", + "Bilinear", + "Trilinear"}); + this.RiceMipmapping_Combo.Location = new System.Drawing.Point(409, 16); + this.RiceMipmapping_Combo.Name = "RiceMipmapping_Combo"; + this.RiceMipmapping_Combo.Size = new System.Drawing.Size(121, 21); + this.RiceMipmapping_Combo.TabIndex = 9; + this.toolTip1.SetToolTip(this.RiceMipmapping_Combo, "Allows textures to look nicer viewed from far away.\r\nCan also increase performanc" + + "e in some case.\r\n\r\nDefault: Bilinear"); // - // groupBox1 + // RiceWinFrameMode_CB // - 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"; + this.RiceWinFrameMode_CB.AutoSize = true; + this.RiceWinFrameMode_CB.Location = new System.Drawing.Point(23, 33); + this.RiceWinFrameMode_CB.Name = "RiceWinFrameMode_CB"; + this.RiceWinFrameMode_CB.Size = new System.Drawing.Size(140, 17); + this.RiceWinFrameMode_CB.TabIndex = 8; + this.RiceWinFrameMode_CB.Text = "Enable WinFrame Mode"; + this.toolTip1.SetToolTip(this.RiceWinFrameMode_CB, "If enabled, graphics will be drawn in WinFrame mode instead of solid and texture " + + "mode.\r\n\r\nDefault: Off"); + this.RiceWinFrameMode_CB.UseVisualStyleBackColor = true; // - // checkBox8 + // RiceInN64Resolution_CB // - 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; + this.RiceInN64Resolution_CB.AutoSize = true; + this.RiceInN64Resolution_CB.Location = new System.Drawing.Point(23, 56); + this.RiceInN64Resolution_CB.Name = "RiceInN64Resolution_CB"; + this.RiceInN64Resolution_CB.Size = new System.Drawing.Size(166, 17); + this.RiceInN64Resolution_CB.TabIndex = 7; + this.RiceInN64Resolution_CB.Text = "Force Native N64 Resolution"; + this.toolTip1.SetToolTip(this.RiceInN64Resolution_CB, "Force emulated frame buffers to be in N64 native resolution.\r\n\r\nDefault: Off"); + this.RiceInN64Resolution_CB.UseVisualStyleBackColor = true; // - // checkBox7 + // RiceFastTextureLoading_CB // - 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; + this.RiceFastTextureLoading_CB.AutoSize = true; + this.RiceFastTextureLoading_CB.Location = new System.Drawing.Point(23, 82); + this.RiceFastTextureLoading_CB.Name = "RiceFastTextureLoading_CB"; + this.RiceFastTextureLoading_CB.Size = new System.Drawing.Size(126, 17); + this.RiceFastTextureLoading_CB.TabIndex = 5; + this.RiceFastTextureLoading_CB.Text = "Fast Texture Loading"; + this.toolTip1.SetToolTip(this.RiceFastTextureLoading_CB, "Use a faster algorithm to speed up texture loading and CRC computation.\r\n\r\nDefaul" + + "t: Off"); + this.RiceFastTextureLoading_CB.UseVisualStyleBackColor = true; // - // comboBox3 + // RiceAccurateTextureMapping_CB // - 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; + this.RiceAccurateTextureMapping_CB.AutoSize = true; + this.RiceAccurateTextureMapping_CB.Location = new System.Drawing.Point(23, 105); + this.RiceAccurateTextureMapping_CB.Name = "RiceAccurateTextureMapping_CB"; + this.RiceAccurateTextureMapping_CB.Size = new System.Drawing.Size(152, 17); + this.RiceAccurateTextureMapping_CB.TabIndex = 4; + this.RiceAccurateTextureMapping_CB.Text = "Accurate Texture Mapping"; + this.toolTip1.SetToolTip(this.RiceAccurateTextureMapping_CB, "Use different texture coordinate clamping code.\r\n\r\nDefault: On"); + this.RiceAccurateTextureMapping_CB.UseVisualStyleBackColor = true; // - // comboBox2 + // RiceSaveVRAM_CB // - this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comboBox2.FormattingEnabled = true; - this.comboBox2.Items.AddRange(new object[] { - "Every Frame (default)", + this.RiceSaveVRAM_CB.AutoSize = true; + this.RiceSaveVRAM_CB.Location = new System.Drawing.Point(23, 128); + this.RiceSaveVRAM_CB.Name = "RiceSaveVRAM_CB"; + this.RiceSaveVRAM_CB.Size = new System.Drawing.Size(85, 17); + this.RiceSaveVRAM_CB.TabIndex = 3; + this.RiceSaveVRAM_CB.Text = "Save VRAM"; + this.toolTip1.SetToolTip(this.RiceSaveVRAM_CB, "Try to reduce Video RAM usage (should never be used).\r\n\r\nDefault: Off"); + this.RiceSaveVRAM_CB.UseVisualStyleBackColor = true; + // + // RiceEnableSSE_CB + // + this.RiceEnableSSE_CB.AutoSize = true; + this.RiceEnableSSE_CB.Location = new System.Drawing.Point(23, 10); + this.RiceEnableSSE_CB.Name = "RiceEnableSSE_CB"; + this.RiceEnableSSE_CB.Size = new System.Drawing.Size(83, 17); + this.RiceEnableSSE_CB.TabIndex = 0; + this.RiceEnableSSE_CB.Text = "Enable SSE"; + this.toolTip1.SetToolTip(this.RiceEnableSSE_CB, "Enable/Disable SSE optimizations for capable CPUs.\r\n\r\nDefault: On"); + this.RiceEnableSSE_CB.UseVisualStyleBackColor = true; + // + // RiceGameDefaultTab + // + this.RiceGameDefaultTab.Controls.Add(this.RiceNormalAlphaBlender_CB); + this.RiceGameDefaultTab.Controls.Add(this.RiceDefaultCombinerDisable_CB); + this.RiceGameDefaultTab.Controls.Add(this.RiceFrameBuffer_GroupBox); + this.RiceGameDefaultTab.Location = new System.Drawing.Point(4, 22); + this.RiceGameDefaultTab.Name = "RiceGameDefaultTab"; + this.RiceGameDefaultTab.Size = new System.Drawing.Size(564, 310); + this.RiceGameDefaultTab.TabIndex = 3; + this.RiceGameDefaultTab.Text = "Game Default Options"; + this.RiceGameDefaultTab.UseVisualStyleBackColor = true; + // + // RiceNormalAlphaBlender_CB + // + this.RiceNormalAlphaBlender_CB.AutoSize = true; + this.RiceNormalAlphaBlender_CB.Location = new System.Drawing.Point(63, 19); + this.RiceNormalAlphaBlender_CB.Name = "RiceNormalAlphaBlender_CB"; + this.RiceNormalAlphaBlender_CB.Size = new System.Drawing.Size(128, 17); + this.RiceNormalAlphaBlender_CB.TabIndex = 8; + this.RiceNormalAlphaBlender_CB.Text = "Normal Alpha Blender"; + this.toolTip1.SetToolTip(this.RiceNormalAlphaBlender_CB, "Force to use normal alpha blender.\r\n\r\nDefault: Off"); + this.RiceNormalAlphaBlender_CB.UseVisualStyleBackColor = true; + // + // RiceDefaultCombinerDisable_CB + // + this.RiceDefaultCombinerDisable_CB.AutoSize = true; + this.RiceDefaultCombinerDisable_CB.Location = new System.Drawing.Point(63, 42); + this.RiceDefaultCombinerDisable_CB.Name = "RiceDefaultCombinerDisable_CB"; + this.RiceDefaultCombinerDisable_CB.Size = new System.Drawing.Size(133, 17); + this.RiceDefaultCombinerDisable_CB.TabIndex = 7; + this.RiceDefaultCombinerDisable_CB.Text = "Normal Color Combiner"; + this.toolTip1.SetToolTip(this.RiceDefaultCombinerDisable_CB, "Force to use normal color combiner.\r\n\r\nDefault: Off"); + this.RiceDefaultCombinerDisable_CB.UseVisualStyleBackColor = true; + // + // RiceFrameBuffer_GroupBox + // + this.RiceFrameBuffer_GroupBox.Controls.Add(this.label16); + this.RiceFrameBuffer_GroupBox.Controls.Add(this.label17); + this.RiceFrameBuffer_GroupBox.Controls.Add(this.label18); + this.RiceFrameBuffer_GroupBox.Controls.Add(this.RiceFrameBufferWriteBackControl_Combo); + this.RiceFrameBuffer_GroupBox.Controls.Add(this.RiceFrameBufferSetting_Combo); + this.RiceFrameBuffer_GroupBox.Controls.Add(this.RiceDoubleSizeForSmallTxtrBuf_CB); + this.RiceFrameBuffer_GroupBox.Controls.Add(this.RiceRenderToTexture_Combo); + this.RiceFrameBuffer_GroupBox.Location = new System.Drawing.Point(87, 78); + this.RiceFrameBuffer_GroupBox.Name = "RiceFrameBuffer_GroupBox"; + this.RiceFrameBuffer_GroupBox.Size = new System.Drawing.Size(385, 191); + this.RiceFrameBuffer_GroupBox.TabIndex = 0; + this.RiceFrameBuffer_GroupBox.TabStop = false; + this.RiceFrameBuffer_GroupBox.Text = "N64 Frame Buffer Effect Emulation Options"; + // + // label16 + // + this.label16.AutoSize = true; + this.label16.Location = new System.Drawing.Point(8, 100); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(162, 13); + this.label16.TabIndex = 32; + this.label16.Text = "Frame Buffer Write Back Control:"; + this.label16.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.toolTip1.SetToolTip(this.label16, "Frequency to write back the frame buffer.\r\n\r\nDefault: Every Frame"); + // + // label17 + // + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(8, 46); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(106, 13); + this.label17.TabIndex = 34; + this.label17.Text = "Frame Buffer Setting:"; + this.label17.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.toolTip1.SetToolTip(this.label17, "Frame Buffer Emulation.\r\n\r\nDefault: Rom Default"); + // + // label18 + // + this.label18.AutoSize = true; + this.label18.Location = new System.Drawing.Point(8, 73); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(159, 13); + this.label18.TabIndex = 36; + this.label18.Text = "Rendering to Texture Emulation:"; + this.label18.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.toolTip1.SetToolTip(this.label18, "Render-to-texture emulation.\r\n\r\nDefault: None"); + // + // RiceFrameBufferWriteBackControl_Combo + // + this.RiceFrameBufferWriteBackControl_Combo.DisplayMember = "0,1,2,3"; + this.RiceFrameBufferWriteBackControl_Combo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.RiceFrameBufferWriteBackControl_Combo.FormattingEnabled = true; + this.RiceFrameBufferWriteBackControl_Combo.Items.AddRange(new object[] { + "Every Frame", "Every 2 Frames", "Every 3 Frames", "Every 4 Frames", @@ -360,95 +726,233 @@ "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; + this.RiceFrameBufferWriteBackControl_Combo.Location = new System.Drawing.Point(226, 97); + this.RiceFrameBufferWriteBackControl_Combo.Name = "RiceFrameBufferWriteBackControl_Combo"; + this.RiceFrameBufferWriteBackControl_Combo.Size = new System.Drawing.Size(121, 21); + this.RiceFrameBufferWriteBackControl_Combo.TabIndex = 33; + this.toolTip1.SetToolTip(this.RiceFrameBufferWriteBackControl_Combo, "Frequency to write back the frame buffer.\r\n\r\nDefault: Every Frame"); // - // comboBox1 + // RiceFrameBufferSetting_Combo // - 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", + this.RiceFrameBufferSetting_Combo.DisplayMember = "0,1,2,3"; + this.RiceFrameBufferSetting_Combo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.RiceFrameBufferSetting_Combo.FormattingEnabled = true; + this.RiceFrameBufferSetting_Combo.Items.AddRange(new object[] { + "Rom Default", + "Disable"}); + this.RiceFrameBufferSetting_Combo.Location = new System.Drawing.Point(226, 43); + this.RiceFrameBufferSetting_Combo.Name = "RiceFrameBufferSetting_Combo"; + this.RiceFrameBufferSetting_Combo.Size = new System.Drawing.Size(121, 21); + this.RiceFrameBufferSetting_Combo.TabIndex = 31; + this.toolTip1.SetToolTip(this.RiceFrameBufferSetting_Combo, "Frame Buffer Emulation.\r\n\r\nDefault: Rom Default"); + // + // RiceDoubleSizeForSmallTxtrBuf_CB + // + this.RiceDoubleSizeForSmallTxtrBuf_CB.AutoSize = true; + this.RiceDoubleSizeForSmallTxtrBuf_CB.Location = new System.Drawing.Point(61, 159); + this.RiceDoubleSizeForSmallTxtrBuf_CB.Name = "RiceDoubleSizeForSmallTxtrBuf_CB"; + this.RiceDoubleSizeForSmallTxtrBuf_CB.Size = new System.Drawing.Size(253, 17); + this.RiceDoubleSizeForSmallTxtrBuf_CB.TabIndex = 3; + this.RiceDoubleSizeForSmallTxtrBuf_CB.Text = "Double Resolution For Small Render-to-Textures"; + this.toolTip1.SetToolTip(this.RiceDoubleSizeForSmallTxtrBuf_CB, "Enable this option to have better render-to-texture quality.\r\nThis requires more " + + "VRAM.\r\n\r\nDefault: Off"); + this.RiceDoubleSizeForSmallTxtrBuf_CB.UseVisualStyleBackColor = true; + // + // RiceRenderToTexture_Combo + // + this.RiceRenderToTexture_Combo.DisplayMember = "0,1,2,3"; + this.RiceRenderToTexture_Combo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.RiceRenderToTexture_Combo.FormattingEnabled = true; + this.RiceRenderToTexture_Combo.Items.AddRange(new object[] { + "None", + "Hide Render-to-texture Effects", + "Basic Render-to-texture", "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; + "Write Back & Reload"}); + this.RiceRenderToTexture_Combo.Location = new System.Drawing.Point(226, 70); + this.RiceRenderToTexture_Combo.Name = "RiceRenderToTexture_Combo"; + this.RiceRenderToTexture_Combo.Size = new System.Drawing.Size(121, 21); + this.RiceRenderToTexture_Combo.TabIndex = 35; + this.toolTip1.SetToolTip(this.RiceRenderToTexture_Combo, "Render-to-texture emulation.\r\n\r\nDefault: None"); + // + // RiceTextureEnhancementTab + // + this.RiceTextureEnhancementTab.Controls.Add(this.label12); + this.RiceTextureEnhancementTab.Controls.Add(this.RiceForceTextureFilter_Combo); + this.RiceTextureEnhancementTab.Controls.Add(this.label8); + this.RiceTextureEnhancementTab.Controls.Add(this.RiceTextureEnhancementControl_Combo); + this.RiceTextureEnhancementTab.Controls.Add(this.label7); + this.RiceTextureEnhancementTab.Controls.Add(this.RiceTextureEnhancement_Combo); + this.RiceTextureEnhancementTab.Controls.Add(this.RiceTexRectOnly_CB); + this.RiceTextureEnhancementTab.Controls.Add(this.RiceSmallTextureOnly_CB); + this.RiceTextureEnhancementTab.Controls.Add(this.RiceLoadHiResCRCOnly_CB); + this.RiceTextureEnhancementTab.Controls.Add(this.RiceLoadHiResTextures_CB); + this.RiceTextureEnhancementTab.Controls.Add(this.RiceDumpTexturesToFiles_CB); + this.RiceTextureEnhancementTab.Location = new System.Drawing.Point(4, 22); + this.RiceTextureEnhancementTab.Name = "RiceTextureEnhancementTab"; + this.RiceTextureEnhancementTab.Size = new System.Drawing.Size(564, 310); + this.RiceTextureEnhancementTab.TabIndex = 2; + this.RiceTextureEnhancementTab.Text = "Texture Enhancement"; + this.RiceTextureEnhancementTab.UseVisualStyleBackColor = true; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(134, 115); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(115, 13); + this.label12.TabIndex = 33; + this.label12.Text = "Force Texture Filtering:"; + this.toolTip1.SetToolTip(this.label12, "Force to use texture filtering or not.\r\n\r\nDefault: Let N64 choose"); + // + // RiceForceTextureFilter_Combo + // + this.RiceForceTextureFilter_Combo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.RiceForceTextureFilter_Combo.FormattingEnabled = true; + this.RiceForceTextureFilter_Combo.Items.AddRange(new object[] { + "Let N64 choose", + "Force No Filtering", + "Force Filtering"}); + this.RiceForceTextureFilter_Combo.Location = new System.Drawing.Point(287, 112); + this.RiceForceTextureFilter_Combo.Name = "RiceForceTextureFilter_Combo"; + this.RiceForceTextureFilter_Combo.Size = new System.Drawing.Size(120, 21); + this.RiceForceTextureFilter_Combo.TabIndex = 32; + this.toolTip1.SetToolTip(this.RiceForceTextureFilter_Combo, "Force to use texture filtering or not.\r\n\r\nDefault: Let N64 choose"); // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(25, 62); + this.label8.Location = new System.Drawing.Point(134, 169); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(159, 13); - this.label8.TabIndex = 2; - this.label8.Text = "Rendering to Texture Emulation:"; + this.label8.Size = new System.Drawing.Size(151, 13); + this.label8.TabIndex = 31; + this.label8.Text = "Texture Enhancement Control:"; + this.toolTip1.SetToolTip(this.label8, "Secondary texture enhancement filter.\r\n\r\nDefault: Normal"); + // + // RiceTextureEnhancementControl_Combo + // + this.RiceTextureEnhancementControl_Combo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.RiceTextureEnhancementControl_Combo.FormattingEnabled = true; + this.RiceTextureEnhancementControl_Combo.Items.AddRange(new object[] { + "Normal", + "Smooth", + "Less smooth", + "2xSaI smooth", + "Less 2xSaI smooth"}); + this.RiceTextureEnhancementControl_Combo.Location = new System.Drawing.Point(287, 166); + this.RiceTextureEnhancementControl_Combo.Name = "RiceTextureEnhancementControl_Combo"; + this.RiceTextureEnhancementControl_Combo.Size = new System.Drawing.Size(120, 21); + this.RiceTextureEnhancementControl_Combo.TabIndex = 30; + this.toolTip1.SetToolTip(this.RiceTextureEnhancementControl_Combo, "Secondary texture enhancement filter.\r\n\r\nDefault: Normal"); // // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(25, 89); + this.label7.Location = new System.Drawing.Point(134, 142); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(126, 13); - this.label7.TabIndex = 1; - this.label7.Text = "Frame Buffer Write Back:"; + this.label7.Size = new System.Drawing.Size(140, 13); + this.label7.TabIndex = 29; + this.label7.Text = "Texture Enhancement Filter:"; + this.toolTip1.SetToolTip(this.label7, "Primary texture enhancement filter.\r\n\r\nDefault: None\r\n"); // - // label6 + // RiceTextureEnhancement_Combo // - 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:"; + this.RiceTextureEnhancement_Combo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.RiceTextureEnhancement_Combo.FormattingEnabled = true; + this.RiceTextureEnhancement_Combo.Items.AddRange(new object[] { + "None", + "2X", + "2XSAI", + "HQ2X", + "LQ2X", + "HQ4X", + "Sharpen", + "Sharpen More", + "External", + "Mirrored"}); + this.RiceTextureEnhancement_Combo.Location = new System.Drawing.Point(287, 139); + this.RiceTextureEnhancement_Combo.Name = "RiceTextureEnhancement_Combo"; + this.RiceTextureEnhancement_Combo.Size = new System.Drawing.Size(120, 21); + this.RiceTextureEnhancement_Combo.TabIndex = 28; + this.toolTip1.SetToolTip(this.RiceTextureEnhancement_Combo, "Primary texture enhancement filter.\r\n\r\nDefault: None"); // - // checkBox6 + // RiceTexRectOnly_CB // - 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; + this.RiceTexRectOnly_CB.AutoSize = true; + this.RiceTexRectOnly_CB.Location = new System.Drawing.Point(316, 66); + this.RiceTexRectOnly_CB.Name = "RiceTexRectOnly_CB"; + this.RiceTexRectOnly_CB.Size = new System.Drawing.Size(91, 17); + this.RiceTexRectOnly_CB.TabIndex = 27; + this.RiceTexRectOnly_CB.Text = "TexRect Only"; + this.toolTip1.SetToolTip(this.RiceTexRectOnly_CB, "If enabled, texture enhancement will be done only for TxtRect ucode.\r\n\r\nDefault: " + + "Off"); + this.RiceTexRectOnly_CB.UseVisualStyleBackColor = true; // - // checkBox5 + // RiceSmallTextureOnly_CB // - 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; + this.RiceSmallTextureOnly_CB.AutoSize = true; + this.RiceSmallTextureOnly_CB.Location = new System.Drawing.Point(36, 66); + this.RiceSmallTextureOnly_CB.Name = "RiceSmallTextureOnly_CB"; + this.RiceSmallTextureOnly_CB.Size = new System.Drawing.Size(160, 17); + this.RiceSmallTextureOnly_CB.TabIndex = 26; + this.RiceSmallTextureOnly_CB.Text = "Enhance Small Texture Only"; + this.toolTip1.SetToolTip(this.RiceSmallTextureOnly_CB, "If enabled, texture enhancement will be done \r\nonly for textures width+height<=12" + + "8.\r\n\r\nDefault: Off"); + this.RiceSmallTextureOnly_CB.UseVisualStyleBackColor = true; // - // JaboD3D8161tab + // RiceLoadHiResCRCOnly_CB // - 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; + this.RiceLoadHiResCRCOnly_CB.AutoSize = true; + this.RiceLoadHiResCRCOnly_CB.Location = new System.Drawing.Point(316, 43); + this.RiceLoadHiResCRCOnly_CB.Name = "RiceLoadHiResCRCOnly_CB"; + this.RiceLoadHiResCRCOnly_CB.Size = new System.Drawing.Size(201, 17); + this.RiceLoadHiResCRCOnly_CB.TabIndex = 25; + this.RiceLoadHiResCRCOnly_CB.Text = "Use CRC only to load Hi-Res Texture"; + this.toolTip1.SetToolTip(this.RiceLoadHiResCRCOnly_CB, "Select hi-resolution textures based only on the CRC and \r\nignore format+size info" + + "rmation (Glide64 compatibility).\r\n\r\nDefault: On"); + this.RiceLoadHiResCRCOnly_CB.UseVisualStyleBackColor = true; // - // Glide64finaltab + // RiceLoadHiResTextures_CB // - 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; + this.RiceLoadHiResTextures_CB.AutoSize = true; + this.RiceLoadHiResTextures_CB.Location = new System.Drawing.Point(36, 43); + this.RiceLoadHiResTextures_CB.Name = "RiceLoadHiResTextures_CB"; + this.RiceLoadHiResTextures_CB.Size = new System.Drawing.Size(178, 17); + this.RiceLoadHiResTextures_CB.TabIndex = 24; + this.RiceLoadHiResTextures_CB.Text = "Load Hi-Res textures if available"; + this.toolTip1.SetToolTip(this.RiceLoadHiResTextures_CB, "Enable hi-resolution texture file loading.\r\n\r\nDefault: Off"); + this.RiceLoadHiResTextures_CB.UseVisualStyleBackColor = true; + // + // RiceDumpTexturesToFiles_CB + // + this.RiceDumpTexturesToFiles_CB.AutoSize = true; + this.RiceDumpTexturesToFiles_CB.Location = new System.Drawing.Point(273, 248); + this.RiceDumpTexturesToFiles_CB.Name = "RiceDumpTexturesToFiles_CB"; + this.RiceDumpTexturesToFiles_CB.Size = new System.Drawing.Size(134, 17); + this.RiceDumpTexturesToFiles_CB.TabIndex = 23; + this.RiceDumpTexturesToFiles_CB.Text = "Dump Textures to Files"; + this.toolTip1.SetToolTip(this.RiceDumpTexturesToFiles_CB, "Enable texture dumping.\r\n\r\nDefault: Off"); + this.RiceDumpTexturesToFiles_CB.UseVisualStyleBackColor = true; + // + // RiceGameSpecificTab + // + this.RiceGameSpecificTab.Controls.Add(this.label4); + this.RiceGameSpecificTab.Location = new System.Drawing.Point(4, 22); + this.RiceGameSpecificTab.Name = "RiceGameSpecificTab"; + this.RiceGameSpecificTab.Padding = new System.Windows.Forms.Padding(3); + this.RiceGameSpecificTab.Size = new System.Drawing.Size(564, 310); + this.RiceGameSpecificTab.TabIndex = 1; + this.RiceGameSpecificTab.Text = "Game Specific"; + this.RiceGameSpecificTab.UseVisualStyleBackColor = true; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(125, 124); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(104, 13); + this.label4.TabIndex = 0; + this.label4.Text = "Nothing To see here"; // // button1 // @@ -458,43 +962,54 @@ this.button1.TabIndex = 1; this.button1.Text = "Save"; this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); // - // button2 + // CancelBT // - 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); + this.CancelBT.Location = new System.Drawing.Point(461, 373); + this.CancelBT.Name = "CancelBT"; + this.CancelBT.Size = new System.Drawing.Size(75, 23); + this.CancelBT.TabIndex = 2; + this.CancelBT.Text = "Cancel"; + this.CancelBT.UseVisualStyleBackColor = true; + this.CancelBT.Click += new System.EventHandler(this.CancelBT_Click); + // + // toolTip1 + // + this.toolTip1.AutoPopDelay = 10000; + this.toolTip1.InitialDelay = 500; + this.toolTip1.IsBalloon = true; + this.toolTip1.ReshowDelay = 100; + this.toolTip1.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info; // // 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.CancelBT); 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.Load += new System.EventHandler(this.N64VideoPluginconfig_Load); 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.RiceTabPage.ResumeLayout(false); + this.RiceTabControl.ResumeLayout(false); + this.RiceGeneral.ResumeLayout(false); + this.RiceGeneral.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.RiceAnisotropicFiltering_TB)).EndInit(); + this.RiceGameDefaultTab.ResumeLayout(false); + this.RiceGameDefaultTab.PerformLayout(); + this.RiceFrameBuffer_GroupBox.ResumeLayout(false); + this.RiceFrameBuffer_GroupBox.PerformLayout(); + this.RiceTextureEnhancementTab.ResumeLayout(false); + this.RiceTextureEnhancementTab.PerformLayout(); + this.RiceGameSpecificTab.ResumeLayout(false); + this.RiceGameSpecificTab.PerformLayout(); this.ResumeLayout(false); } @@ -504,36 +1019,69 @@ 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; + private System.Windows.Forms.Button CancelBT; + private System.Windows.Forms.TabPage RiceTabPage; + private System.Windows.Forms.ToolTip toolTip1; + private System.Windows.Forms.TabControl RiceTabControl; + private System.Windows.Forms.TabPage RiceGeneral; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.ComboBox RiceScreenUpdateSetting_Combo; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.ComboBox RiceMultiSampling_Combo; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.ComboBox RiceOpenGLRenderSetting_Combo; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.ComboBox RiceColorQuality_Combo; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.ComboBox RiceOpenGLDepthBufferSetting_Combo; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.ComboBox RiceTextureQuality_Combo; + private System.Windows.Forms.CheckBox RiceEnableVertexShader_CB; + private System.Windows.Forms.CheckBox RiceSkipFrame_CB; + private System.Windows.Forms.CheckBox RiceEnableHacks_CB; + private System.Windows.Forms.CheckBox RiceFullTMEMEmulation_CB; + private System.Windows.Forms.CheckBox RiceOpenGLVertexClipper_CB; + private System.Windows.Forms.Label AnisotropicFiltering_LB; + private System.Windows.Forms.TrackBar RiceAnisotropicFiltering_TB; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.ComboBox RiceFogMethod_Combo; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.ComboBox RiceMipmapping_Combo; + private System.Windows.Forms.CheckBox RiceWinFrameMode_CB; + private System.Windows.Forms.CheckBox RiceInN64Resolution_CB; + private System.Windows.Forms.CheckBox RiceFastTextureLoading_CB; + private System.Windows.Forms.CheckBox RiceAccurateTextureMapping_CB; + private System.Windows.Forms.CheckBox RiceSaveVRAM_CB; + private System.Windows.Forms.CheckBox RiceEnableSSE_CB; + private System.Windows.Forms.TabPage RiceGameDefaultTab; + private System.Windows.Forms.CheckBox RiceNormalAlphaBlender_CB; + private System.Windows.Forms.CheckBox RiceDefaultCombinerDisable_CB; + private System.Windows.Forms.GroupBox RiceFrameBuffer_GroupBox; + private System.Windows.Forms.CheckBox RiceDoubleSizeForSmallTxtrBuf_CB; + private System.Windows.Forms.TabPage RiceTextureEnhancementTab; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.ComboBox RiceForceTextureFilter_Combo; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.ComboBox RiceTextureEnhancementControl_Combo; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.ComboBox RiceTextureEnhancement_Combo; + private System.Windows.Forms.CheckBox RiceTexRectOnly_CB; + private System.Windows.Forms.CheckBox RiceSmallTextureOnly_CB; + private System.Windows.Forms.CheckBox RiceLoadHiResCRCOnly_CB; + private System.Windows.Forms.CheckBox RiceLoadHiResTextures_CB; + private System.Windows.Forms.CheckBox RiceDumpTexturesToFiles_CB; + private System.Windows.Forms.TabPage RiceGameSpecificTab; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label16; + private System.Windows.Forms.Label label17; + private System.Windows.Forms.Label label18; + private System.Windows.Forms.ComboBox RiceFrameBufferWriteBackControl_Combo; + private System.Windows.Forms.ComboBox RiceFrameBufferSetting_Combo; + private System.Windows.Forms.ComboBox RiceRenderToTexture_Combo; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs index 32ff58b5fd..ea2bee43ec 100644 --- a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs +++ b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs @@ -16,9 +16,144 @@ namespace BizHawk.MultiClient InitializeComponent(); } - private void button2_Click(object sender, EventArgs e) + private void CancelBT_Click(object sender, EventArgs e) { + //Add confirmation of cancelling change Close(); } + + private void button1_Click(object sender, EventArgs e) + { + SaveSettings(); + Close(); + } + + private void SaveSettings() + { + //Global + string video_settings = VideoResolutionComboBox.SelectedItem.ToString(); + string[] strArr = video_settings.Split('x'); + Global.Config.N64VideoSizeX = Int32.Parse(strArr[0].Trim()); + Global.Config.N64VideoSizeY = Int32.Parse(strArr[1].Trim()); + Global.Config.N64VidPlugin = PluginComboBox.Text; + Global.MainForm.FlagNeedsReboot(); //TODO: this won't always be necessary, keep that in mind + + //Rice + Global.Config.RiceNormalAlphaBlender = RiceNormalAlphaBlender_CB.Checked; + Global.Config.RiceFastTextureLoading = RiceFastTextureLoading_CB.Checked; + Global.Config.RiceAccurateTextureMapping = RiceAccurateTextureMapping_CB.Checked; + Global.Config.RiceInN64Resolution = RiceInN64Resolution_CB.Checked; + Global.Config.RiceSaveVRAM = RiceSaveVRAM_CB.Checked; + Global.Config.RiceDoubleSizeForSmallTxtrBuf = RiceDoubleSizeForSmallTxtrBuf_CB.Checked; + Global.Config.RiceDefaultCombinerDisable = RiceDefaultCombinerDisable_CB.Checked; + Global.Config.RiceEnableHacks = RiceEnableHacks_CB.Checked; + Global.Config.RiceWinFrameMode = RiceWinFrameMode_CB.Checked; + Global.Config.RiceFullTMEMEmulation = RiceFullTMEMEmulation_CB.Checked; + Global.Config.RiceOpenGLVertexClipper = RiceOpenGLVertexClipper_CB.Checked; + Global.Config.RiceEnableSSE = RiceEnableSSE_CB.Checked; + Global.Config.RiceEnableVertexShader = RiceEnableVertexShader_CB.Checked; + Global.Config.RiceSkipFrame = RiceSkipFrame_CB.Checked; + Global.Config.RiceTexRectOnly = RiceTexRectOnly_CB.Checked; + Global.Config.RiceSmallTextureOnly = RiceSmallTextureOnly_CB.Checked; + Global.Config.RiceLoadHiResCRCOnly = RiceLoadHiResCRCOnly_CB.Checked; + Global.Config.RiceLoadHiResTextures = RiceLoadHiResTextures_CB.Checked; + Global.Config.RiceDumpTexturesToFiles = RiceDumpTexturesToFiles_CB.Checked; + + Global.Config.RiceFrameBufferSetting = RiceFrameBufferSetting_Combo.SelectedIndex; + Global.Config.RiceFrameBufferWriteBackControl = RiceFrameBufferWriteBackControl_Combo.SelectedIndex; + Global.Config.RiceRenderToTexture = RiceRenderToTexture_Combo.SelectedIndex; + Global.Config.RiceScreenUpdateSetting = RiceScreenUpdateSetting_Combo.SelectedIndex; + Global.Config.RiceMipmapping = RiceMipmapping_Combo.SelectedIndex; + Global.Config.RiceFogMethod = RiceFogMethod_Combo.SelectedIndex; + Global.Config.RiceForceTextureFilter = RiceForceTextureFilter_Combo.SelectedIndex; + Global.Config.RiceTextureEnhancement = RiceTextureEnhancement_Combo.SelectedIndex; + Global.Config.RiceTextureEnhancementControl = RiceTextureEnhancementControl_Combo.SelectedIndex; + Global.Config.RiceTextureQuality = RiceTextureQuality_Combo.SelectedIndex; + Global.Config.RiceOpenGLDepthBufferSetting = (RiceOpenGLDepthBufferSetting_Combo.SelectedIndex + 1) * 16; + switch (RiceMultiSampling_Combo.SelectedIndex) + { + case 0: Global.Config.RiceMultiSampling = 0; break; + case 1: Global.Config.RiceMultiSampling = 2; break; + case 2: Global.Config.RiceMultiSampling = 4; break; + case 3: Global.Config.RiceMultiSampling = 8; break; + case 4: Global.Config.RiceMultiSampling = 16; break; + default : Global.Config.RiceMultiSampling = 0; break; + } + Global.Config.RiceColorQuality = RiceColorQuality_Combo.SelectedIndex; + Global.Config.RiceOpenGLRenderSetting = RiceOpenGLRenderSetting_Combo.SelectedIndex; + Global.Config.RiceAnisotropicFiltering = RiceAnisotropicFiltering_TB.Value; + + } + + private void N64VideoPluginconfig_Load(object sender, EventArgs e) + { + //Load Variables + //Global + string video_setting = Global.Config.N64VideoSizeX.ToString() + + " x " + + Global.Config.N64VideoSizeY.ToString(); + + int index = VideoResolutionComboBox.Items.IndexOf(video_setting); + if (index >= 0) + { + VideoResolutionComboBox.SelectedIndex = index; + } + PluginComboBox.Text = Global.Config.N64VidPlugin; + + //Rice + Global.MainForm.FlagNeedsReboot(); //TODO: this won't always be necessary, keep that in mind + RiceNormalAlphaBlender_CB.Checked = Global.Config.RiceNormalAlphaBlender; + RiceFastTextureLoading_CB.Checked = Global.Config.RiceFastTextureLoading; + RiceAccurateTextureMapping_CB.Checked = Global.Config.RiceAccurateTextureMapping; + RiceInN64Resolution_CB.Checked = Global.Config.RiceInN64Resolution; + RiceSaveVRAM_CB.Checked = Global.Config.RiceSaveVRAM; + RiceDoubleSizeForSmallTxtrBuf_CB.Checked = Global.Config.RiceDoubleSizeForSmallTxtrBuf; + RiceDefaultCombinerDisable_CB.Checked = Global.Config.RiceDefaultCombinerDisable; + RiceEnableHacks_CB.Checked = Global.Config.RiceEnableHacks; + RiceWinFrameMode_CB.Checked = Global.Config.RiceWinFrameMode; + RiceFullTMEMEmulation_CB.Checked = Global.Config.RiceFullTMEMEmulation; + RiceOpenGLVertexClipper_CB.Checked = Global.Config.RiceOpenGLVertexClipper; + RiceEnableSSE_CB.Checked = Global.Config.RiceEnableSSE; + RiceEnableVertexShader_CB.Checked = Global.Config.RiceEnableVertexShader; + RiceSkipFrame_CB.Checked = Global.Config.RiceSkipFrame; + RiceTexRectOnly_CB.Checked = Global.Config.RiceTexRectOnly; + RiceSmallTextureOnly_CB.Checked = Global.Config.RiceSmallTextureOnly; + RiceLoadHiResCRCOnly_CB.Checked = Global.Config.RiceLoadHiResCRCOnly; + RiceLoadHiResTextures_CB.Checked = Global.Config.RiceLoadHiResTextures; + RiceDumpTexturesToFiles_CB.Checked = Global.Config.RiceDumpTexturesToFiles; + + RiceFrameBufferSetting_Combo.SelectedIndex = Global.Config.RiceFrameBufferSetting; + RiceFrameBufferWriteBackControl_Combo.SelectedIndex = Global.Config.RiceFrameBufferWriteBackControl; + RiceRenderToTexture_Combo.SelectedIndex = Global.Config.RiceRenderToTexture; + RiceScreenUpdateSetting_Combo.SelectedIndex = Global.Config.RiceScreenUpdateSetting; + RiceMipmapping_Combo.SelectedIndex = Global.Config.RiceMipmapping; + RiceFogMethod_Combo.SelectedIndex = Global.Config.RiceFogMethod; + RiceForceTextureFilter_Combo.SelectedIndex = Global.Config.RiceForceTextureFilter; + RiceTextureEnhancement_Combo.SelectedIndex = Global.Config.RiceTextureEnhancement; + RiceTextureEnhancementControl_Combo.SelectedIndex = Global.Config.RiceTextureEnhancementControl; + RiceTextureQuality_Combo.SelectedIndex = Global.Config.RiceTextureQuality; + RiceOpenGLDepthBufferSetting_Combo.SelectedIndex = (Global.Config.RiceOpenGLDepthBufferSetting /16) -1; + switch (Global.Config.RiceMultiSampling) + { + case 0: RiceMultiSampling_Combo.SelectedIndex = 0; break; + case 2: RiceMultiSampling_Combo.SelectedIndex = 1; break; + case 4: RiceMultiSampling_Combo.SelectedIndex = 2; break; + case 8: RiceMultiSampling_Combo.SelectedIndex = 3; break; + case 16: RiceMultiSampling_Combo.SelectedIndex = 4; break; + default: RiceMultiSampling_Combo.SelectedIndex = 0; break; + } + RiceColorQuality_Combo.SelectedIndex = Global.Config.RiceColorQuality; + RiceOpenGLRenderSetting_Combo.SelectedIndex = Global.Config.RiceOpenGLRenderSetting; + RiceAnisotropicFiltering_TB.Value = Global.Config.RiceAnisotropicFiltering; + AnisotropicFiltering_LB.Text = "Anisotropic Filtering: " + RiceAnisotropicFiltering_TB.Value.ToString(); + + } + + private void RiceAnisotropicFiltering_TB_Scroll_1(object sender, EventArgs e) + { + AnisotropicFiltering_LB.Text = "Anisotropic Filtering: " + RiceAnisotropicFiltering_TB.Value.ToString(); + } + + } } diff --git a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.resx b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.resx index 29dcb1b3a3..cbb95d6009 100644 --- a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.resx +++ b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.resx @@ -117,4 +117,20 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + Enable/Disable Anisotropic Filtering for Mipmapping (0=no filtering, 2-16=quality). +This is uneffective if Mipmapping is 0. +If the given value is to high to be supported by your graphic card, the value will be + the highest value your graphic card can support. Better result with Trilinear filtering + + + + Enable/Disable Anisotropic Filtering for Mipmapping (0=no filtering, 2-16=quality). +This is uneffective if Mipmapping is 0. +If the given value is to high to be supported by your graphic card, the value will be + the highest value your graphic card can support. Better result with Trilinear filtering + \ No newline at end of file