Windows: New and improved icon editor

Author: ShendoXT

MemcardRex.Core/Support/BmpBuilder.cs

@@ -73,7 +73,7 @@ public byte[] BuildBmp(byte[] RawImageData)
         /// <returns></returns>
 		public byte[] BuildBmp(Color[] RawImageData)
         {
-            byte[] argbBmpHeader = new byte[] // All values are little-endian
+            byte[] ArgbBmpHeader = new byte[] // All values are little-endian
             {
                 0x42, 0x4D,             // Signature 'BM'
                 0x8a, 0x40, 0x00, 0x00, // Size: 1162 bytes
@@ -114,40 +114,35 @@ public byte[] BuildBmp(Color[] RawImageData)
                 0x00, 0x00, 0x00, 0x00, // Unknown
             };
 
-            byte[] bmpImage = new byte[1162];
+            const int totalSize = 1162;
+            const int width = 16;
+            const int dataOffset = 138;
 
-            //Copy BMP header to bmp data array
-            Array.Copy(argbBmpHeader, bmpImage, argbBmpHeader.Length);
+            byte[] bmpImage = new byte[totalSize];
 
-            Color[] FlippedRawImageData = new Color[RawImageData.Length];
+            // Copy BMP header
+            Buffer.BlockCopy(ArgbBmpHeader, 0, bmpImage, 0, ArgbBmpHeader.Length);
 
-            //Y flip color data for compatibility with BMP
-            for (int y = 0; y < 8; y++)
+            // Flip Y-axis directly when writing data
+            for (int y = 0; y < width; y++)
             {
-                for (int x = 0; x < 16; x++)
-                {
-                    // Convert 2D (y, x) to 1D index
-                    int indexTop = y * 16 + x;           // Current position
-                    int indexBottom = (15 - y) * 16 + x; // Mirrored position
+                int srcRowStart = y * width;
+                int destRowStart = dataOffset + (width - 1 - y) * width * 4;
 
-                    // Swap the colors
-                    FlippedRawImageData[indexTop] = RawImageData[indexBottom];
-                    FlippedRawImageData[indexBottom] = RawImageData[indexTop];
+                for (int x = 0; x < width; x++)
+                {
+                    Color pixel = RawImageData[srcRowStart + x];
+                    int destIndex = destRowStart + x * 4;
+
+                    // Write BGRA format directly (little-endian for BMP)
+                    bmpImage[destIndex] = pixel.B;
+                    bmpImage[destIndex + 1] = pixel.G;
+                    bmpImage[destIndex + 2] = pixel.R;
+                    bmpImage[destIndex + 3] = pixel.A;
                 }
             }
 
-            int index = 255;
-            for (int i = 0; i < 256 * 4; i += 4)
-            {
-                bmpImage[bmpImage.Length - i - 1] = FlippedRawImageData[index].A;
-                bmpImage[bmpImage.Length - i - 2] = FlippedRawImageData[index].R;
-                bmpImage[bmpImage.Length - i - 3] = FlippedRawImageData[index].G;
-                bmpImage[bmpImage.Length - i - 4] = FlippedRawImageData[index].B;
-                index--;
-            }
-
             return bmpImage;
-
         }
     }
 }

MemcardRex.Core/Support/ProgramSettings.cs

@@ -13,11 +13,15 @@ public class ProgramSettings
         public string CommunicationPort = "COM1";          //Communication port for Hardware interfaces
         public int LastSaveFormat = 0;                     //Last used format to save memory card
         public int LastExportFormat = 0;                   //Last used format to export save
-        public string RemoteCommAddress = "192.168.4.1";   // Address / hostname of the remote serial bridge host
-        public int RemoteCommPort = 23;                    // Port to open a socket for the remote serial bridge
+        public string RemoteCommAddress = "192.168.4.1";   //Address / hostname of the remote serial bridge host
+        public int RemoteCommPort = 23;                    //Port to open a socket for the remote serial bridge
         public int CardSlot = 0;                           //Active card slot for reading data from PS1CardLink or Unirom
         public int ActiveInterface = 0;                    //Currently active hardware interface
         public int WarningMessages = 1;                    //Show warning messages for dangerous tasks
+        public int WindowPositionX = 0;                    //Saved window X coordinate
+        public int WindowPositionY = 0;                    //Saved window Y coordinate
+        public int GridColorValue = 128;                   //Saved grid value for icon editor
+        public int IconGridEnabled = 1;                    //Show grid in icon editor
 
         private const string settingsFilename = "Settings.xml";
 
@@ -55,6 +59,10 @@ public void LoadSettings(string directory)
 
             RestoreWindowPosition = xmlAppSettings.readXmlEntryInt("RestoreWindowPosition", 0, 1);
 
+            WindowPositionX = xmlAppSettings.readXmlEntryInt("WindowPositionX", -65535, 65535);
+
+            WindowPositionY = xmlAppSettings.readXmlEntryInt("WindowPositionY", -65535, 65535);
+
             FormatType = xmlAppSettings.readXmlEntryInt("HardwareFormatType", 0, 1);
 
             FixCorruptedCards = xmlAppSettings.readXmlEntryInt("FixCorruptedCards", 0, 1);
@@ -68,6 +76,10 @@ public void LoadSettings(string directory)
             ActiveInterface = xmlAppSettings.readXmlEntryInt("ActiveInterface", 0, 10);
 
             WarningMessages = xmlAppSettings.readXmlEntryInt("WarningMessages", 0, 1);
+
+            GridColorValue = xmlAppSettings.readXmlEntryInt("GridColorValue", 0, 255);
+
+            IconGridEnabled = xmlAppSettings.readXmlEntryInt("IconGridEnabled", 0, 1);
         }
 
         /// <summary>
@@ -96,6 +108,10 @@ public void SaveSettings(string directory, string appName, string appVersion)
 
             xmlAppSettings.writeXmlEntry("RestoreWindowPosition", RestoreWindowPosition.ToString());
 
+            xmlAppSettings.writeXmlEntry("WindowPositionX", WindowPositionX.ToString());
+
+            xmlAppSettings.writeXmlEntry("WindowPositionY", WindowPositionY.ToString());
+
             xmlAppSettings.writeXmlEntry("HardwareFormatType", FormatType.ToString());
 
             xmlAppSettings.writeXmlEntry("FixCorruptedCards", FixCorruptedCards.ToString());
@@ -110,6 +126,10 @@ public void SaveSettings(string directory, string appName, string appVersion)
 
             xmlAppSettings.writeXmlEntry("WarningMessages", WarningMessages.ToString());
 
+            xmlAppSettings.writeXmlEntry("GridColorValue", GridColorValue.ToString());
+
+            xmlAppSettings.writeXmlEntry("IconGridEnabled", IconGridEnabled.ToString());
+
             xmlAppSettings.closeXmlWriter();
         }
     }