diff --git a/Services/Admin/Pages/WorldEditor/Index.cshtml b/Services/Admin/Pages/WorldEditor/Index.cshtml index be81686..9d11d77 100644 --- a/Services/Admin/Pages/WorldEditor/Index.cshtml +++ b/Services/Admin/Pages/WorldEditor/Index.cshtml @@ -103,6 +103,13 @@ +
+ +
+ +
+
No sheet selected
+
@@ -177,6 +184,11 @@ const zoneCtx = zoneCanvas.getContext('2d'); const chunkCanvas = document.getElementById('chunkCanvas'); const chunkCtx = chunkCanvas.getContext('2d'); + const sheetPickerCanvas = document.getElementById('sheetPickerCanvas'); + const sheetPickerCtx = sheetPickerCanvas.getContext('2d'); + const sheetPickerMeta = document.getElementById('sheetPickerMeta'); + const sheetPickerImage = new Image(); + let sheetPickerLoadedSheetId = 0; function token() { return document.querySelector('#af-form input[name="__RequestVerificationToken"]').value; @@ -547,11 +559,108 @@ function onSheetChanged() { const sheetId = parseInt(document.getElementById('sheetId').value, 10) || 0; - const frameIndex = parseInt(document.getElementById('frameIndex').value, 10) || 0; + let frameIndex = parseInt(document.getElementById('frameIndex').value, 10) || 0; + const sheet = sheets.find(s => s.id === sheetId); + const totalFrames = sheet ? (sheet.cols * Math.max(1, Math.floor(sheet.sheetH / Math.max(1, sheet.tileH)))) : 1; + frameIndex = Math.max(0, Math.min(totalFrames - 1, frameIndex)); + document.getElementById('frameIndex').value = frameIndex; document.getElementById('tileDefLink').href = `/admin/tilemaps/tiles/edit?sheetId=${sheetId}&frameIndex=${frameIndex}`; + renderSheetPicker(); + } + + function resolveSheetImageUrl(sheet) { + if (!sheet || !sheet.path) return ''; + if (sheet.path.startsWith('http://') || sheet.path.startsWith('https://')) return sheet.path; + const trimmed = sheet.path.replace(/^\/+/, ''); + return trimmed.startsWith('downloads/') ? `/${trimmed}` : `/downloads/${trimmed}`; + } + + function renderSheetPicker() { + const sheetId = parseInt(document.getElementById('sheetId').value, 10) || 0; + const frameIndex = parseInt(document.getElementById('frameIndex').value, 10) || 0; + const sheet = sheets.find(s => s.id === sheetId); + const imageUrl = resolveSheetImageUrl(sheet); + if (!sheet || !imageUrl) { + sheetPickerCanvas.width = 1; + sheetPickerCanvas.height = 1; + sheetPickerCtx.clearRect(0, 0, 1, 1); + sheetPickerMeta.textContent = 'No sheet selected'; + return; + } + + const drawSelectedFrame = () => { + const width = Math.max(1, sheet.sheetW); + const height = Math.max(1, sheet.sheetH); + sheetPickerCanvas.width = width; + sheetPickerCanvas.height = height; + sheetPickerCtx.imageSmoothingEnabled = false; + sheetPickerCtx.clearRect(0, 0, width, height); + sheetPickerCtx.drawImage(sheetPickerImage, 0, 0, width, height); + + const tileW = Math.max(1, sheet.tileW); + const tileH = Math.max(1, sheet.tileH); + sheetPickerCtx.strokeStyle = 'rgba(148,163,184,0.3)'; + sheetPickerCtx.lineWidth = 1; + for (let x = tileW; x < width; x += tileW) { + sheetPickerCtx.beginPath(); + sheetPickerCtx.moveTo(x + 0.5, 0); + sheetPickerCtx.lineTo(x + 0.5, height); + sheetPickerCtx.stroke(); + } + for (let y = tileH; y < height; y += tileH) { + sheetPickerCtx.beginPath(); + sheetPickerCtx.moveTo(0, y + 0.5); + sheetPickerCtx.lineTo(width, y + 0.5); + sheetPickerCtx.stroke(); + } + + const cols = Math.max(1, sheet.cols); + const col = frameIndex % cols; + const row = Math.floor(frameIndex / cols); + sheetPickerCtx.strokeStyle = '#f59e0b'; + sheetPickerCtx.lineWidth = 2; + sheetPickerCtx.strokeRect(col * tileW + 1, row * tileH + 1, tileW - 2, tileH - 2); + sheetPickerMeta.textContent = `${sheet.name} | Frame ${frameIndex} (col ${col}, row ${row})`; + }; + + if (sheetPickerLoadedSheetId === sheet.id && sheetPickerImage.complete) { + drawSelectedFrame(); + return; + } + + sheetPickerImage.onload = () => { + sheetPickerLoadedSheetId = sheet.id; + drawSelectedFrame(); + }; + sheetPickerImage.onerror = () => { + sheetPickerCanvas.width = 1; + sheetPickerCanvas.height = 1; + sheetPickerCtx.clearRect(0, 0, 1, 1); + sheetPickerMeta.textContent = `Failed to load sheet image: ${sheet.name}`; + }; + sheetPickerImage.src = imageUrl; } document.getElementById('frameIndex').addEventListener('input', onSheetChanged); + sheetPickerCanvas.addEventListener('click', (e) => { + const sheetId = parseInt(document.getElementById('sheetId').value, 10) || 0; + const sheet = sheets.find(s => s.id === sheetId); + if (!sheet) return; + const rect = sheetPickerCanvas.getBoundingClientRect(); + if (rect.width <= 0 || rect.height <= 0) return; + const scaleX = sheetPickerCanvas.width / rect.width; + const scaleY = sheetPickerCanvas.height / rect.height; + const px = (e.clientX - rect.left) * scaleX; + const py = (e.clientY - rect.top) * scaleY; + const tileW = Math.max(1, sheet.tileW); + const tileH = Math.max(1, sheet.tileH); + const col = Math.floor(px / tileW); + const row = Math.floor(py / tileH); + if (col < 0 || row < 0) return; + const frame = row * Math.max(1, sheet.cols) + col; + document.getElementById('frameIndex').value = String(frame); + onSheetChanged(); + }); chunkCanvas.addEventListener('click', handleChunkPaint); zoneCanvas.addEventListener('click', (e) => { if (!currentRegion) return;