- Update tile edit Neighbor Mask Helper to suggest new directional bucket names and masks - Include 8-neighbor adjacency when collecting wall candidate cells so single-diagonal corner masks are placed - Keep strict exact mask bucket matching in VNext wall resolver
325 lines
13 KiB
Plaintext
325 lines
13 KiB
Plaintext
@page "/admin/tilemaps/tiles/edit"
|
|
@model TileMaps.TileEditModel
|
|
@using DataServer.Data.Entities
|
|
@{
|
|
ViewData["Title"] = Model.Tile.Id == 0 ? "New Tile Definition" : $"Edit Tile Definition: {Model.Tile.Name ?? $"Frame {Model.Tile.FrameIndex}"}";
|
|
|
|
var sheet = Model.Sheet;
|
|
var frameIndex = Model.Tile.FrameIndex;
|
|
var cols = sheet.Columns;
|
|
var col = cols > 0 ? frameIndex % cols : 0;
|
|
var row = cols > 0 ? frameIndex / cols : 0;
|
|
|
|
var imageUrl = sheet.CdnPath;
|
|
if (!string.IsNullOrEmpty(imageUrl))
|
|
{
|
|
if (!imageUrl.StartsWith("http"))
|
|
{
|
|
var baseUrl = Model.CdnBaseUrl.TrimEnd('/');
|
|
if (!baseUrl.EndsWith("/downloads"))
|
|
{
|
|
baseUrl += "/downloads";
|
|
}
|
|
imageUrl = $"{baseUrl}/{imageUrl.TrimStart('/')}";
|
|
}
|
|
}
|
|
}
|
|
|
|
<div class="mb-4">
|
|
<a href="/admin/tilemaps/edit?id=@sheet.Id" class="text-blue-400 hover:text-blue-300 text-sm">← Back to TileMap Sheet</a>
|
|
</div>
|
|
|
|
<h1 class="text-2xl font-bold text-white mb-6">@ViewData["Title"]</h1>
|
|
|
|
@if (!string.IsNullOrEmpty(Model.Message))
|
|
{
|
|
<div class="mb-4 p-3 rounded @(Model.IsError ? "bg-red-900/50 text-red-300" : "bg-green-900/50 text-green-300")">
|
|
@Model.Message
|
|
</div>
|
|
}
|
|
|
|
<form method="post">
|
|
@Html.AntiForgeryToken()
|
|
<input type="hidden" asp-for="Tile.Id" />
|
|
<input type="hidden" asp-for="Tile.TileMapSheetId" />
|
|
<input type="hidden" asp-for="Tile.FrameIndex" />
|
|
|
|
<div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
|
|
<div class="card p-4 space-y-3">
|
|
<h3 class="font-semibold text-white">Tile Preview</h3>
|
|
<div class="bg-gray-900 rounded p-4 flex items-center justify-center">
|
|
<div style="width:@(sheet.TileWidth)px;height:@(sheet.TileHeight)px;background:url('@imageUrl') @(-col * sheet.TileWidth)px @(-row * sheet.TileHeight)px no-repeat;background-size:@(sheet.SheetWidth)px @(sheet.SheetHeight)px;image-rendering:pixelated;"></div>
|
|
</div>
|
|
<div class="text-xs text-gray-500">
|
|
Sheet: <span class="text-gray-300">@sheet.Name</span><br />
|
|
Frame: <span class="text-gray-300">@frameIndex</span>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="card p-4 space-y-3">
|
|
<h3 class="font-semibold text-white">Tile Properties</h3>
|
|
<div>
|
|
<label class="text-xs text-gray-400">Name</label>
|
|
<input type="text" asp-for="Tile.Name" class="input w-full text-sm" placeholder="Stone Floor Clean" />
|
|
</div>
|
|
<div>
|
|
<label class="text-xs text-gray-400">Type</label>
|
|
<select asp-for="Tile.Type" class="input w-full text-sm">
|
|
@foreach (var t in Enum.GetValues<TileType>())
|
|
{
|
|
<option value="@t">@t</option>
|
|
}
|
|
</select>
|
|
</div>
|
|
<div>
|
|
<label class="text-xs text-gray-400">Tags</label>
|
|
<input type="text" asp-for="Tile.Tags" class="input w-full text-sm" placeholder="stone,clean" />
|
|
</div>
|
|
<div>
|
|
<label class="text-xs text-gray-400">Biome</label>
|
|
<input type="text" asp-for="Tile.Biome" class="input w-full text-sm" placeholder="dungeon" />
|
|
</div>
|
|
<div class="grid grid-cols-2 gap-2">
|
|
<div class="flex items-center gap-2">
|
|
<input type="checkbox" asp-for="Tile.IsWalkable" class="rounded" />
|
|
<label class="text-sm text-gray-300">Walkable</label>
|
|
</div>
|
|
<div class="flex items-center gap-2">
|
|
<input type="checkbox" asp-for="Tile.BlocksProjectiles" class="rounded" />
|
|
<label class="text-sm text-gray-300">Blocks Projectiles</label>
|
|
</div>
|
|
<div class="flex items-center gap-2">
|
|
<input type="checkbox" asp-for="Tile.BlocksLineOfSight" class="rounded" />
|
|
<label class="text-sm text-gray-300">Blocks LOS</label>
|
|
</div>
|
|
<div class="flex items-center gap-2">
|
|
<input type="checkbox" asp-for="Tile.IsInteractable" class="rounded" />
|
|
<label class="text-sm text-gray-300">Interactable</label>
|
|
</div>
|
|
</div>
|
|
<div class="grid grid-cols-2 gap-2">
|
|
<div>
|
|
<label class="text-xs text-gray-400">Render Layer</label>
|
|
<input type="number" asp-for="Tile.RenderLayer" class="input w-full text-sm" min="0" />
|
|
</div>
|
|
<div>
|
|
<label class="text-xs text-gray-400">Z Index</label>
|
|
<input type="number" asp-for="Tile.ZIndex" class="input w-full text-sm" min="0" />
|
|
</div>
|
|
</div>
|
|
<div class="grid grid-cols-2 gap-2">
|
|
<div class="flex items-center gap-2">
|
|
<input type="checkbox" asp-for="Tile.IsAnimated" class="rounded" />
|
|
<label class="text-sm text-gray-300">Animated</label>
|
|
</div>
|
|
<div class="flex items-center gap-2">
|
|
<input type="checkbox" asp-for="Tile.IsEnabled" class="rounded" />
|
|
<label class="text-sm text-gray-300">Enabled</label>
|
|
</div>
|
|
</div>
|
|
<div class="grid grid-cols-2 gap-2">
|
|
<div>
|
|
<label class="text-xs text-gray-400">Anim Frames</label>
|
|
<input type="number" asp-for="Tile.AnimationFrameCount" class="input w-full text-sm" min="1" />
|
|
</div>
|
|
<div>
|
|
<label class="text-xs text-gray-400">Anim FPS</label>
|
|
<input type="number" asp-for="Tile.AnimationFps" class="input w-full text-sm" min="1" step="0.5" />
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="card p-4 space-y-3">
|
|
<h3 class="font-semibold text-white">Buckets</h3>
|
|
<p class="text-xs text-gray-500">Assign this tile to one or more buckets.</p>
|
|
<div class="border border-gray-700 rounded p-3 bg-gray-900/50 space-y-3">
|
|
<div class="text-xs text-gray-300 font-semibold">3x3 Neighbor Mask Helper</div>
|
|
<p class="text-xs text-gray-500">
|
|
Click neighbors to mark <span class="text-green-400">floor (1)</span> or <span class="text-gray-400">empty/wall (0)</span>.
|
|
Bit order is N then clockwise (N, NE, E, SE, S, SW, W, NW).
|
|
</p>
|
|
<div id="maskGrid" class="grid grid-cols-3 gap-1 w-36">
|
|
<button type="button" class="mask-cell" data-dir="nw">NW</button>
|
|
<button type="button" class="mask-cell" data-dir="n">N</button>
|
|
<button type="button" class="mask-cell" data-dir="ne">NE</button>
|
|
<button type="button" class="mask-cell" data-dir="w">W</button>
|
|
<div class="mask-center">Tile</div>
|
|
<button type="button" class="mask-cell" data-dir="e">E</button>
|
|
<button type="button" class="mask-cell" data-dir="sw">SW</button>
|
|
<button type="button" class="mask-cell" data-dir="s">S</button>
|
|
<button type="button" class="mask-cell" data-dir="se">SE</button>
|
|
</div>
|
|
<div class="text-xs text-gray-400 space-y-1">
|
|
<div>8-bit: <span id="maskCode8" class="text-cyan-300">00000000 (0)</span></div>
|
|
<div>4-bit (N,E,S,W): <span id="maskCode4" class="text-cyan-300">0000 (0)</span></div>
|
|
<div>Suggested Bucket: <span id="maskBucketHint" class="text-yellow-300">None</span></div>
|
|
</div>
|
|
</div>
|
|
<input type="text" id="bucketFilter" class="input w-full text-sm" placeholder="Type to filter buckets..." oninput="filterBuckets()" />
|
|
<div id="bucketList" class="max-h-80 overflow-auto border border-gray-700 rounded p-2 space-y-1">
|
|
@foreach (var b in Model.AllBuckets)
|
|
{
|
|
<label class="flex items-center gap-2 text-sm text-gray-300 bucket-item" data-name="@b.Name.ToLower()">
|
|
<input type="checkbox" name="bucketIds" value="@b.Id" class="rounded"
|
|
data-bucket-name="@b.Name"
|
|
@(Model.SelectedBucketIds.Contains(b.Id) ? "checked" : "") />
|
|
<span>@b.Name</span>
|
|
@if (!string.IsNullOrWhiteSpace(b.BucketType))
|
|
{
|
|
<span class="text-xs text-gray-500 ml-auto">@b.BucketType</span>
|
|
}
|
|
</label>
|
|
}
|
|
@if (!Model.AllBuckets.Any())
|
|
{
|
|
<div class="text-xs text-gray-500">No buckets defined yet.</div>
|
|
}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="flex justify-end gap-4 mt-6">
|
|
<a href="/admin/tilemaps/edit?id=@sheet.Id" class="btn btn-ghost">Cancel</a>
|
|
<button type="submit" class="btn btn-primary">
|
|
@(Model.Tile.Id == 0 ? "Create Tile" : "Save Changes")
|
|
</button>
|
|
</div>
|
|
</form>
|
|
|
|
@section Scripts {
|
|
<script>
|
|
function filterBuckets() {
|
|
const q = document.getElementById('bucketFilter').value.toLowerCase();
|
|
document.querySelectorAll('.bucket-item').forEach(el => {
|
|
el.style.display = el.dataset.name.includes(q) ? '' : 'none';
|
|
});
|
|
}
|
|
|
|
const wallBucketSets = [
|
|
{ name: "Wall_N", mode: 8, codes: [128,129,192,193] },
|
|
{ name: "Wall_S", mode: 8, codes: [8,24,12,28] },
|
|
{ name: "Wall_E", mode: 8, codes: [32,96,48,112] },
|
|
{ name: "Wall_W", mode: 8, codes: [2,6,3,7] },
|
|
{ name: "NWCornerLarge", mode: 8, codes: [131] },
|
|
{ name: "NECornerLarge", mode: 8, codes: [224] },
|
|
{ name: "SECornerLarge", mode: 8, codes: [56] },
|
|
{ name: "SWCornerLarge", mode: 8, codes: [14] },
|
|
{ name: "NWCornerSingle", mode: 8, codes: [1] },
|
|
{ name: "NECornerSingle", mode: 8, codes: [64] },
|
|
{ name: "SECornerSingle", mode: 8, codes: [16] },
|
|
{ name: "SWCornerSingle", mode: 8, codes: [4] }
|
|
];
|
|
|
|
const maskState = { n:0, ne:0, e:0, se:0, s:0, sw:0, w:0, nw:0 };
|
|
const bitOrder = ["n","ne","e","se","s","sw","w","nw"];
|
|
const cardinalOrder = ["n","e","s","w"];
|
|
|
|
function normalizeBucketName(name) {
|
|
return (name || "").toLowerCase().replace(/[^a-z0-9]/g, "");
|
|
}
|
|
|
|
function computeMaskCode(order) {
|
|
let value = 0;
|
|
for (let i = 0; i < order.length; i++) {
|
|
const bit = maskState[order[i]] ? 1 : 0;
|
|
value |= (bit << (order.length - 1 - i));
|
|
}
|
|
return value;
|
|
}
|
|
|
|
function updateMaskCellVisual(btn, active) {
|
|
btn.classList.toggle("mask-on", !!active);
|
|
btn.classList.toggle("mask-off", !active);
|
|
}
|
|
|
|
function findMatchingBucketName(code8, code4) {
|
|
const match = wallBucketSets.find(set => {
|
|
const value = set.mode === 8 ? code8 : code4;
|
|
return set.codes.includes(value);
|
|
});
|
|
return match ? match.name : null;
|
|
}
|
|
|
|
function applyBucketSelection(bucketName) {
|
|
const normalizedTarget = normalizeBucketName(bucketName);
|
|
const checkboxes = Array.from(document.querySelectorAll('input[name="bucketIds"]'));
|
|
if (!normalizedTarget) return;
|
|
|
|
let matched = false;
|
|
for (const cb of checkboxes) {
|
|
const n = normalizeBucketName(cb.dataset.bucketName || "");
|
|
if (n === normalizedTarget) {
|
|
cb.checked = true;
|
|
matched = true;
|
|
break;
|
|
}
|
|
}
|
|
return matched;
|
|
}
|
|
|
|
function renderMaskSummary() {
|
|
const code8 = computeMaskCode(bitOrder);
|
|
const code4 = computeMaskCode(cardinalOrder);
|
|
const bin8 = code8.toString(2).padStart(8, "0");
|
|
const bin4 = code4.toString(2).padStart(4, "0");
|
|
document.getElementById("maskCode8").textContent = `${bin8} (${code8})`;
|
|
document.getElementById("maskCode4").textContent = `${bin4} (${code4})`;
|
|
|
|
const bucketName = findMatchingBucketName(code8, code4);
|
|
const hint = document.getElementById("maskBucketHint");
|
|
if (!bucketName) {
|
|
hint.textContent = "None";
|
|
return;
|
|
}
|
|
|
|
const applied = applyBucketSelection(bucketName);
|
|
hint.textContent = applied ? `${bucketName} (selected)` : `${bucketName} (no matching bucket found by name)`;
|
|
}
|
|
|
|
document.querySelectorAll(".mask-cell").forEach(btn => {
|
|
updateMaskCellVisual(btn, false);
|
|
btn.addEventListener("click", () => {
|
|
const dir = btn.dataset.dir;
|
|
maskState[dir] = maskState[dir] ? 0 : 1;
|
|
updateMaskCellVisual(btn, maskState[dir]);
|
|
renderMaskSummary();
|
|
});
|
|
});
|
|
|
|
renderMaskSummary();
|
|
</script>
|
|
<style>
|
|
.mask-cell {
|
|
width: 44px;
|
|
height: 44px;
|
|
border: 1px solid #4b5563;
|
|
border-radius: 6px;
|
|
font-size: 11px;
|
|
color: #d1d5db;
|
|
background: #111827;
|
|
}
|
|
.mask-center {
|
|
width: 44px;
|
|
height: 44px;
|
|
border: 1px solid #4b5563;
|
|
border-radius: 6px;
|
|
display: flex;
|
|
align-items: center;
|
|
justify-content: center;
|
|
font-size: 10px;
|
|
color: #f3f4f6;
|
|
background: #1f2937;
|
|
}
|
|
.mask-on {
|
|
background: #14532d;
|
|
border-color: #22c55e;
|
|
color: #bbf7d0;
|
|
}
|
|
.mask-off {
|
|
background: #111827;
|
|
border-color: #4b5563;
|
|
color: #d1d5db;
|
|
}
|
|
</style>
|
|
}
|