From 53f81040bed5745262014bc5c817ff0b5e5d9993 Mon Sep 17 00:00:00 2001 From: trafficlunar Date: Tue, 21 Jan 2025 20:38:11 +0000 Subject: [PATCH] refactor: move setting blocks to welcomeBlocksData to canvas context --- src/components/canvas/Blocks.tsx | 1 - src/components/canvas/Canvas.tsx | 4 ---- src/context/Canvas.tsx | 6 ++++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/components/canvas/Blocks.tsx b/src/components/canvas/Blocks.tsx index fe41974..b9fbb5b 100644 --- a/src/components/canvas/Blocks.tsx +++ b/src/components/canvas/Blocks.tsx @@ -35,7 +35,6 @@ function Blocks({ blocks, missingTexture, textures, coords, scale, version }: Pr useEffect(() => { const tilemap = new CompositeTilemap(); tilemapRef.current = tilemap; - tilemap.cullable = true; app.stage.addChildAt(tilemap, 0); tileBlocks(); diff --git a/src/components/canvas/Canvas.tsx b/src/components/canvas/Canvas.tsx index 6feb6eb..bc95716 100644 --- a/src/components/canvas/Canvas.tsx +++ b/src/components/canvas/Canvas.tsx @@ -20,8 +20,6 @@ import CanvasBorder from "./CanvasBorder"; import CursorInformation from "./information/Cursor"; import CanvasInformation from "./information/Canvas"; -import welcomeBlocksData from "@/data/welcome.json"; - // Set scale mode to NEAREST PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; @@ -460,8 +458,6 @@ function Canvas() { }, [stageContainerRef]); useEffect(() => { - setBlocks(welcomeBlocksData); - window.addEventListener("keydown", onKeyDown); window.addEventListener("keyup", onKeyUp); window.addEventListener("beforeunload", (e) => { diff --git a/src/context/Canvas.tsx b/src/context/Canvas.tsx index 6a3a67e..c9e112e 100644 --- a/src/context/Canvas.tsx +++ b/src/context/Canvas.tsx @@ -1,5 +1,7 @@ import React, { createContext, ReactNode, useMemo, useState } from "react"; +import welcomeBlocksData from "@/data/welcome.json"; + interface Context { stageSize: Dimension; canvasSize: BoundingBox; @@ -21,8 +23,8 @@ interface Props { export const CanvasContext = createContext({} as Context); export const CanvasProvider = ({ children }: Props) => { - const [stageSize, setStageSize] = useState({ width: 0, height: 0 } as Dimension); - const [blocks, setBlocks] = useState([]); + const [stageSize, setStageSize] = useState({ width: 0, height: 0 }); + const [blocks, setBlocks] = useState(welcomeBlocksData); const [coords, setCoords] = useState({ x: 0, y: 0 }); const [scale, setScale] = useState(1); const [version, setVersion] = useState(1214);