refactor: rewrite and organize project
still need to add other features from before rewrite
This commit is contained in:
parent
025371bd79
commit
de06203d31
20 changed files with 416 additions and 346 deletions
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"printWidth": 150,
|
||||
"tabWidth": 2,
|
||||
"useTabs": true
|
||||
}
|
||||
"printWidth": 150,
|
||||
"tabWidth": 2,
|
||||
"useTabs": true
|
||||
}
|
||||
|
|
|
|||
225
src/App.tsx
225
src/App.tsx
|
|
@ -1,218 +1,21 @@
|
|||
import React, { useEffect, useRef, useState } from "react";
|
||||
import { Eraser, Hand, Pencil } from "lucide-react";
|
||||
import { TexturesProvider } from "./context/TexturesContext";
|
||||
import { ToolProvider } from "./context/ToolContext";
|
||||
|
||||
import * as PIXI from "pixi.js";
|
||||
import { Container, Stage } from "@pixi/react";
|
||||
|
||||
import {
|
||||
Menubar,
|
||||
MenubarContent,
|
||||
MenubarItem,
|
||||
MenubarMenu,
|
||||
MenubarSeparator,
|
||||
MenubarSub,
|
||||
MenubarSubContent,
|
||||
MenubarSubTrigger,
|
||||
MenubarTrigger,
|
||||
} from "@/components/ui/menubar";
|
||||
import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
|
||||
|
||||
import ThemeChanger from "./components/menubar/theme-changer";
|
||||
import Blocks from "./components/blocks";
|
||||
import Cursor from "./components/cursor";
|
||||
import CursorInformation from "./components/cursor-information";
|
||||
|
||||
import spritesheet from "@/lib/data/blocks/programmer-art/spritesheet.json";
|
||||
|
||||
// Set scale mode to NEAREST
|
||||
PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST;
|
||||
import Menubar from "./components/menubar";
|
||||
import Toolbar from "./components/Toolbar";
|
||||
import Canvas from "./components/Canvas";
|
||||
|
||||
function App() {
|
||||
const stageContainerRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
const [stageSize, setStageSize] = useState({ width: 0, height: 0 });
|
||||
const [coords, setCoords] = useState<Position>({ x: 0, y: 0 });
|
||||
const [mousePosition, setMousePosition] = useState<Position>({ x: 0, y: 0 });
|
||||
const [localMousePosition, setLocalMousePosition] = useState<Position>({ x: 0, y: 0 });
|
||||
const [dragging, setDragging] = useState(false);
|
||||
const [scale, setScale] = useState(1);
|
||||
const [blocks, setBlocks] = useState<Block[]>([]);
|
||||
const [textures, setTextures] = useState<Record<string, PIXI.Texture>>({});
|
||||
|
||||
const [cssCursor, setCssCursor] = useState("grab");
|
||||
const [tool, setTool] = useState<Tool>("hand");
|
||||
const [selectedBlock, setSelectedBlock] = useState("stone");
|
||||
|
||||
const onToolChange = (value: Tool) => {
|
||||
setTool(value);
|
||||
setCssCursor(value === "hand" ? "grab" : "pointer");
|
||||
};
|
||||
|
||||
const onMouseMove = (e: React.MouseEvent) => {
|
||||
if (dragging) {
|
||||
if (tool === "hand") {
|
||||
setCoords((prevCoords) => ({
|
||||
x: prevCoords.x + e.movementX,
|
||||
y: prevCoords.y + e.movementY,
|
||||
}));
|
||||
}
|
||||
|
||||
onMouseDown();
|
||||
}
|
||||
|
||||
const stageRect = stageContainerRef.current?.getBoundingClientRect();
|
||||
if (!stageRect) return;
|
||||
|
||||
const mouseX = e.clientX - stageRect.left;
|
||||
const mouseY = e.clientY - stageRect.top;
|
||||
|
||||
setMousePosition({
|
||||
x: mouseX,
|
||||
y: mouseY,
|
||||
});
|
||||
setLocalMousePosition({
|
||||
x: (mouseX - coords.x) / scale,
|
||||
y: (mouseY - coords.y) / scale,
|
||||
});
|
||||
};
|
||||
|
||||
const onMouseDown = () => {
|
||||
setDragging(true);
|
||||
|
||||
const blockX = Math.floor(localMousePosition.x / 16);
|
||||
const blockY = Math.floor(localMousePosition.y / 16);
|
||||
const updatedBlocks = blocks.filter((b) => !(b.x === blockX && b.y === blockY));
|
||||
|
||||
switch (tool) {
|
||||
case "hand":
|
||||
setCssCursor("grabbing");
|
||||
break;
|
||||
case "pencil": {
|
||||
setBlocks([
|
||||
...updatedBlocks,
|
||||
{
|
||||
name: selectedBlock,
|
||||
x: blockX,
|
||||
y: blockY,
|
||||
},
|
||||
]);
|
||||
break;
|
||||
}
|
||||
case "eraser":
|
||||
setBlocks(updatedBlocks);
|
||||
break;
|
||||
}
|
||||
};
|
||||
|
||||
const onMouseUp = () => {
|
||||
setDragging(false);
|
||||
setCssCursor(tool === "hand" ? "grab" : "pointer");
|
||||
};
|
||||
|
||||
const onWheel = (e: React.WheelEvent) => {
|
||||
e.preventDefault();
|
||||
|
||||
const scaleChange = e.deltaY > 0 ? -0.1 : 0.1;
|
||||
const newScale = Math.min(Math.max(scale + scaleChange * scale, 0.25), 32);
|
||||
|
||||
setScale(newScale);
|
||||
setCoords({
|
||||
x: mousePosition.x - localMousePosition.x * newScale,
|
||||
y: mousePosition.y - localMousePosition.y * newScale,
|
||||
});
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
const resizeCanvas = () => {
|
||||
if (stageContainerRef.current) {
|
||||
setStageSize({
|
||||
width: stageContainerRef.current.offsetWidth,
|
||||
height: stageContainerRef.current.offsetHeight,
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
resizeCanvas();
|
||||
window.addEventListener("resize", resizeCanvas);
|
||||
|
||||
const loadSpritesheet = async () => {
|
||||
const sheet = new PIXI.Spritesheet(PIXI.BaseTexture.from("/blocks/programmer-art/spritesheet.png"), spritesheet);
|
||||
await sheet.parse();
|
||||
setTextures(sheet.textures);
|
||||
};
|
||||
loadSpritesheet();
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<main className="h-screen grid grid-rows-[2.5rem_1fr] grid-cols-[2.5rem_1fr]">
|
||||
<Menubar className="rounded-none border-t-0 border-x-0 col-span-2">
|
||||
<MenubarMenu>
|
||||
<a href="https://github.com/trafficlunar/blockmatic" className="ml-4 mr-2">
|
||||
blockmatic
|
||||
</a>
|
||||
|
||||
<MenubarTrigger>File</MenubarTrigger>
|
||||
<MenubarContent>
|
||||
<MenubarItem>Open Schematic</MenubarItem>
|
||||
<MenubarItem>Open Image</MenubarItem>
|
||||
|
||||
<MenubarSeparator />
|
||||
|
||||
<MenubarSub>
|
||||
<MenubarSubTrigger>Export to...</MenubarSubTrigger>
|
||||
<MenubarSubContent>
|
||||
<MenubarItem>.schematic</MenubarItem>
|
||||
<MenubarItem>.litematic</MenubarItem>
|
||||
<MenubarItem>image</MenubarItem>
|
||||
</MenubarSubContent>
|
||||
</MenubarSub>
|
||||
</MenubarContent>
|
||||
</MenubarMenu>
|
||||
|
||||
<MenubarMenu>
|
||||
<MenubarTrigger>More</MenubarTrigger>
|
||||
<MenubarContent>
|
||||
<ThemeChanger />
|
||||
</MenubarContent>
|
||||
</MenubarMenu>
|
||||
</Menubar>
|
||||
|
||||
<ToggleGroup
|
||||
type="single"
|
||||
value={tool}
|
||||
onValueChange={onToolChange}
|
||||
className="flex flex-col justify-start py-1 border-r border-zinc-200 dark:border-zinc-800 bg-white dark:bg-zinc-950"
|
||||
>
|
||||
<ToggleGroupItem value="hand" className="!p-0 !h-8 !min-w-8">
|
||||
<Hand />
|
||||
</ToggleGroupItem>
|
||||
<ToggleGroupItem value="pencil" className="!p-0 !h-8 !min-w-8">
|
||||
<Pencil />
|
||||
</ToggleGroupItem>
|
||||
<ToggleGroupItem value="eraser" className="!p-0 !h-8 !min-w-8">
|
||||
<Eraser />
|
||||
</ToggleGroupItem>
|
||||
</ToggleGroup>
|
||||
|
||||
<div ref={stageContainerRef} className="relative w-full h-full">
|
||||
<Stage
|
||||
width={stageSize.width}
|
||||
height={stageSize.height}
|
||||
onMouseMove={onMouseMove}
|
||||
onMouseDown={onMouseDown}
|
||||
onMouseUp={onMouseUp}
|
||||
onWheel={onWheel}
|
||||
style={{ cursor: cssCursor }}
|
||||
>
|
||||
<Container x={coords.x} y={coords.y} scale={scale}>
|
||||
{textures && <Blocks blocks={blocks} setBlocks={setBlocks} textures={textures} />}
|
||||
<Cursor localMousePosition={localMousePosition} />
|
||||
</Container>
|
||||
</Stage>
|
||||
|
||||
<CursorInformation localMousePosition={localMousePosition} blocks={blocks} />
|
||||
</div>
|
||||
</main>
|
||||
<TexturesProvider>
|
||||
<ToolProvider>
|
||||
<main className="h-screen grid grid-rows-[2.5rem_1fr] grid-cols-[2.5rem_1fr]">
|
||||
<Menubar />
|
||||
<Toolbar />
|
||||
<Canvas />
|
||||
</main>
|
||||
</ToolProvider>
|
||||
</TexturesProvider>
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
|
||||
|
Before Width: | Height: | Size: 4 KiB |
82
src/components/Blocks.tsx
Normal file
82
src/components/Blocks.tsx
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
import { useEffect } from "react";
|
||||
import { Sprite } from "@pixi/react";
|
||||
|
||||
import blocksData from "@/data/blocks/programmer-art/average_colors.json";
|
||||
import welcomeBlocksData from "@/data/welcome.json";
|
||||
import { Texture } from "pixi.js";
|
||||
|
||||
interface Props {
|
||||
blocks: Block[];
|
||||
setBlocks: React.Dispatch<React.SetStateAction<Block[]>>;
|
||||
textures: Record<string, Texture>;
|
||||
}
|
||||
|
||||
function Blocks({ blocks, setBlocks, textures }: Props) {
|
||||
const findClosestBlock = (r: number, g: number, b: number, a: number) => {
|
||||
let closestBlock = "";
|
||||
let closestDistance = Infinity;
|
||||
|
||||
Object.entries(blocksData).forEach(([block, rgba]) => {
|
||||
const distance = Math.sqrt(Math.pow(r - rgba[0], 2) + Math.pow(g - rgba[1], 2) + Math.pow(b - rgba[2], 2) + Math.pow(a - rgba[3], 3));
|
||||
if (distance < closestDistance) {
|
||||
closestDistance = distance;
|
||||
closestBlock = block;
|
||||
}
|
||||
});
|
||||
|
||||
return closestBlock;
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
// // TESTING: convert image to blocks
|
||||
// const image = new Image();
|
||||
// image.src = "/bliss.png";
|
||||
// image.addEventListener("load", () => {
|
||||
// const canvas = document.createElement("canvas");
|
||||
// const ctx = canvas.getContext("2d");
|
||||
|
||||
// if (ctx) {
|
||||
// canvas.width = image.width;
|
||||
// canvas.height = image.height;
|
||||
// ctx.drawImage(image, 0, 0, image.width / 4, image.height / 4);
|
||||
|
||||
// const imageData = ctx.getImageData(0, 0, image.width / 4, image.height / 4);
|
||||
// const newBlocks: Block[] = [];
|
||||
|
||||
// for (let i = 0; i < imageData.data.length; i += 4) {
|
||||
// const block = findClosestBlock(imageData.data[i], imageData.data[i + 1], imageData.data[i + 2], imageData.data[i + 3]);
|
||||
|
||||
// const x = Math.floor((i / 4) % imageData.width);
|
||||
// const y = Math.floor(i / 4 / imageData.width);
|
||||
|
||||
// newBlocks.push({
|
||||
// name: block,
|
||||
// x,
|
||||
// y,
|
||||
// });
|
||||
// }
|
||||
|
||||
// setBlocks(newBlocks);
|
||||
// }
|
||||
// });
|
||||
|
||||
setBlocks(welcomeBlocksData);
|
||||
console.log(textures)
|
||||
}, [textures]);
|
||||
|
||||
return (
|
||||
<>
|
||||
{blocks.map((block, index) => {
|
||||
const texture = textures[block.name];
|
||||
if (!texture) {
|
||||
console.warn(`Texture not found for block: ${block.name}`);
|
||||
return null;
|
||||
}
|
||||
|
||||
return <Sprite key={index} texture={texture} x={block.x * 16} y={block.y * 16} />;
|
||||
})}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
export default Blocks;
|
||||
146
src/components/Canvas.tsx
Normal file
146
src/components/Canvas.tsx
Normal file
|
|
@ -0,0 +1,146 @@
|
|||
import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
|
||||
import { Container, Stage } from "@pixi/react";
|
||||
import * as PIXI from "pixi.js";
|
||||
|
||||
import { ToolContext } from "@/context/ToolContext";
|
||||
import { TexturesContext } from "@/context/TexturesContext";
|
||||
|
||||
import Blocks from "./Blocks";
|
||||
import Cursor from "./Cursor";
|
||||
import CursorInformation from "./CursorInformation";
|
||||
|
||||
// Set scale mode to NEAREST
|
||||
PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST;
|
||||
|
||||
function Canvas() {
|
||||
const { tool, selectedBlock } = useContext(ToolContext);
|
||||
const textures = useContext(TexturesContext);
|
||||
|
||||
const stageContainerRef = useRef<HTMLDivElement>(null);
|
||||
const [stageSize, setStageSize] = useState({ width: 0, height: 0 });
|
||||
|
||||
const [coords, setCoords] = useState<Position>({ x: 0, y: 0 });
|
||||
const [scale, setScale] = useState(1);
|
||||
|
||||
const [mouseCoords, setMouseCoords] = useState<Position>({ x: 0, y: 0 });
|
||||
const [dragging, setDragging] = useState(false);
|
||||
|
||||
const [blocks, setBlocks] = useState<Block[]>([]);
|
||||
|
||||
const updatedBlocks = useMemo(() => {
|
||||
return blocks.filter((b) => !(b.x === mouseCoords.x && b.y === mouseCoords.y));
|
||||
}, [blocks, mouseCoords]);
|
||||
|
||||
const onToolUse = useCallback(() => {
|
||||
switch (tool) {
|
||||
case "pencil": {
|
||||
setBlocks([
|
||||
...updatedBlocks,
|
||||
{
|
||||
name: selectedBlock,
|
||||
x: mouseCoords.x,
|
||||
y: mouseCoords.y,
|
||||
},
|
||||
]);
|
||||
break;
|
||||
}
|
||||
case "eraser":
|
||||
setBlocks(updatedBlocks);
|
||||
break;
|
||||
}
|
||||
}, [tool, mouseCoords, selectedBlock, updatedBlocks]);
|
||||
|
||||
const onMouseMove = useCallback(
|
||||
(e: React.MouseEvent) => {
|
||||
if (dragging) {
|
||||
if (tool === "hand") {
|
||||
setCoords((prevCoords) => ({
|
||||
x: prevCoords.x + e.movementX,
|
||||
y: prevCoords.y + e.movementY,
|
||||
}));
|
||||
}
|
||||
onToolUse();
|
||||
}
|
||||
|
||||
if (!stageContainerRef.current) return;
|
||||
|
||||
const rect = stageContainerRef.current.getBoundingClientRect();
|
||||
const mouseX = e.clientX - rect.left;
|
||||
const mouseY = e.clientY - rect.top;
|
||||
|
||||
setMouseCoords({
|
||||
x: Math.floor((mouseX - coords.x) / (16 * scale)),
|
||||
y: Math.floor((mouseY - coords.y) / (16 * scale)),
|
||||
});
|
||||
},
|
||||
[dragging, coords, scale, tool, onToolUse]
|
||||
);
|
||||
|
||||
const onMouseDown = useCallback(() => {
|
||||
setDragging(true);
|
||||
onToolUse();
|
||||
}, [onToolUse]);
|
||||
|
||||
const onMouseUp = () => {
|
||||
setDragging(false);
|
||||
};
|
||||
|
||||
const onWheel = useCallback(
|
||||
(e: React.WheelEvent) => {
|
||||
e.preventDefault();
|
||||
|
||||
// if (!stageContainerRef.current) return;
|
||||
|
||||
// const rect = stageContainerRef.current.getBoundingClientRect();
|
||||
// const mouseX = e.clientX - rect.left;
|
||||
// const mouseY = e.clientY - rect.top;
|
||||
|
||||
const scaleChange = e.deltaY > 0 ? -0.1 : 0.1;
|
||||
const newScale = Math.min(Math.max(scale + scaleChange * scale, 0.25), 32);
|
||||
|
||||
setScale(newScale);
|
||||
// setCoords({
|
||||
// x: -(mouseX * scale) + e.clientX,
|
||||
// y: -(mouseY * scale) + e.clientY,
|
||||
// });
|
||||
},
|
||||
[scale]
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
const resizeCanvas = () => {
|
||||
if (stageContainerRef.current) {
|
||||
setStageSize({
|
||||
width: stageContainerRef.current.offsetWidth,
|
||||
height: stageContainerRef.current.offsetHeight,
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
resizeCanvas();
|
||||
window.addEventListener("resize", resizeCanvas);
|
||||
return () => window.removeEventListener("resize", resizeCanvas);
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<div ref={stageContainerRef} className="relative w-full h-full">
|
||||
<Stage
|
||||
width={stageSize.width}
|
||||
height={stageSize.height}
|
||||
onMouseMove={onMouseMove}
|
||||
onMouseDown={onMouseDown}
|
||||
onMouseUp={onMouseUp}
|
||||
onWheel={onWheel}
|
||||
>
|
||||
<Container x={coords.x} y={coords.y} scale={scale}>
|
||||
<Blocks blocks={blocks} setBlocks={setBlocks} textures={textures} />
|
||||
<Cursor mouseCoords={mouseCoords} />
|
||||
</Container>
|
||||
</Stage>
|
||||
|
||||
<CursorInformation mouseCoords={mouseCoords} blocks={blocks} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default Canvas;
|
||||
21
src/components/Cursor.tsx
Normal file
21
src/components/Cursor.tsx
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
import { Graphics } from "@pixi/react";
|
||||
|
||||
interface Props {
|
||||
mouseCoords: Position
|
||||
}
|
||||
|
||||
function Cursor({ mouseCoords }: Props) {
|
||||
return (
|
||||
<Graphics
|
||||
x={mouseCoords.x * 16}
|
||||
y={mouseCoords.y * 16}
|
||||
draw={(g) => {
|
||||
g.clear();
|
||||
g.lineStyle(1, 0xffffff, 1);
|
||||
g.drawRect(0, 0, 16, 16);
|
||||
}}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
export default Cursor;
|
||||
|
|
@ -1,22 +1,22 @@
|
|||
import { useEffect, useState } from "react";
|
||||
|
||||
function CursorInformation({ localMousePosition, blocks }: { localMousePosition: Position; blocks: Block[] }) {
|
||||
const [position, setPosition] = useState({ x: 0, y: 0 });
|
||||
interface Props {
|
||||
mouseCoords: Position;
|
||||
blocks: Block[];
|
||||
}
|
||||
|
||||
function CursorInformation({ mouseCoords, blocks }: Props) {
|
||||
const [position, setPosition] = useState<Position>({ x: 0, y: 0 });
|
||||
const [block, setBlock] = useState<Block>();
|
||||
|
||||
useEffect(() => {
|
||||
if (localMousePosition) {
|
||||
const x = Math.floor(localMousePosition.x / 16);
|
||||
const y = Math.floor(localMousePosition.y / 16);
|
||||
setPosition({
|
||||
x: mouseCoords.x,
|
||||
y: mouseCoords.y,
|
||||
});
|
||||
|
||||
setPosition({
|
||||
x,
|
||||
y,
|
||||
});
|
||||
|
||||
setBlock(blocks.find((b) => b.x === x && b.y === y));
|
||||
}
|
||||
}, [localMousePosition]);
|
||||
setBlock(blocks.find((b) => b.x === mouseCoords.x && b.y === mouseCoords.y));
|
||||
}, [mouseCoords]);
|
||||
|
||||
return (
|
||||
<div className="absolute left-4 bottom-4 flex flex-col gap-1">
|
||||
32
src/components/Toolbar.tsx
Normal file
32
src/components/Toolbar.tsx
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
import { useContext } from "react";
|
||||
import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
|
||||
import { Eraser, Hand, Pencil } from "lucide-react";
|
||||
|
||||
import { ToolContext } from "@/context/ToolContext";
|
||||
|
||||
function Toolbar() {
|
||||
const { tool, setTool } = useContext(ToolContext);
|
||||
|
||||
const onToolChange = (value: string) => setTool(value as Tool);
|
||||
|
||||
return (
|
||||
<ToggleGroup
|
||||
type="single"
|
||||
value={tool}
|
||||
onValueChange={onToolChange}
|
||||
className="flex flex-col justify-start py-1 border-r border-zinc-200 dark:border-zinc-800 bg-white dark:bg-zinc-950"
|
||||
>
|
||||
<ToggleGroupItem value="hand" className="!p-0 !h-8 !min-w-8">
|
||||
<Hand />
|
||||
</ToggleGroupItem>
|
||||
<ToggleGroupItem value="pencil" className="!p-0 !h-8 !min-w-8">
|
||||
<Pencil />
|
||||
</ToggleGroupItem>
|
||||
<ToggleGroupItem value="eraser" className="!p-0 !h-8 !min-w-8">
|
||||
<Eraser />
|
||||
</ToggleGroupItem>
|
||||
</ToggleGroup>
|
||||
);
|
||||
}
|
||||
|
||||
export default Toolbar;
|
||||
|
|
@ -1,83 +0,0 @@
|
|||
import { useEffect } from "react";
|
||||
import { Texture } from "pixi.js";
|
||||
import { Sprite } from "@pixi/react";
|
||||
|
||||
import blocksData from "@/lib/data/blocks/programmer-art/average_colors.json";
|
||||
import welcomeBlocksData from "@/lib/data/welcome.json";
|
||||
|
||||
function Blocks({
|
||||
blocks,
|
||||
setBlocks,
|
||||
textures,
|
||||
}: {
|
||||
blocks: Block[];
|
||||
setBlocks: React.Dispatch<React.SetStateAction<Block[]>>;
|
||||
textures: Record<string, Texture>;
|
||||
}) {
|
||||
const findClosestBlock = (r: number, g: number, b: number, a: number) => {
|
||||
let closestBlock = "";
|
||||
let closestDistance = Infinity;
|
||||
|
||||
Object.entries(blocksData).forEach(([block, rgba]) => {
|
||||
const distance = Math.sqrt(Math.pow(r - rgba[0], 2) + Math.pow(g - rgba[1], 2) + Math.pow(b - rgba[2], 2) + Math.pow(a - rgba[3], 3));
|
||||
if (distance < closestDistance) {
|
||||
closestDistance = distance;
|
||||
closestBlock = block;
|
||||
}
|
||||
});
|
||||
|
||||
return closestBlock;
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
// TESTING: convert image to blocks
|
||||
const image = new Image();
|
||||
image.src = "/bliss.png";
|
||||
image.addEventListener("load", () => {
|
||||
const canvas = document.createElement("canvas");
|
||||
const ctx = canvas.getContext("2d");
|
||||
|
||||
if (ctx) {
|
||||
canvas.width = image.width;
|
||||
canvas.height = image.height;
|
||||
ctx.drawImage(image, 0, 0, image.width / 4, image.height / 4);
|
||||
|
||||
const imageData = ctx.getImageData(0, 0, image.width / 4, image.height / 4);
|
||||
const newBlocks: Block[] = [];
|
||||
|
||||
for (let i = 0; i < imageData.data.length; i += 4) {
|
||||
const block = findClosestBlock(imageData.data[i], imageData.data[i + 1], imageData.data[i + 2], imageData.data[i + 3]);
|
||||
|
||||
const x = Math.floor((i / 4) % imageData.width);
|
||||
const y = Math.floor(i / 4 / imageData.width);
|
||||
|
||||
newBlocks.push({
|
||||
name: block,
|
||||
x,
|
||||
y,
|
||||
});
|
||||
}
|
||||
|
||||
setBlocks(newBlocks);
|
||||
}
|
||||
});
|
||||
|
||||
setBlocks(welcomeBlocksData);
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<>
|
||||
{blocks.map((block, index) => {
|
||||
const texture = textures[block.name];
|
||||
if (!texture) {
|
||||
console.warn(`Texture not found for block: ${block.name}`);
|
||||
return null;
|
||||
}
|
||||
|
||||
return <Sprite key={index} texture={texture} x={block.x * 16} y={block.y * 16} />;
|
||||
})}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
export default Blocks;
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
import { useEffect, useState } from "react";
|
||||
import { Graphics } from "@pixi/react";
|
||||
|
||||
function Cursor({ localMousePosition }: { localMousePosition: Position }) {
|
||||
const [position, setPosition] = useState({ x: 0, y: 0 });
|
||||
|
||||
useEffect(() => {
|
||||
if (localMousePosition) {
|
||||
const x = Math.floor(localMousePosition.x / 16) * 16;
|
||||
const y = Math.floor(localMousePosition.y / 16) * 16;
|
||||
|
||||
setPosition({ x, y });
|
||||
}
|
||||
}, [localMousePosition]);
|
||||
|
||||
return (
|
||||
<Graphics
|
||||
x={position.x}
|
||||
y={position.y}
|
||||
draw={(g) => {
|
||||
g.clear();
|
||||
g.lineStyle(1, 0xffffff, 1);
|
||||
g.drawRect(0, 0, 16, 16);
|
||||
}}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
export default Cursor;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
import { MenubarRadioGroup, MenubarRadioItem, MenubarSub, MenubarSubContent, MenubarSubTrigger } from '@/components/ui/menubar';
|
||||
import { useTheme } from '../theme-provider';
|
||||
import { useTheme } from '@/context/ThemeContext';
|
||||
|
||||
function ThemeChanger() {
|
||||
const { setTheme, theme } = useTheme();
|
||||
|
|
@ -8,7 +8,7 @@ function ThemeChanger() {
|
|||
<MenubarSub>
|
||||
<MenubarSubTrigger>Set theme...</MenubarSubTrigger>
|
||||
<MenubarSubContent>
|
||||
<MenubarRadioGroup value={theme} onValueChange={(value) => setTheme(value)}>
|
||||
<MenubarRadioGroup value={theme} onValueChange={(value) => setTheme(value as Theme)}>
|
||||
<MenubarRadioItem value='light'>Light</MenubarRadioItem>
|
||||
<MenubarRadioItem value='dark'>Dark</MenubarRadioItem>
|
||||
<MenubarRadioItem value='system'>System</MenubarRadioItem>
|
||||
51
src/components/menubar/index.tsx
Normal file
51
src/components/menubar/index.tsx
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
import {
|
||||
Menubar as UIMenubar,
|
||||
MenubarContent,
|
||||
MenubarItem,
|
||||
MenubarMenu,
|
||||
MenubarSeparator,
|
||||
MenubarSub,
|
||||
MenubarSubContent,
|
||||
MenubarSubTrigger,
|
||||
MenubarTrigger,
|
||||
} from "@/components/ui/menubar";
|
||||
|
||||
import ThemeChanger from "./ThemeChanger";
|
||||
|
||||
function Menubar() {
|
||||
return (
|
||||
<UIMenubar className="rounded-none border-t-0 border-x-0 col-span-2">
|
||||
<MenubarMenu>
|
||||
<a href="https://github.com/trafficlunar/blockmatic" className="ml-4 mr-2">
|
||||
blockmatic
|
||||
</a>
|
||||
|
||||
<MenubarTrigger>File</MenubarTrigger>
|
||||
<MenubarContent>
|
||||
<MenubarItem>Open Schematic</MenubarItem>
|
||||
<MenubarItem>Open Image</MenubarItem>
|
||||
|
||||
<MenubarSeparator />
|
||||
|
||||
<MenubarSub>
|
||||
<MenubarSubTrigger>Export to...</MenubarSubTrigger>
|
||||
<MenubarSubContent>
|
||||
<MenubarItem>.schematic</MenubarItem>
|
||||
<MenubarItem>.litematic</MenubarItem>
|
||||
<MenubarItem>image</MenubarItem>
|
||||
</MenubarSubContent>
|
||||
</MenubarSub>
|
||||
</MenubarContent>
|
||||
</MenubarMenu>
|
||||
|
||||
<MenubarMenu>
|
||||
<MenubarTrigger>More</MenubarTrigger>
|
||||
<MenubarContent>
|
||||
<ThemeChanger />
|
||||
</MenubarContent>
|
||||
</MenubarMenu>
|
||||
</UIMenubar>
|
||||
);
|
||||
}
|
||||
|
||||
export default Menubar;
|
||||
29
src/context/TexturesContext.tsx
Normal file
29
src/context/TexturesContext.tsx
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
import { createContext, ReactNode, useEffect, useState } from "react";
|
||||
import { BaseTexture, Spritesheet, Texture } from "pixi.js";
|
||||
|
||||
import spritesheet from "@/data/blocks/programmer-art/spritesheet.json";
|
||||
|
||||
interface Props {
|
||||
children: ReactNode;
|
||||
}
|
||||
|
||||
export const TexturesContext = createContext({} as Record<string, Texture>);
|
||||
|
||||
export const TexturesProvider = ({ children }: Props) => {
|
||||
const [textures, setTextures] = useState<Record<string, Texture>>({});
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
const sheet = new Spritesheet(BaseTexture.from("/blocks/programmer-art/spritesheet.png"), spritesheet);
|
||||
sheet.parse().then((t) => {
|
||||
setTextures(t);
|
||||
setLoaded(true);
|
||||
});
|
||||
}, []);
|
||||
|
||||
if (!loaded) {
|
||||
return <h1>Loading...</h1>;
|
||||
}
|
||||
|
||||
return <TexturesContext.Provider value={textures}>{children}</TexturesContext.Provider>;
|
||||
};
|
||||
|
|
@ -1,7 +1,5 @@
|
|||
import { createContext, useContext, useEffect, useState } from "react";
|
||||
|
||||
type Theme = "dark" | "light" | "system";
|
||||
|
||||
type ThemeProviderProps = {
|
||||
children: React.ReactNode;
|
||||
defaultTheme?: Theme;
|
||||
19
src/context/ToolContext.tsx
Normal file
19
src/context/ToolContext.tsx
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
import { createContext, ReactNode, useState } from "react";
|
||||
|
||||
interface Props {
|
||||
children: ReactNode;
|
||||
}
|
||||
|
||||
export const ToolContext = createContext({
|
||||
tool: "hand" as Tool,
|
||||
selectedBlock: "stone",
|
||||
setTool: (tool: Tool) => {},
|
||||
setSelectedBlock: (block: string) => {},
|
||||
});
|
||||
|
||||
export const ToolProvider = ({ children }: Props) => {
|
||||
const [tool, setTool] = useState<Tool>("hand");
|
||||
const [selectedBlock, setSelectedBlock] = useState("stone");
|
||||
|
||||
return <ToolContext.Provider value={{ tool, selectedBlock, setTool, setSelectedBlock }}>{children}</ToolContext.Provider>;
|
||||
};
|
||||
|
|
@ -2,7 +2,7 @@ import { StrictMode } from 'react'
|
|||
import { createRoot } from 'react-dom/client'
|
||||
import './index.css'
|
||||
import App from './App.tsx'
|
||||
import { ThemeProvider } from './components/theme-provider.tsx'
|
||||
import { ThemeProvider } from '@/context/ThemeContext.tsx';
|
||||
|
||||
createRoot(document.getElementById('root')!).render(
|
||||
<StrictMode>
|
||||
|
|
|
|||
2
src/types.d.ts
vendored
2
src/types.d.ts
vendored
|
|
@ -1,3 +1,5 @@
|
|||
type Theme = "dark" | "light" | "system";
|
||||
|
||||
interface Position {
|
||||
x: number;
|
||||
y: number
|
||||
|
|
|
|||
Loading…
Reference in a new issue