Merge pull request #16 from EttienneS/feature/better-border

Feature/better border

AnimatedTokenMaker/AnimatedTokenMaker.csproj

@@ -26,8 +26,8 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>2</ApplicationRevision>
-    <ApplicationVersion>0.1.0.%2a</ApplicationVersion>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>0.2.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -181,24 +181,24 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Borders\Circle2.png">
+    <None Include="Assets\Borders\RoundedSquare_mask.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Borders\Circle3.png">
+    </None>
+    <None Include="Assets\Borders\Circle_mask.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Borders\Circle4.png">
+    </None>
+    <None Include="Assets\Borders\RoundedSquare.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Borders\CircleClear.png">
+    </None>
+    <None Include="Assets\Borders\Circle.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Borders\RoundedSquare.png">
+    </None>
+    <None Include="Assets\Borders\Sci.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Borders\Circle1.png">
+    </None>
+    <None Include="Assets\Borders\Sci_mask.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    </None>
     <Resource Include="Resources\alpha.png" />
     <Resource Include="icon.ico" />
   </ItemGroup>
@@ -214,5 +214,36 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Assets\Gradients\Dusk.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Assets\Gradients\Fog.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Assets\Gradients\Forest.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Assets\Gradients\Mango.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Assets\Gradients\T&amp;C.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Assets\Gradients\Ice.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Assets\Gradients\Pride.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Assets\Gradients\Sleek.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Assets\Gradients\Vein.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

AnimatedTokenMaker/Border/BorderImage.cs

@@ -1,10 +1,12 @@
 using System.Drawing;
+using System.IO;
 
 namespace AnimatedTokenMaker.Border
 {
     public class BorderImage : IBorderImage
     {
         private readonly Bitmap _border;
+        private readonly Bitmap _mask;
 
         private Color _color;
 
@@ -13,6 +15,16 @@ public class BorderImage : IBorderImage
         public BorderImage(string borderImageFile)
         {
             _border = (Bitmap)Image.FromFile(borderImageFile);
+
+            var mask = GetMaskName(borderImageFile);
+            if (File.Exists(mask))
+            {
+                _mask = (Bitmap)Image.FromFile(mask);
+            }
+            else
+            {
+                throw new FileNotFoundException($"Mask not found: {mask}");
+            }
         }
 
         public Size GetBorderSize()
@@ -29,13 +41,27 @@ public Bitmap GetColoredBorderImage()
             return new Bitmap(_coloredBorder);
         }
 
+        public Bitmap GetMask()
+        {
+            return _mask;
+        }
+
         public void SetBorderColor(Color color)
         {
             _color = color;
 
             UpdateColoredBorder();
         }
 
+        private static string GetMaskName(string borderImageFile)
+        {
+            var dir = borderImageFile.Replace(Path.GetFileName(borderImageFile), string.Empty);
+
+            var file = Path.GetFileNameWithoutExtension(borderImageFile) + "_mask" + Path.GetExtension(borderImageFile);
+
+            return Path.Combine(dir, file);
+        }
+
         private void UpdateColoredBorder()
         {
             var borderSize = GetBorderSize();

AnimatedTokenMaker/Border/IBorderImage.cs

@@ -9,5 +9,6 @@ public interface IBorderImage
         Bitmap GetColoredBorderImage();
 
         void SetBorderColor(Color color);
+        Bitmap GetMask();
     }
 }

AnimatedTokenMaker/ColorExtensions.cs

@@ -39,5 +39,14 @@ public static Color Add(this Color color, Color other)
                                   Math.Min(MAX, color.G + other.G),
                                   Math.Min(MAX, color.B + other.B));
         }
+
+        public static Color Blend(this Color color, Color backColor, double amount)
+        {
+            byte r = (byte)((color.R * amount) + backColor.R * (1 - amount));
+            byte g = (byte)((color.G * amount) + backColor.G * (1 - amount));
+            byte b = (byte)((color.B * amount) + backColor.B * (1 - amount));
+            return Color.FromArgb(r, g, b);
+        }
+
     }
 }

AnimatedTokenMaker/MainWindow.xaml

@@ -15,7 +15,10 @@
                 <StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <Label Content="Border: " Margin="5" />
-                        <ComboBox Loaded="BorderSelector_Loaded" SelectionChanged="BorderSelector_SelectionChanged" HorizontalAlignment="Left"  VerticalAlignment="Top" Width="400" Margin="10" />
+                        <ComboBox Name="BorderSelectorBox" 
+                                  SelectionChanged="BorderSelector_SelectionChanged" 
+                                  HorizontalAlignment="Left" VerticalAlignment="Top" Width="284" Margin="10" />
+                        <Label Content="Border Color:" Margin="5"/>
                         <ColorPickerWPF:ColorPickRow HorizontalAlignment="Left" Margin="5" VerticalAlignment="Top" Options="LoadCustomPalette" OnPick="ColorPicker_Picked" />
                     </StackPanel>
                 </StackPanel>
@@ -27,7 +30,10 @@
                         <StackPanel>
                             <Label Content="Layers:" />
                             <ListView Name="LayerList"  Height="475" Margin="5" />
-                            <Button Content="Add Layer" Click="AddStaticLayer_Click" Margin="15" />
+                            <StackPanel Orientation="Horizontal">
+                                <Button Content="Add Layer" Click="AddStaticLayer_Click" Margin="10" Width="375" />
+                                <Button Content="Add Gradient" Click="AddGradient_Click" Margin="10" Width="100" />
+                            </StackPanel>
                         </StackPanel>
                     </Border>
                     <StackPanel Margin="5" Width="300" Height="400">

AnimatedTokenMaker/MainWindow.xaml.cs

@@ -43,23 +43,9 @@ public MainWindow()
             _tokenMaker = new TokenMaker(new VideoExporter(ServiceManager.Instance.FFmpegService, GetDefaultSetting()));
             _tokenMaker.OnExportLayerCompleted += OnExportLayerCompleted;
 
-            SetBorder(GetBorders()[0]);
-
             InitializeComponent();
-        }
 
-        private static SourceSetting GetDefaultSetting()
-        {
-            return new SourceSetting(0, Properties.Settings.Default.Framerate, Properties.Settings.Default.MaxTime);
-        }
-
-        private void OnExportLayerCompleted(int layer, int total)
-        {
-            Dispatcher.BeginInvoke((Action)(() =>
-            {
-                ExportProgress.Maximum = total;
-                ExportProgress.Value = layer;
-            }));
+            InitMaskAndBorder();
         }
 
         public event PropertyChangedEventHandler PropertyChanged;
@@ -75,15 +61,9 @@ public void Changed(string property)
 
         public string[] GetBorders()
         {
-            return Directory.EnumerateFiles("Borders").ToArray();
-        }
-
-        public void SetBorder(string border)
-        {
-            _border = border;
-            _tokenMaker.LoadBorder(new BorderImage(_border));
-
-            UpdatePreview();
+            return Directory.EnumerateFiles("Assets\\Borders", "*.png", SearchOption.TopDirectoryOnly)
+                            .Where(f => !f.Contains("_mask"))
+                            .ToArray();
         }
 
         public void StartPreviewUpdate(int frame)
@@ -92,6 +72,14 @@ public void StartPreviewUpdate(int frame)
             {
                 return;
             }
+            try
+            {
+                _tokenMaker.LoadBorder(new BorderImage(_border));
+            }
+            catch (FileNotFoundException ex)
+            {
+                MessageBox.Show(ex.Message, "Border mask not found", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
 
             _previewTask = Task.Run(() =>
             {
@@ -105,18 +93,40 @@ public void StartPreviewUpdate(int frame)
             });
         }
 
-        private static string[] ShowFileDialog()
+        private static SourceSetting GetDefaultSetting()
+        {
+            return new SourceSetting(0, Properties.Settings.Default.Framerate, Properties.Settings.Default.MaxTime);
+        }
+
+        private static string[] ShowFileDialog(string path = "")
         {
-            var ofd = new OpenFileDialog();
-            ofd.Multiselect = true;
+            var ofd = new OpenFileDialog
+            {
+                Multiselect = true
+            };
+
+            if (!string.IsNullOrEmpty(path) && Directory.Exists(path))
+            {
+                ofd.InitialDirectory = path;
+            }
             ofd.ShowDialog();
 
             return ofd.FileNames;
         }
 
+        private void AddGradient_Click(object sender, RoutedEventArgs e)
+        {
+            GetAndAddLayer(Path.Combine(Environment.CurrentDirectory, "Assets\\Gradients"));
+        }
+
         private void AddStaticLayer_Click(object sender, RoutedEventArgs e)
         {
-            var files = ShowFileDialog();
+            GetAndAddLayer();
+        }
+
+        private void GetAndAddLayer(string defaultPath = "")
+        {
+            var files = ShowFileDialog(defaultPath);
             if (files.Length == 0)
             {
                 return;
@@ -129,17 +139,13 @@ private void AddStaticLayer_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private void BorderSelector_Loaded(object sender, RoutedEventArgs e)
-        {
-            var box = sender as ComboBox;
-            box.ItemsSource = GetBorders();
-            box.SelectedIndex = 0;
-        }
-
         private void BorderSelector_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             var box = sender as ComboBox;
-            SetBorder(box.SelectedValue.ToString());
+            _border = box.SelectedValue.ToString();
+
+            var name = Path.GetFileNameWithoutExtension(_border);
+            UpdatePreview();
         }
 
         private void ColorPicker_Picked(object sender, System.EventArgs e)
@@ -154,6 +160,28 @@ private void DeleteStaticLayer_Click(object sender, RoutedEventArgs e)
             LayerList.Items.Remove(LayerList.SelectedItem);
         }
 
+        private void FrameSlider_DragCompleted(object sender, System.Windows.Controls.Primitives.DragCompletedEventArgs e)
+        {
+            UpdatePreview();
+        }
+
+        private void InitMaskAndBorder()
+        {
+            BorderSelectorBox.ItemsSource = GetBorders();
+            BorderSelectorBox.SelectedIndex = 0;
+
+            _border = BorderSelectorBox.SelectedValue.ToString();
+        }
+
+        private void OnExportLayerCompleted(int layer, int total)
+        {
+            Dispatcher.BeginInvoke((Action)(() =>
+            {
+                ExportProgress.Maximum = total;
+                ExportProgress.Value = layer;
+            }));
+        }
+
         private void OnLayerChanged(ISourceFile layer)
         {
             UpdatePreview();
@@ -201,6 +229,15 @@ private void OnRemoveLayer(ISourceFile layer)
             UpdatePreview();
         }
 
+        private void ResetUi(LoadingControl loadingControl)
+        {
+            Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
+            {
+                LayerList.Items.Remove(loadingControl);
+                IsEnabled = true;
+            }));
+        }
+
         private void Save_Click(object sender, RoutedEventArgs e)
         {
             var sfd = new SaveFileDialog
@@ -271,23 +308,9 @@ private void StartAddLayerView(string file)
             });
         }
 
-        private void ResetUi(LoadingControl loadingControl)
-        {
-            Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
-            {
-                LayerList.Items.Remove(loadingControl);
-                IsEnabled = true;
-            }));
-        }
-
         private void UpdatePreview()
         {
             StartPreviewUpdate(PreviewFrame);
         }
-
-        private void FrameSlider_DragCompleted(object sender, System.Windows.Controls.Primitives.DragCompletedEventArgs e)
-        {
-            UpdatePreview();
-        }
     }
 }