Skip to content

✏️ fixing drawing and adding some more things #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

✏️ fixing drawing and adding some more things #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b11b2df
✏️ fixing double line drawing
Flanderzz Sep 6, 2025
bfb0220
🦆 continue draw even when out of bounds (thx Vansh)
Flanderzz Sep 7, 2025
5b36048
⚙️ use variables and fix demo image id
Flanderzz Sep 9, 2025
d4f6224
🎨 drawing tools driven by sidebar buttons
dotcomnerd Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 35 additions & 10 deletions components/studio/drawing/drawing-canvas.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,17 @@ export default function DrawingCanvas() {
const points = path.points.map((p) => [p.x + dx, p.y + dy, p.pressure ?? 0.5])
const stroke = getStroke(points, {
size: path.strokeWidth,
thinning: 0.6,
smoothing: 0.6,
streamline: 0.4,
thinning: 0.5,
smoothing: 0.5,
streamline: 0.5,
start: {
cap: true,
taper: 0,
},
end: {
cap: true,
taper: 0,
},
})

if (stroke.length > 1) {
Expand All @@ -67,7 +75,8 @@ export default function DrawingCanvas() {
for (let i = 1; i < stroke.length; i += 1) {
ctx.lineTo(stroke[i][0], stroke[i][1])
}
ctx.stroke()
ctx.closePath()
ctx.fill()
}
ctx.restore()
})
Expand Down Expand Up @@ -107,9 +116,16 @@ export default function DrawingCanvas() {

const updated = drawings.map((path, index) => {
if (index === drawings.length - 1) {
return {
...path,
points: [...path.points, point]
const lastPoint = path.points[path.points.length - 1]
const isDuplicate = lastPoint &&
Math.abs(lastPoint.x - point.x) < 0.5 &&
Math.abs(lastPoint.y - point.y) < 0.5

if (!isDuplicate) {
return {
...path,
points: [...path.points, point]
}
}
}
return path
Expand All @@ -134,10 +150,19 @@ export default function DrawingCanvas() {
<canvas
ref={canvasRef}
className="absolute inset-0 z-10"
onPointerDown={handlePointerDown}
onPointerDown={(e) => {
e.currentTarget.setPointerCapture(e.pointerId)
handlePointerDown(e)
}}
onPointerMove={handlePointerMove}
onPointerUp={handlePointerUp}
onPointerLeave={handlePointerUp}
onPointerUp={(e) => {
e.currentTarget.setPointerCapture(e.pointerId)
handlePointerUp()
}}
onPointerLeave={(e) => {
e.currentTarget.setPointerCapture(e.pointerId)
handlePointerUp()
}}
style={{ touchAction: 'none', cursor, pointerEvents }}
/>
)
Expand Down
6 changes: 4 additions & 2 deletions components/studio/image/add-image-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ export default function AddImageButton({ }: AddImageButtonProps) {

if (file) {
const imageUrl = URL.createObjectURL(file)
const newImageId = images.length > 0 ? Math.max(...images.map(img => img.id)) + 1 : 1

setImages([
...images,
{
image: imageUrl,
id: images.length > 0 ? Math.max(...images.map(img => img.id)) + 1 : 1,
id: newImageId,
style:
images.length < 1
? defaultStyle
Expand Down Expand Up @@ -62,7 +64,7 @@ export default function AddImageButton({ }: AddImageButtonProps) {
setResolution(newResolution.toString())
}
}
setSelectedImage(images.length)
setSelectedImage(newImageId)
}
}

Expand Down
20 changes: 11 additions & 9 deletions components/studio/main-image.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,12 @@ const ImageUpload = () => {
const file = item.getAsFile();
if (!file) continue;
const imageUrl = URL.createObjectURL(file);
const pastedImageId = images.length > 0 ? Math.max(...images.map(img => img.id)) + 1 : 1
setImages([
...images,
{
image: imageUrl,
id: images.length > 0 ? Math.max(...images.map(img => img.id)) + 1 : 1,
id: pastedImageId,
style: images.length < 1
? defaultStyle
: {
Expand Down Expand Up @@ -301,12 +302,13 @@ function LoadAImage() {

setInitialImageUploaded(true)

const loadedImageId = images.length > 0 ? Math.max(...images.map(img => img.id)) + 1 : 1
setImagesCheck([...imagesCheck, imageUrl])
setImages([
...images,
{ image: imageUrl, id: images.length > 0 ? Math.max(...images.map(img => img.id)) + 1 : 1, style: defaultStyle },
{ image: imageUrl, id: loadedImageId, style: defaultStyle },
])
setSelectedImage(images.length > 0 ? Math.max(...images.map(img => img.id)) + 1 : 1)
setSelectedImage(loadedImageId)

if (localStorage.getItem('image-init-pro-tip') === null) {
toast.info("Pro Trip!", { description: "If you right click on the image, you can replace it, delete it, or even crop it!", position: "top-left" });
Expand Down Expand Up @@ -359,13 +361,13 @@ function LoadAImage() {
try {
const imageUrl = URL.createObjectURL(file)
setInitialImageUploaded(true)

const newImageId = images.length > 0 ? Math.max(...images.map(img => img.id)) + 1 : 1
setImagesCheck([...imagesCheck, imageUrl])
setImages([
...images,
{ image: imageUrl, id: images.length > 0 ? Math.max(...images.map(img => img.id)) + 1 : 1, style: defaultStyle },
{ image: imageUrl, id: newImageId, style: defaultStyle },
])
setSelectedImage(images.length > 0 ? Math.max(...images.map(img => img.id)) + 1 : 1)
setSelectedImage(newImageId)

if (localStorage.getItem('image-init-pro-tip') === null) {
toast.info("Pro Trip!", { description: "If you right click on the image, you can replace it, delete it, or even crop it!", position: "top-left" });
Expand Down Expand Up @@ -435,21 +437,21 @@ function LoadAImage() {
// setBackground(gradient);
// document?.documentElement.style.setProperty('--gradient-bg', gradient);

const nextId = images.length > 0 ? Math.max(...images.map(img => img.id)) + 1 : 1
const demoImageId = images.length > 0 ? Math.max(...images.map(img => img.id)) + 1 : 1
setInitialImageUploaded(true)
setImages([
...images,
{
image: imageSrc,
id: nextId,
id: demoImageId,
style: {
...defaultStyle,
imageRoundness: 0.7,
imageSize: '0.78',
},
},
]);
setSelectedImage(nextId)
setSelectedImage(demoImageId)
setImagesCheck([...imagesCheck, imageSrc]);

if (localStorage.getItem('image-init-pro-tip') === null) {
Expand Down
10 changes: 9 additions & 1 deletion components/studio/sidebar-buttons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import { Button } from '@/components/ui/button'
import { useActiveIndexStore } from '@/store/use-active-index'
import { useDrawingTools } from '@/store/use-drawing'

export default function SidebarButton({
icon,
Expand All @@ -14,10 +15,17 @@ export default function SidebarButton({
}) {
const activeIndex = useActiveIndexStore((state) => state.activeIndex)
const setActiveIndex = useActiveIndexStore((state) => state.setActiveIndex)
const { setCurrentTool, currentTool } = useDrawingTools()

const handleClick = () => {
setActiveIndex(index)
if (index === 4) setCurrentTool('pen');
else if (activeIndex === 4 && currentTool !== 'select') setCurrentTool('select');
}

return (
<li
onClick={() => setActiveIndex(index)}
onClick={handleClick}
className={`click-ignored relative flex flex-col items-center gap-2`}
>
<Button
Expand Down
2 changes: 1 addition & 1 deletion store/use-drawing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ interface DrawingToolsState {
setDragOffset: (offset: DragOffset | null) => void
}

export const useDrawingTools = create<DrawingToolsState>()((set) => ({
export const useDrawingTools = create<DrawingToolsState>()((set,) => ({
currentTool: 'select',
currentColor: '#000000',
currentStrokeWidth: 3,
Expand Down