[Tools] Fix issues with MessagePack and Packer;

LittleCodingFox · LittleCodingFox · commit 0501f09636e4 · 2024-12-09T22:24:10.000Z
diff --git a/Tools/Baker/Baker+Texture.cs b/Tools/Baker/Baker+Texture.cs
@@ -313,14 +313,16 @@ bool ValidRegion(int x, int y)
 
                                 if (metadata.trimDuplicates)
                                 {
-                                    Console.WriteLine($"\t\tRemoving duplicates in {spriteTextures.Count} sprites");
+                                    //Console.WriteLine($"\t\tRemoving duplicates in {spriteTextures.Count} sprites");
 
                                     for (var j = 0; j < spriteTextures.Count; j++)
                                     {
                                         var first = spriteTextures[j];
 
+                                        /*
                                         Console.WriteLine($"Validating {j + 1}/{spriteTextures.Count} " +
                                             $"({first.location.left}, {first.location.top}, {first.location.Width}, {first.location.Height})");
+                                        */
 
                                         var stride = first.textureData.width * 4;
 
@@ -337,8 +339,10 @@ bool ValidRegion(int x, int y)
                                             //Remove duplicates
                                             if (first.textureData.data.SequenceEqual(second.textureData.data))
                                             {
+                                                /*
                                                 Console.WriteLine($"\t\tRemoved 1:1 duplicate at index {k} " +
                                                     $"({second.location.left}, {second.location.top}, {second.location.Width}, {second.location.Height})");
+                                                */
 
                                                 first.duplicates.Add(new DuplicateSpriteInfo()
                                                 {
@@ -376,8 +380,10 @@ bool ValidRegion(int x, int y)
 
                                             if (valid)
                                             {
+                                                /*
                                                 Console.WriteLine($"\t\tRemoved Flipped Y duplicate at index {k} " +
                                                     $"({second.location.left}, {second.location.top}, {second.location.Width}, {second.location.Height})");
+                                                */
 
                                                 first.duplicates.Add(new DuplicateSpriteInfo()
                                                 {
@@ -421,8 +427,10 @@ bool ValidRegion(int x, int y)
 
                                             if (valid)
                                             {
+                                                /*
                                                 Console.WriteLine($"\t\tRemoved Flipped X duplicate at index {k} " +
                                                     $"({second.location.left}, {second.location.top}, {second.location.Width}, {second.location.Height})");
+                                                */
 
                                                 first.duplicates.Add(new DuplicateSpriteInfo()
                                                 {
diff --git a/Tools/Baker/Baker.csproj b/Tools/Baker/Baker.csproj
@@ -45,6 +45,8 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="StirlingLabs.Assimp.Net" Version="23.4.1" />
+		<PackageReference Update="StirlingLabs.assimp.native.win-x64" Version="5.2.5.4" />
+		<PackageReference Include="MessagePack" Version="3.0.308" />
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Include="Audio\AudioUtils.cs" />
@@ -69,10 +71,6 @@
 		<Compile Include="UnprocessedShader.cs" />
 		<Compile Include="WorkScheduler.cs" />
 	</ItemGroup>
-	<ItemGroup>
-	  <PackageReference Update="StirlingLabs.assimp.native.win-x64" Version="5.2.5.4" />
-	  <PackageReference Include="MessagePack" Version="3.0.308" />
-	</ItemGroup>
 	<PropertyGroup>
 		<PostBuildEvent>
 			$(SolutionDir)..\Dependencies\build\dotnet\bin\Release\net9.0\CrossCopy $(SolutionDir)Baker\bin\$(Configuration)\net9.0\*.exe $(SolutionDir)bin\
diff --git a/Tools/Packer/Packer.csproj b/Tools/Packer/Packer.csproj
@@ -25,9 +25,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-	<Reference Include="MessagePack">
-		<HintPath>..\..\Dependencies\build\dotnet\bin\Release\net9.0\MessagePack.dll</HintPath>
-	</Reference>
 	<Reference Include="Newtonsoft.Json">
 		<HintPath>..\..\Dependencies\JsonNet\Newtonsoft.Json.dll</HintPath>
 	</Reference>
@@ -49,6 +46,9 @@
     <Compile Include="PackerUtils.cs" />
     <Compile Include="Packer.cs" />
   </ItemGroup>
+  <ItemGroup>
+	<PackageReference Include="MessagePack" Version="3.0.308" />
+  </ItemGroup>
   <PropertyGroup>
     <PostBuildEvent>
 		$(SolutionDir)..\Dependencies\build\dotnet\bin\Release\net9.0\CrossCopy $(SolutionDir)Packer\bin\$(Configuration)\net9.0\*.exe $(SolutionDir)bin\

Original file line number	Diff line number	Diff line change
`@@ -313,14 +313,16 @@ bool ValidRegion(int x, int y)`
`313`	`313`
`314`	`314`	`if (metadata.trimDuplicates)`
`315`	`315`	`{`
`316`		`- Console.WriteLine($"\t\tRemoving duplicates in {spriteTextures.Count} sprites");`
	`316`	`+ //Console.WriteLine($"\t\tRemoving duplicates in {spriteTextures.Count} sprites");`
`317`	`317`
`318`	`318`	`for (var j = 0; j < spriteTextures.Count; j++)`
`319`	`319`	`{`
`320`	`320`	`var first = spriteTextures[j];`
`321`	`321`
	`322`	`+ /*`
`322`	`323`	`Console.WriteLine($"Validating {j + 1}/{spriteTextures.Count} " +`
`323`	`324`	`$"({first.location.left}, {first.location.top}, {first.location.Width}, {first.location.Height})");`
	`325`	`+ */`
`324`	`326`
`325`	`327`	`var stride = first.textureData.width * 4;`
`326`	`328`
`@@ -337,8 +339,10 @@ bool ValidRegion(int x, int y)`
`337`	`339`	`//Remove duplicates`
`338`	`340`	`if (first.textureData.data.SequenceEqual(second.textureData.data))`
`339`	`341`	`{`
	`342`	`+ /*`
`340`	`343`	`Console.WriteLine($"\t\tRemoved 1:1 duplicate at index {k} " +`
`341`	`344`	`$"({second.location.left}, {second.location.top}, {second.location.Width}, {second.location.Height})");`
	`345`	`+ */`
`342`	`346`
`343`	`347`	`first.duplicates.Add(new DuplicateSpriteInfo()`
`344`	`348`	`{`
`@@ -376,8 +380,10 @@ bool ValidRegion(int x, int y)`
`376`	`380`
`377`	`381`	`if (valid)`
`378`	`382`	`{`
	`383`	`+ /*`
`379`	`384`	`Console.WriteLine($"\t\tRemoved Flipped Y duplicate at index {k} " +`
`380`	`385`	`$"({second.location.left}, {second.location.top}, {second.location.Width}, {second.location.Height})");`
	`386`	`+ */`
`381`	`387`
`382`	`388`	`first.duplicates.Add(new DuplicateSpriteInfo()`
`383`	`389`	`{`
`@@ -421,8 +427,10 @@ bool ValidRegion(int x, int y)`
`421`	`427`
`422`	`428`	`if (valid)`
`423`	`429`	`{`
	`430`	`+ /*`
`424`	`431`	`Console.WriteLine($"\t\tRemoved Flipped X duplicate at index {k} " +`
`425`	`432`	`$"({second.location.left}, {second.location.top}, {second.location.Width}, {second.location.Height})");`
	`433`	`+ */`
`426`	`434`
`427`	`435`	`first.duplicates.Add(new DuplicateSpriteInfo()`
`428`	`436`	`{`