Uploading for review for shape tool #1086
Conversation
| this.ctx.restore(); | ||
| } | ||
|
|
||
|
|
| let [selectX, selectY] = this.imageCoordToCanvasCoord(this.selectX, this.selectY); | ||
| this.drawSelectionBox(selectX, selectY, this.selectWidth * this.zoomLevel, this.selectHeight * this.zoomLevel, this.uiColor, 8 * this.zoomLevel, 0); | ||
| } | ||
|
|
There was a problem hiding this comment.
shouldn't have blank lines here
|
|
||
| if (this.tools.shape && this.tools.shape.shapes) { | ||
| for (let shape of this.tools.shape.shapes) { | ||
| this.tools.shape.drawShape(shape); |
There was a problem hiding this comment.
Shapes should either direct draw, or act as sub-layers on a layer. Doesn't really make sense to render in the main function here like this
| } | ||
|
|
||
| onMouseUp(e) { | ||
| if (this.isDrawing && (this.shape === 'rectangle' || this.shape === 'circle')) { |
There was a problem hiding this comment.
== not ===, but also why is this check here at all?
|
|
||
| // Only add if there's actual size | ||
| if (Math.abs(this.currentX - this.startX) > 1 || Math.abs(this.currentY - this.startY) > 1) { | ||
| this.shapes.push({ |
| let w = shape.width * zoom; | ||
| let h = shape.height * zoom; | ||
| ctx.rect(x, y, w, h); | ||
| } else if (shape.type === 'circle') { |
last commit for tonight lol too tired
|
alright i updated it quite a lot, i think i got all the errors and wonky formatting??? using a sub layer now, removed the check it was for accidental clicks but really if it's inside the canvas we don't need that and outside the canvas doesn't matter I can imagine there is more work to be done but for now, it's late. |
| this.startY = 0; | ||
| this.currentX = 0; | ||
| this.currentY = 0; | ||
| this.shapes = []; // Track shapes for undo functionality |
| this.currentX = 0; | ||
| this.currentY = 0; | ||
| this.shapes = []; // Track shapes for undo functionality | ||
| this.shapesLayer = null; // Sub-layer for storing shapes |
There was a problem hiding this comment.
A tool is not associated with any layer, it applies to whichever layer is currently active
2 participants
Was a bit me and a bit of help on some stuff from LLM, I've always been honest with that. Just let me know what parts might be out of your standards and I'll do my best to bring them into line.