Merge pull request #11 from Toreole/dev

Long overdue, makes the site usable
Toreole · Oct 29, 2023 · edf7eda · edf7eda
2 parents c805c74 + 5e9931c
commit edf7eda
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 16 deletions.
diff --git a/BlazorWebAssembly/Client/Core/ImageReconstructor.cs b/BlazorWebAssembly/Client/Core/ImageReconstructor.cs
@@ -79,7 +79,8 @@ public async void ReadFile(Stream stream)
 
     private (MinecraftBlock, TextureMetadata) FindBestMatchingTexture(Rgba32 pixel)
     {
-        RGB col = new() { r = pixel.R, g = pixel.G, b = pixel.B };
+        float alpha = pixel.A / 255f;
+        RGB col = new() { r = (byte)(pixel.R * alpha), g = (byte)(pixel.G * alpha), b = (byte)(pixel.B * alpha) };
 
         if(knownRGBs.ContainsKey(col))
         {

diff --git a/BlazorWebAssembly/Client/Pages/Index.razor b/BlazorWebAssembly/Client/Pages/Index.razor
@@ -20,13 +20,13 @@
 
     protected override async Task OnInitializedAsync()
     {
+        imageReconstructor.OnOutputChanged += StateHasChanged;
         //blockData persists across page swaps. no need to get it again.
         if (imageReconstructor.blockData.Length != 0)
             return;
-        var path = "images/tex_metadata.json";
+        string path = "images/tex_metadata.json";
         string json = await Http.GetStringAsync(path);
         imageReconstructor.blockData = JsonSerializer.Deserialize<MinecraftBlock[]>(json) ?? new MinecraftBlock[0];
-        imageReconstructor.OnOutputChanged += StateHasChanged;
     }
 
     ~Index()
@@ -63,12 +63,12 @@
     Block Size: @blockSize
 </MudSlider>
 
-<MudSlider Min="0f" Max="100f" @bind-Value="imageReconstructor.ContrastBias" Style="width: 200px" Step="0.05f"> 
-    Contrast Bias: @imageReconstructor.ContrastBias
+<MudSlider Min="0f" Max="100f" @bind-Value="imageReconstructor.ContrastBias" Style="width: 200px" Step="1f"> 
+    Smoothness: @imageReconstructor.ContrastBias
 </MudSlider>
 
-<MudSlider Min="-1" Max="50" @bind-Value="imageReconstructor.GreedyTextureThreshold" Style="width: 200px" Step="1">
-    Greedy Selection Threshold: @imageReconstructor.GreedyTextureThreshold
+<MudSlider Min="-1" Max="100" @bind-Value="imageReconstructor.GreedyTextureThreshold" Style="width: 200px" Step="1">
+    Greediness: @imageReconstructor.GreedyTextureThreshold
 </MudSlider>
 
 <MudCheckBox Checked="UseTooltips">

diff --git a/BlazorWebAssembly/Client/Pages/Settings.razor b/BlazorWebAssembly/Client/Pages/Settings.razor
@@ -7,7 +7,10 @@
 
 <h3>Settings</h3>
 
-<MudTable Items="@imageReconstructor.blockData"> 
+<MudTable Items="@imageReconstructor.blockData" Filter="FilterWrapper">
+	<ToolBarContent>
+		<MudTextField @bind-Value="filterString" Placeholder="Search" Adornment="Adornment.Start" AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" Class="mt-0"></MudTextField>
+	</ToolBarContent>
 	<HeaderContent>
 		<MudTh>
 			<MudTableSortLabel SortBy="new Func<MinecraftBlock, string>(x => x.blockName)">Block</MudTableSortLabel>
@@ -28,5 +31,11 @@
 </MudTable>
 
 @code {
-
+	private string filterString = "";
+	private bool FilterWrapper(MinecraftBlock block) => FilterBlock(block, filterString);
+	private bool FilterBlock(MinecraftBlock block, string filter)
+	{
+		//inefficient but ok
+		return block.blockName.ToLower().Contains(filter.ToLower());
+	}
 }
diff --git a/BlazorWebAssembly/Client/Shared/MainLayout.razor b/BlazorWebAssembly/Client/Shared/MainLayout.razor
@@ -9,7 +9,7 @@
 
     <main>
         <div class="top-row px-4">
-            <a href="https://docs.microsoft.com/aspnet/" target="_blank">About</a>
+            <MudIconButton Icon="@Icons.Custom.Brands.GitHub" Color="Color.Primary" Href="https://github.com/Toreole/Img2Mc" Target="_blank"></MudIconButton>
         </div>
 
         <article class="content px-4">

diff --git a/BlazorWebAssembly/Client/Shared/NavMenu.razor b/BlazorWebAssembly/Client/Shared/NavMenu.razor
@@ -1,6 +1,6 @@
 <div class="top-row ps-3 navbar navbar-dark">
     <div class="container-fluid">
-        <a class="navbar-brand" href="">BlazorWebAssembly</a>
+        <a class="navbar-brand" href="">Img2Mc</a>
         <button title="Navigation menu" class="navbar-toggler" @onclick="ToggleNavMenu">
             <span class="navbar-toggler-icon"></span>
         </button>
@@ -10,12 +10,10 @@
 <div class="@NavMenuCssClass nav-scrollable" @onclick="ToggleNavMenu">
     <nav class="flex-column">
         <div class="nav-item px-3">
-            <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
-                <span class="oi oi-home" aria-hidden="true"></span> Home
-            </NavLink>
+            <MudNavLink Href="" Icon="@Icons.Material.Filled.Home" IconColor="Color.Surface">Main</MudNavLink>
         </div>
         <div class="nav-item px-3">
-            <MudNavLink Href="/img2mc/settings" Icon="@Icons.Material.Filled.Settings">Settings</MudNavLink>
+            <MudNavLink Href="settings" Icon="@Icons.Material.Filled.Settings" IconColor="Color.Surface">Settings</MudNavLink>
         </div>
     </nav>
 </div>

diff --git a/BlazorWebAssembly/Client/wwwroot/index.html b/BlazorWebAssembly/Client/wwwroot/index.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-    <title>BlazorWebAssembly</title>
+    <title>Img2Mc by Toreole</title>
     <base href="/" />
     <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
     <link href="css/app.css" rel="stylesheet" />