kts
/
spriteStackist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only show shape preview if using a brush

main
kts of kettek 2024-02-15 11:19:40 -08:00
parent b20caab1d7
commit e0572c82a1
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/sections/Editor2D.svelte
View File

@ -25,6 +25,7 @@
let mousePixelX: number = 0 let mousePixelX: number = 0
let mousePixelY: number = 0 let mousePixelY: number = 0
export let currentTool: Tool
export let primaryColorIndex: number export let primaryColorIndex: number
export let secondaryColorIndex: number export let secondaryColorIndex: number
export let brushSize: number export let brushSize: number
@ -164,6 +165,7 @@
ctx.lineWidth = 1 ctx.lineWidth = 1
// Draw brush preview. // Draw brush preview.
if (currentTool instanceof BrushTool) {
let shape: PixelPosition[] let shape: PixelPosition[]
if (brushType === 'square' || brushSize <= 2) { if (brushType === 'square' || brushSize <= 2) {
// FIXME: This is daft to adjust +1,+1 for size 2 -- without this, the rect preview draws one pixel offset to the top-left, which is not the same as when the filled rect is placed. // FIXME: This is daft to adjust +1,+1 for size 2 -- without this, the rect preview draws one pixel offset to the top-left, which is not the same as when the filled rect is placed.
@ -180,6 +182,7 @@
for (let i = 0; i < shape.length; i++) { for (let i = 0; i < shape.length; i++) {
ctx.fillRect(offsetX*zoom+(mousePixelX+shape[i].x)*zoom, offsetY*zoom+(mousePixelY+shape[i].y)*zoom, zoom, zoom) ctx.fillRect(offsetX*zoom+(mousePixelX+shape[i].x)*zoom, offsetY*zoom+(mousePixelY+shape[i].y)*zoom, zoom, zoom)
} }
}
// Draw zoomed pixel-sized square where mouse is. // Draw zoomed pixel-sized square where mouse is.
if (zoom > 1) { if (zoom > 1) {
ctx.rect(offsetX*zoom+mousePixelX*zoom, offsetY*zoom+mousePixelY*zoom, 1*zoom, 1*zoom) ctx.rect(offsetX*zoom+mousePixelX*zoom, offsetY*zoom+mousePixelY*zoom, 1*zoom, 1*zoom)
@ -206,8 +209,6 @@
} }
} }
export let currentTool: Tool
function canvasMousedown(node) { function canvasMousedown(node) {
let buttons: Set<number> = new Set() let buttons: Set<number> = new Set()
let x: number = 0 let x: number = 0