ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added scanline display filter options

This commit is contained in:
pasky1382 2013-12-03 05:02:29 +00:00
parent b80f5a07ea
commit c8d9757d37
6 changed files with 3022 additions and 2716 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -411,6 +411,12 @@
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ScanlineSlider.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ScanlineSlider.Designer.cs">
<DependentUpon>ScanlineSlider.cs</DependentUpon>
</Compile>
<Compile Include="Throttle.cs" />
<Compile Include="tools\Cheats\CheatEdit.cs">
<SubType>UserControl</SubType>
@ -840,6 +846,9 @@
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="ScanlineSlider.resx">
<DependentUpon>ScanlineSlider.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\Cheats\CheatEdit.resx">
<DependentUpon>CheatEdit.cs</DependentUpon>
</EmbeddedResource>

5469
BizHawk.Client.EmuHawk/MainForm.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

7
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -582,7 +582,7 @@ namespace BizHawk.Client.EmuHawk
x2SAIMenuItem.Checked = Global.Config.TargetDisplayFilter == 1;
SuperX2SAIMenuItem.Checked = Global.Config.TargetDisplayFilter == 2;
SuperEagleMenuItem.Checked = Global.Config.TargetDisplayFilter == 3;
scanlines2xToolStripMenuItem.Checked = Global.Config.TargetDisplayFilter == 4;
scanlines2xToolStripMenuItem.Checked = Global.Config.TargetDisplayFilter == 4;
}
private void DisplayFilterMenuItem_Click(object sender, EventArgs e)
@ -591,7 +591,10 @@ namespace BizHawk.Client.EmuHawk
if (sender == x2SAIMenuItem) Global.Config.TargetDisplayFilter = 1;
if (sender == SuperX2SAIMenuItem) Global.Config.TargetDisplayFilter = 2;
if (sender == SuperEagleMenuItem) Global.Config.TargetDisplayFilter = 3;
if (sender == scanlines2xToolStripMenuItem) Global.Config.TargetDisplayFilter = 4;
if (sender == Scanlines25MenuItem) { Global.Config.TargetDisplayFilter = 4; Global.Config.TargetScanlineFilterIntensity = 192; }
if (sender == Scanlines50MenuItem) { Global.Config.TargetDisplayFilter = 4; Global.Config.TargetScanlineFilterIntensity = 128; }
if (sender == Scanlines75MenuItem) { Global.Config.TargetDisplayFilter = 4; Global.Config.TargetScanlineFilterIntensity = 64; }
if (sender == ScanlinesCustomMenuItem) { Global.Config.TargetDisplayFilter = 4; new ScanlineSlider().Show(); }
}
private void WindowSizeSubMenu_DropDownOpened(object sender, EventArgs e)

94
BizHawk.Client.EmuHawk/ScanlineSlider.Designer.cs generated Normal file
View File

@ -0,0 +1,94 @@
namespace BizHawk.Client.EmuHawk
{
partial class ScanlineSlider
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.scanlinetrackbar = new System.Windows.Forms.TrackBar();
this.label1 = new System.Windows.Forms.Label();
this.button1 = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.scanlinetrackbar)).BeginInit();
this.SuspendLayout();
//
// scanlinetrackbar
//
this.scanlinetrackbar.Location = new System.Drawing.Point(23, 14);
this.scanlinetrackbar.Maximum = 100;
this.scanlinetrackbar.Name = "scanlinetrackbar";
this.scanlinetrackbar.Size = new System.Drawing.Size(207, 45);
this.scanlinetrackbar.TabIndex = 0;
this.scanlinetrackbar.TickFrequency = 5;
this.scanlinetrackbar.TickStyle = System.Windows.Forms.TickStyle.Both;
this.scanlinetrackbar.Scroll += new System.EventHandler(this.scanlinetrackbar_Scroll);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(31, 68);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(21, 13);
this.label1.TabIndex = 1;
this.label1.Text = "0%";
//
// button1
//
this.button1.Location = new System.Drawing.Point(89, 63);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 23);
this.button1.TabIndex = 2;
this.button1.Text = "Close";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// ScanlineSlider
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(253, 91);
this.Controls.Add(this.button1);
this.Controls.Add(this.label1);
this.Controls.Add(this.scanlinetrackbar);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "ScanlineSlider";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Scanline Intensity";
this.Load += new System.EventHandler(this.ScanlineSlider_Load);
((System.ComponentModel.ISupportInitialize)(this.scanlinetrackbar)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.TrackBar scanlinetrackbar;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button button1;
}
}

39
BizHawk.Client.EmuHawk/ScanlineSlider.cs Normal file
View File

@ -0,0 +1,39 @@
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;
using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk
{
public partial class ScanlineSlider : Form
{
public ScanlineSlider()
{
InitializeComponent();
}
private void scanlinetrackbar_Scroll(object sender, EventArgs e)
{
label1.Text = scanlinetrackbar.Value.ToString() + "%";
Global.Config.TargetScanlineFilterIntensity = 256 - (256 * scanlinetrackbar.Value / 100);
}
private void button1_Click(object sender, EventArgs e)
{
this.Close();
}
private void ScanlineSlider_Load(object sender, EventArgs e)
{
float intensity = (256 - (float)Global.Config.TargetScanlineFilterIntensity) / 256 * 100;
scanlinetrackbar.Value = (int)intensity;
label1.Text = scanlinetrackbar.Value.ToString() + "%";
}
}
}

120
BizHawk.Client.EmuHawk/ScanlineSlider.resx Normal file
View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>