trafficlunar/blockmatic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: re-add switching to eraser when using pencil tool with air block

Browse source
This commit is contained in:
trafficlunar 2025-02-07 17:18:25 +00:00
parent 58c30b22bf
commit e5aaf1486c
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/canvas/Canvas.tsx
View file

@ -45,7 +45,7 @@ function Canvas() {
const { settings } = useContext(SettingsContext); const { settings } = useContext(SettingsContext);
const { missingTexture } = useContext(TexturesContext); const { missingTexture } = useContext(TexturesContext);
const { isDark } = useContext(ThemeContext); const { isDark } = useContext(ThemeContext);
const { tool, radius, setTool } = useContext(ToolContext); const { tool, radius, selectedBlock, setTool } = useContext(ToolContext);
const textures = useTextures(version); const textures = useTextures(version);
const blockData = useBlockData(version); const blockData = useBlockData(version);
@ -125,8 +125,14 @@ function Canvas() {
eraser: eraserTool, eraser: eraserTool,
}; };
// Switch to eraser tool if selected block is air when using pencil
if (tool === "pencil" && selectedBlock === "air") {
eraserTool.use();
return;
}
tools[tool]?.use(); tools[tool]?.use();
}, [tool, moveTool, lassoTool, pencilTool, eraserTool, rectangleSelectTool]); }, [tool, selectedBlock, moveTool, lassoTool, pencilTool, eraserTool, rectangleSelectTool]);
const onMouseMove = useCallback( const onMouseMove = useCallback(
(e: React.MouseEvent) => { (e: React.MouseEvent) => {

5
src/hooks/tools/usePencilTool.ts
View file

@ -14,10 +14,7 @@ export function usePencilTool(mouseCoords: Position) {
const radiusPosition = useRadiusPosition(mouseCoords); const radiusPosition = useRadiusPosition(mouseCoords);
const use = () => { const use = () => {
// if (selectedBlock == "air") { if (selectedBlock == "air") return;
// eraseTool();
// break;
// }
const radiusBlocks: Block[] = []; const radiusBlocks: Block[] = [];
for (let x = 0; x < radius; x++) { for (let x = 0; x < radius; x++) {