From e44b18dd7962d9ff261b93cdf9d41a4a017d9a93 Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Sun, 13 Mar 2011 01:43:49 +0000
Subject: [PATCH] NES PPU - clicking the pattern view toggles through the 8
 palette choices

---
 .../BizHawk.MultiClient.csproj                |   4 +
 BizHawk.MultiClient/NEStools/NESPPU.cs        |   4 +-
 BizHawk.MultiClient/NEStools/PatternViewer.cs |  19 +++
 .../NEStools/PatternViewer.resx               | 123 ++++++++++++++++++
 4 files changed, 148 insertions(+), 2 deletions(-)
 create mode 100644 BizHawk.MultiClient/NEStools/PatternViewer.resx

diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index 182ffc95b6..d8969c961b 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -292,6 +292,10 @@
       <DependentUpon>NESPPU.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="NEStools\PatternViewer.resx">
+      <DependentUpon>PatternViewer.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="PlayMovie.resx">
       <DependentUpon>PlayMovie.cs</DependentUpon>
       <SubType>Designer</SubType>
diff --git a/BizHawk.MultiClient/NEStools/NESPPU.cs b/BizHawk.MultiClient/NEStools/NESPPU.cs
index 0010e24082..c0363764b9 100644
--- a/BizHawk.MultiClient/NEStools/NESPPU.cs
+++ b/BizHawk.MultiClient/NEStools/NESPPU.cs
@@ -99,8 +99,8 @@ namespace BizHawk.MultiClient
 							byte value = (byte)(b0 + (b1 * 2));
 							byte value2 = (byte)(b2 + (b3 * 2));
 
-							value += Nes.ppu.PALRAM[value + (0 * 4)];     //TODO: 0 = user selection 0-7
-							value2 += Nes.ppu.PALRAM[value2 + (0 * 4)];    //TODO: 0 = user selection 0-7
+							value += Nes.ppu.PALRAM[value + (PatternView.Pal0 * 4)];     //TODO: 0 = user selection 0-7
+							value2 += Nes.ppu.PALRAM[value2 + (PatternView.Pal1 * 4)];    //TODO: 0 = user selection 0-7
 
 							int cvalue = Nes.ConvertColor(value);
 							int cvalue2 = Nes.ConvertColor(value2);
diff --git a/BizHawk.MultiClient/NEStools/PatternViewer.cs b/BizHawk.MultiClient/NEStools/PatternViewer.cs
index 32e2c5951a..ae3bd230de 100644
--- a/BizHawk.MultiClient/NEStools/PatternViewer.cs
+++ b/BizHawk.MultiClient/NEStools/PatternViewer.cs
@@ -12,6 +12,8 @@ namespace BizHawk.MultiClient
     {
         Size pSize;
         public Bitmap pattern;
+        public int Pal0 = 0; //0-7 Palette choice
+        public int Pal1 = 0;
 
         public PatternViewer()
         {
@@ -25,6 +27,8 @@ namespace BizHawk.MultiClient
             this.Paint += new System.Windows.Forms.PaintEventHandler(this.PatternViewer_Paint);
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.PatternViewer_KeyDown);
 
+            this.MouseClick += new System.Windows.Forms.MouseEventHandler(this.PatternViewer_Click);
+
             for (int x = 0; x < pattern.Size.Width; x++)
             {
                 for (int y = 0; y < pattern.Size.Height; y++)
@@ -48,5 +52,20 @@ namespace BizHawk.MultiClient
         {
             Display(e.Graphics);
         }
+
+        private void PatternViewer_Click(object sender, MouseEventArgs e)
+        {
+            if (e.X < (this.Size.Width / 2))
+            {
+                Pal0++;
+                if (Pal0 > 7) Pal0 = 0;
+            }
+            else
+            {
+                Pal1++;
+                if (Pal1 > 7) Pal1 = 0;
+            }
+            this.Refresh();
+        }
     }
 }
diff --git a/BizHawk.MultiClient/NEStools/PatternViewer.resx b/BizHawk.MultiClient/NEStools/PatternViewer.resx
new file mode 100644
index 0000000000..3276f5c015
--- /dev/null
+++ b/BizHawk.MultiClient/NEStools/PatternViewer.resx
@@ -0,0 +1,123 @@
+<?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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+</root>
\ No newline at end of file