Add Table to exclude blocks from reconstruction

Toreole · Jul 31, 2023 · 207768a · 207768a
1 parent 5246709
commit 207768a
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 3 deletions.
diff --git a/BlazorWebAssembly/BlazorWebAssembly.sln b/BlazorWebAssembly/BlazorWebAssembly.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorWebAssembly.Client",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorWebAssembly.Shared", "Shared\BlazorWebAssembly.Shared.csproj", "{2ABAA9E5-A116-4201-88F1-2A7832267CF0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TexMetadataGenerator", "TexMetadataGenerator\TexMetadataGenerator.csproj", "{7AE0A7E1-CA81-4EAB-B203-2944D40111D2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TexMetadataGenerator", "TexMetadataGenerator\TexMetadataGenerator.csproj", "{7AE0A7E1-CA81-4EAB-B203-2944D40111D2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/BlazorWebAssembly/Client/Core/ImageReconstructor.cs b/BlazorWebAssembly/Client/Core/ImageReconstructor.cs
@@ -77,7 +77,7 @@ public async void ReadFile(Stream stream)
         RGB col = new() { r = pixel.R, g = pixel.G, b = pixel.B };
         var query = from block in blockData
                     from texture in block.textures
-                    orderby texture.ColorDistance(col, ContrastBias) ascending
+                    orderby texture.ColorDistance(block, col, ContrastBias) ascending
                     select (block, texture);
         return query.First();
     }

diff --git a/BlazorWebAssembly/Client/Pages/Settings.razor b/BlazorWebAssembly/Client/Pages/Settings.razor
@@ -0,0 +1,32 @@
+@page "/settings"
+
+@using BlazorWebAssembly.Client.Core;
+@using Img2mc.Shared;
+
+@inject ImageReconstructor imageReconstructor
+
+<h3>Settings</h3>
+
+<MudTable Items="@imageReconstructor.blockData"> 
+	<HeaderContent>
+		<MudTh>
+			<MudTableSortLabel SortBy="new Func<MinecraftBlock, string>(x => x.blockName)">Block</MudTableSortLabel>
+		</MudTh>
+		<MudTh>
+			Exclude
+		</MudTh>
+	</HeaderContent>
+	<RowTemplate>
+		<MudTd DataLabel="Block">@context.blockName</MudTd>
+		<MudTd DataLabel="Exclude">
+			<MudCheckBox @bind-Checked="@context.exclude"></MudCheckBox> 
+		</MudTd>
+	</RowTemplate>
+	<PagerContent>
+		<MudTablePager PageSizeOptions="new int[]{50, 100}" />
+	</PagerContent>
+</MudTable>
+
+@code {
+
+}
diff --git a/BlazorWebAssembly/Client/Shared/NavMenu.razor b/BlazorWebAssembly/Client/Shared/NavMenu.razor
@@ -14,6 +14,11 @@
                 <span class="oi oi-home" aria-hidden="true"></span> Home
             </NavLink>
         </div>
+        <div class="nav-item px-3">
+            <NavLink class="nav-link" href="settings" Match="NavLinkMatch.All">
+                <span class="oi oi-home" aria-hidden="true"></span> Settings
+            </NavLink>
+        </div>
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="counter">
                 <span class="oi oi-plus" aria-hidden="true"></span> Counter

diff --git a/BlazorWebAssembly/Shared/TextureMetadata.cs b/BlazorWebAssembly/Shared/TextureMetadata.cs
@@ -61,8 +61,11 @@ public TextureMetadata(string fileName, RGB avgRGB, float hueVariance, float sat
 
     public TextureMetadata() { }
 
-    public float ColorDistance(RGB rgb, float contrastPenalty = 0f)
+    public float ColorDistance(MinecraftBlock blockContext, RGB rgb, float contrastPenalty = 0f)
     {
+        if (blockContext.exclude || this.exclude)
+            return float.MaxValue;
+
         float distance = averageRGB.RGBDistance(rgb);
 
         float contrast = (1/valueVariance);