Moved project files, see notes

- Removed local copy of TGASharpLib, replaced with a nuget package - Moved VTF.cs to the main Classes folder - Updated pathing to new resource location - Renamed schema names for common HUDs
CriticalFlaw · Sep 1, 2024 · 4d23e07 · 4d23e07
1 parent e2b12cc
commit 4d23e07
Show file tree

Hide file tree

Showing 11 changed files with 132 additions and 5,982 deletions.
diff --git a/src/TF2HUD.Editor/App.xaml b/src/TF2HUD.Editor/App.xaml
@@ -6,13 +6,13 @@
 
     <Application.Resources>
         <Setter x:Key="Tf2Build" Property="TextElement.FontFamily"
-                Value="../Resources/TF2Build.ttf #TF2 Build" />
+                Value="../Resources/Fonts/TF2Build.ttf #TF2 Build" />
         <Setter x:Key="Tf2Secondary" Property="TextElement.FontFamily"
-                Value="../Resources/TF2Secondary.ttf #TF2 Secondary" />
+                Value="../Resources/Fonts/TF2Secondary.ttf #TF2 Secondary" />
         <Setter x:Key="Tf2Icons" Property="TextElement.FontFamily"
-                Value="../Resources/Icons.ttf #Hypnotize Icons Master" />
+                Value="../Resources/Fonts/Icons.ttf #Hypnotize Icons Master" />
         <Setter x:Key="Tf2Crosshairs" Property="TextElement.FontFamily"
-                Value="../Resources/TF2Crosshairs.ttf #TF2Crosshairs" />
+                Value="../Resources/Fonts/TF2Crosshairs.ttf #TF2Crosshairs" />
 
         <Style TargetType="Label">
             <Setter Property="HorizontalAlignment" Value="Left" />
@@ -99,7 +99,7 @@
             <Setter Property="FontSize" Value="30" />
             <Setter Property="Width" Value="150" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="FontFamily" Value="../Resources/TF2Crosshairs.ttf #TF2Crosshairs" />
+            <Setter Property="FontFamily" Value="../Resources/Fonts/TF2Crosshairs.ttf #TF2Crosshairs" />
         </Style>
 
         <Style x:Key="CrosshairBox" TargetType="ComboBox">
@@ -109,18 +109,18 @@
             <Setter Property="SelectedValuePath" Value="Content" />
             <Setter Property="VerticalContentAlignment" Value="Top" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="FontFamily" Value="../Resources/TF2Crosshairs.ttf #TF2Crosshairs" />
+            <Setter Property="FontFamily" Value="../Resources/Fonts/TF2Crosshairs.ttf #TF2Crosshairs" />
         </Style>
 
         <Style x:Key="HeaderText" TargetType="Label">
-            <Setter Property="FontFamily" Value="../Resources/TF2Build.ttf #TF2 Build" />
+            <Setter Property="FontFamily" Value="../Resources/Fonts/TF2Build.ttf #TF2 Build" />
             <Setter Property="FontSize" Value="40px" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="Foreground" Value="#EBE2CA" />
         </Style>
 
         <Style x:Key="BodyText" TargetType="TextBlock">
-            <Setter Property="FontFamily" Value="../Resources/TF2Secondary.ttf #TF2 Secondary" />
+            <Setter Property="FontFamily" Value="../Resources/Fonts/TF2Secondary.ttf #TF2 Secondary" />
             <Setter Property="FontSize" Value="25px" />
             <Setter Property="TextWrapping" Value="Wrap" />
             <Setter Property="Foreground" Value="#A49E9E" />
@@ -129,7 +129,7 @@
         <Style x:Key="HudButton" TargetType="Button">
             <Setter Property="HorizontalAlignment" Value="Left" />
             <Setter Property="VerticalAlignment" Value="Top" />
-            <Setter Property="FontFamily" Value="../Resources/TF2Build.ttf #TF2 Build" />
+            <Setter Property="FontFamily" Value="../Resources/Fonts/TF2Build.ttf #TF2 Build" />
             <Setter Property="FontSize" Value="16px" />
             <Setter Property="Foreground" Value="#EBE2CA" />
             <Setter Property="Background" Value="#776B5F" />
@@ -170,7 +170,7 @@
         </Style>
 
         <Style x:Key="ToggleButton" TargetType="ToggleButton">
-            <Setter Property="FontFamily" Value="../Resources/TF2Build.ttf #TF2 Build" />
+            <Setter Property="FontFamily" Value="../Resources/Fonts/TF2Build.ttf #TF2 Build" />
             <Setter Property="FontSize" Value="16px" />
             <Setter Property="Foreground" Value="#EBE2CA" />
             <Setter Property="Background" Value="#776B5F" />
@@ -193,7 +193,7 @@
         <Style x:Key="LinkButton" TargetType="Button">
             <Setter Property="HorizontalAlignment" Value="Left" />
             <Setter Property="VerticalAlignment" Value="Top" />
-            <Setter Property="FontFamily" Value="../Resources/Icons.ttf #Hypnotize Icons Master" />
+            <Setter Property="FontFamily" Value="../Resources/Fonts/Icons.ttf #Hypnotize Icons Master" />
             <Setter Property="Width" Value="50" />
             <Setter Property="Height" Value="40" />
             <Setter Property="FontSize" Value="33px" />
@@ -300,7 +300,7 @@
         <Style x:Key="PreviewButton" TargetType="Button">
             <Setter Property="Background" Value="Transparent" />
             <Setter Property="Foreground" Value="White" />
-            <Setter Property="FontFamily" Value="../Resources/Icons.ttf #Hypnotize Icons Master" />
+            <Setter Property="FontFamily" Value="../Resources/Fonts/Icons.ttf #Hypnotize Icons Master" />
             <Setter Property="Height" Value="25" />
             <Setter Property="Content" Value="&#x048A;" />
             <Setter Property="BorderThickness" Value="0" />
@@ -422,7 +422,7 @@
         </Style>
 
         <Style x:Key="HudListIcon" TargetType="Label">
-            <Setter Property="FontFamily" Value="../Resources/Icons.ttf #Hypnotize Icons Master" />
+            <Setter Property="FontFamily" Value="../Resources/Fonts/Icons.ttf #Hypnotize Icons Master" />
             <Setter Property="FontSize" Value="20" />
             <Setter Property="Foreground" Value="#FFFFFF" />
             <Setter Property="HorizontalAlignment" Value="Right" />

diff --git a/src/TF2HUD.Editor/Classes/Utilities.cs b/src/TF2HUD.Editor/Classes/Utilities.cs
@@ -233,7 +233,7 @@ public static bool SearchRegistry()
                     steamPaths.Add(match.Groups[2].Value);
             }
 
-            // Loop through all known libary paths to try and find TF2.
+            // Loop through all known library paths to try and find TF2.
             foreach (var path in steamPaths)
             {
                 var pathTF = path + "\\steamapps\\common\\Team Fortress 2\\tf\\custom";

diff --git a/src/TF2HUD.Editor/Classes/VTF/VTF.cs → src/TF2HUD.Editor/Classes/VTF.cs b/src/TF2HUD.Editor/Classes/VTF/VTF.cs → src/TF2HUD.Editor/Classes/VTF.cs
@@ -1,3 +1,4 @@
+using Crews.Utility.TgaSharp;
 using System;
 using System.Diagnostics;
 using System.Drawing;