add flip x/y tool, add palette loader, add secondary color, add main-secondary color swap key (x)

Author: unitycoder

PixelArtTool/MainWindow.xaml

@@ -82,8 +82,8 @@
 				<Label x:Name="lblToolInfo" Content="-"/>
 			</StatusBarItem>
 		</StatusBar>
-		<Border BorderBrush="Black" BorderThickness="1" HorizontalAlignment="Left" Height="128" Margin="10,50,0,0" VerticalAlignment="Top" Width="64">
-			<Image x:Name="imgPalette" HorizontalAlignment="Left" Height="128" Margin="0,0,0,-30" VerticalAlignment="Top" Width="64" Stretch="Fill"/>
+		<Border BorderBrush="Black" BorderThickness="1" HorizontalAlignment="Left" Height="198" Margin="10,50,0,0" VerticalAlignment="Top" Width="64">
+			<Image x:Name="imgPalette" HorizontalAlignment="Left" Height="198" Margin="0,0,0,-30" VerticalAlignment="Top" Width="64" Stretch="Fill"/>
 		</Border>
 		<Grid>
 			<Border BorderBrush="Black" BorderThickness="1" HorizontalAlignment="Left" Height="256" Margin="89,50,0,0" VerticalAlignment="Top" Width="256">
@@ -99,9 +99,13 @@
 			<Button x:Name="btnScrollDown" Click="OnScrollButtonDownClicked" Content="\/" HorizontalAlignment="Left" Margin="388,274,0,0" VerticalAlignment="Top" Width="24"/>
 			<Button x:Name="btnScrollLeft" Click="OnScrollButtonLeftClicked" Content="&lt;" HorizontalAlignment="Left" Margin="361,263,0,0" VerticalAlignment="Top" Width="24"/>
 			<Button x:Name="btnScrollRight" Click="OnScrollButtonRightClicked" Content="&gt;" HorizontalAlignment="Left" Margin="415,262,0,0" VerticalAlignment="Top" Width="24"/>
+			<Button x:Name="btnFlipX" Click="OnFlipXButtonDown" Content="FlipX" HorizontalAlignment="Left" Margin="462,251,0,0" VerticalAlignment="Top" Width="32"/>
+			<Button x:Name="btnFlipY" Click="OnFlipYButtonDown" Content="FlipY" HorizontalAlignment="Left" Margin="462,276,0,0" VerticalAlignment="Top" Width="32"/>
+			<Button x:Name="btnLoadPalette" Click="OnLoadPaletteButton" Content="Load Palette" HorizontalAlignment="Left" Margin="620,276,0,0" VerticalAlignment="Top" Width="77"/>
 		</Grid>
 		<CheckBox x:Name="chkOutline" Content="Outline" HorizontalAlignment="Left" Margin="648,50,0,0" VerticalAlignment="Top" Width="64"/>
-		<Rectangle x:Name="rectCurrentColor" Fill="#FFF4F4F5" HorizontalAlignment="Left" Height="24" Margin="10,181,0,0" Stroke="Black" VerticalAlignment="Top" Width="24"/>
+		<Rectangle x:Name="rectCurrentColor" Fill="#FFF4F4F5" HorizontalAlignment="Left" Height="28" Margin="10,276,0,0" Stroke="Black" VerticalAlignment="Top" Width="28"/>
 		<CheckBox x:Name="chkMirrorX" Content="MirrorX" HorizontalAlignment="Left" Margin="648,80,0,0" VerticalAlignment="Top" Width="64"/>
+		<Rectangle x:Name="rectSecondaryColor" Fill="Black" HorizontalAlignment="Left" Height="28" Margin="47,276,0,0" Stroke="Black" VerticalAlignment="Top" Width="28"/>
 	</Grid>
 </Window>

PixelArtTool/MainWindow.xaml.cs

@@ -2,15 +2,13 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Globalization;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Input;
-using System.Windows.Markup;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
@@ -76,17 +74,16 @@ public partial class MainWindow : Window, INotifyPropertyChanged
         // modes
         BlendMode blendMode;
 
-        // TEST property binding
-        private ToolMode myVar = ToolMode.Fill;
+        private ToolMode _currentTool = ToolMode.Draw;
         public ToolMode CurrentTool
         {
             get
             {
-                return myVar;
+                return _currentTool;
             }
             set
             {
-                myVar = value;
+                _currentTool = value;
                 OnPropertyChanged();
             }
         }
@@ -157,16 +154,16 @@ void Start()
             //paletteImage.MouseRightButtonDown += new MouseButtonEventHandler(PaletteRightButtonDown);
 
             // init
-            LoadPalette();
+            LoadPalette("pack://application:,,,/Resources/Palettes/aap-64-1x.png");
             currentColorIndex = 5;
             currentColor = palette[currentColorIndex];
             UpdateCurrentColor();
         }
 
 
-        void LoadPalette()
+        void LoadPalette(string path)
         {
-            Uri uri = new Uri("pack://application:,,,/Resources/Palettes/aap-64-1x.png");
+            Uri uri = new Uri(path);
             var img = new BitmapImage(uri);
 
             // get colors
@@ -699,6 +696,20 @@ void OnKeyDown(object sender, KeyEventArgs e)
             // TODO: add tool shortcut keys
             switch (e.Key)
             {
+                case Key.X: // swap current/secondary colors
+                    var tempcolor = rectCurrentColor.Fill;
+                    rectCurrentColor.Fill = rectSecondaryColor.Fill;
+                    rectSecondaryColor.Fill = tempcolor;
+                    // TODO move to converter
+                    var c = new PixelColor();
+                    var t = ((SolidColorBrush)rectCurrentColor.Fill).Color;
+                    c.Red = t.R;
+                    c.Green = t.G;
+                    c.Blue = t.B;
+                    c.Alpha = t.A;
+                    currentColor = c;
+
+                    break;
                 case Key.B: // brush
                     CurrentTool = ToolMode.Draw;
                     break;
@@ -942,6 +953,41 @@ private void OnPropertyChanged([CallerMemberName] string propertyName = null)
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
+        void BitmapFlip(bool horizontal)
+        {
+            // clone canvas, FIXME not really needed..could just copy pixels to array or backbuffer directly
+            var tempCanvasBitmap = new WriteableBitmap(canvasResolutionX, canvasResolutionY, dpiX, dpiY, PixelFormats.Bgra32, null);
+            tempCanvasBitmap = canvasBitmap.Clone();
+            for (int x = 0; x < canvasResolutionX; x++)
+            {
+                for (int y = 0; y < canvasResolutionY; y++)
+                {
+                    int xx = horizontal ? (canvasResolutionX - x - 1) : x;
+                    int yy = !horizontal ? (canvasResolutionY - y - 1) : y;
+                    var c = GetPixelColor(xx, yy, tempCanvasBitmap);
+                    SetPixel(canvasBitmap, x, y, (int)c.ColorBGRA);
+                }
+            }
+        }
+
+        private void OnFlipXButtonDown(object sender, RoutedEventArgs e)
+        {
+            BitmapFlip(horizontal: true);
+        }
+
+        private void OnFlipYButtonDown(object sender, RoutedEventArgs e)
+        {
+            BitmapFlip(horizontal: false);
+        }
+
+        private void OnLoadPaletteButton(object sender, RoutedEventArgs e)
+        {
+            OpenFileDialog openFileDialog = new OpenFileDialog();
+            if (openFileDialog.ShowDialog() == true)
+            {
+                LoadPalette(openFileDialog.FileName);
+            }
+        }
     } // class
 
     // https://stackoverflow.com/a/2908885/5452781