Implement vectorization of all assets

automuteus · Feb 10, 2021 · ef2bf50 · ef2bf50
1 parent 904e343
commit ef2bf50
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/AUCapture-WPF/Controls/PlayerControl.xaml b/AUCapture-WPF/Controls/PlayerControl.xaml
@@ -57,15 +57,15 @@
                     </auCaptureWpf:BasePlayerGenerator.Alive>
                 </auCaptureWpf:BasePlayerGenerator>
 
-                <controls:CachedImage
+                <svgc:SvgViewbox
                     x:Name="Pants"
                     Width="148"
                     Height="198"
                     Margin="0,0,0,0"
                     VerticalAlignment="Bottom"
                     Panel.ZIndex="1"
                     Stretch="Uniform">
-                    <controls:CachedImage.ImageUrl>
+                    <svgc:SvgViewbox.StreamSource>
                         <MultiBinding Converter="{StaticResource PantsConverter}">
                             <Binding
                                 Delay="100"
@@ -78,8 +78,8 @@
                                 IsAsync="True"
                                 Path="AliveStatus" />
                         </MultiBinding>
-                    </controls:CachedImage.ImageUrl>
-                </controls:CachedImage>
+                    </svgc:SvgViewbox.StreamSource>
+                </svgc:SvgViewbox>
                 <svgc:SvgViewbox
                     Width="212"
                     Margin="0,0,0,0"
@@ -101,13 +101,13 @@
                         </MultiBinding>
                     </svgc:SvgViewbox.StreamSource>
                 </svgc:SvgViewbox>
-                <controls:CachedImage
+                <svgc:SvgViewbox
                     Width="212"
                     Margin="0,0,0,0"
                     VerticalAlignment="Bottom"
                     Panel.ZIndex="1"
                     Stretch="Uniform">
-                    <controls:CachedImage.ImageUrl>
+                    <svgc:SvgViewbox.StreamSource>
                         <MultiBinding Converter="{StaticResource PetToIm}">
                             <Binding
                                 Delay="100"
@@ -120,8 +120,8 @@
                                 IsAsync="True"
                                 Path="AliveStatus" />
                         </MultiBinding>
-                    </controls:CachedImage.ImageUrl>
-                </controls:CachedImage>
+                    </svgc:SvgViewbox.StreamSource>
+                </svgc:SvgViewbox>
             </Grid>
         </Viewbox>
 

diff --git a/AUCapture-WPF/Converters/HatToImage.cs b/AUCapture-WPF/Converters/HatToImage.cs
@@ -253,7 +253,7 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
                 return null;
             }
             var finalName = hatID + "-" + Hats[(hatID%95).ToString()];
-            var stream = FileCache.Hit("https://carbun.xyz/CDN/1-1.svg");
+            var stream = FileCache.Hit($"https://carbun.xyz/CDN/SVGHats/{finalName}.svg");
             return stream;
         }
 

diff --git a/AUCapture-WPF/Converters/PantsConverter.cs b/AUCapture-WPF/Converters/PantsConverter.cs
@@ -8,6 +8,7 @@
 using System.Windows.Data;
 using System.Windows.Media.Imaging;
 using AmongUsCapture;
+using AUCapture_WPF.Controls;
 
 namespace AUCapture_WPF.Converters
 {
@@ -21,11 +22,11 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
                 var alive = values[1] as bool? ?? false;
                 if (pantID == 0)
                 {
-                    return "";
+                    return null;
                 }
                 return !alive
-                    ? ""
-                    : $"https://cdn.automute.us/Pants/{pantID}.png";
+                    ? null
+                    : FileCache.Hit($"https://carbun.xyz/CDN/SVGPants/{pantID}.svg");;
             } 
 
             return "";

diff --git a/AUCapture-WPF/Converters/PetToImageConverter.cs b/AUCapture-WPF/Converters/PetToImageConverter.cs
@@ -8,6 +8,7 @@
 using System.Windows.Data;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using AUCapture_WPF.Controls;
 
 namespace AUCapture_WPF.Converters
 {
@@ -19,11 +20,14 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
             var alive = values[1] as bool? ?? false;
             if (petID == 0)
             {
-                return "";
+                return null;
             }
             return !alive
-                ? ""
-                : $"https://cdn.automute.us/Pets/{petID}.png";
+                ? null
+                : FileCache.Hit($"https://carbun.xyz/CDN/SVGPets/{petID}.svg");
+            //return !alive
+            //    ? null
+            //    : $"https://cdn.automute.us/Pets/{petID}.png";
         }