Skip to content

Commit

Permalink
更新地图库
Browse files Browse the repository at this point in the history
  • Loading branch information
qiuxiang committed Oct 19, 2023
1 parent 6a2370e commit 86ed699
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"dev": "esbuild build.ts --format=cjs | node - dev"
},
"dependencies": {
"@canvaskit-tilemap/core": "^0.6.0",
"@canvaskit-tilemap/react": "^0.5.0",
"@canvaskit-map/core": "^0.0.1",
"@canvaskit-map/react": "^0.0.1",
"canvaskit-wasm": "^0.38.2",
"classnames": "^2.3.2",
"fflate": "^0.8.1",
Expand Down
2 changes: 1 addition & 1 deletion src/genshin-map/active-marker-layer.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DomLayer, MarkerLayer } from "@canvaskit-tilemap/react";
import { DomLayer, MarkerLayer } from "@canvaskit-map/react";
import classNames from "classnames";
import { useState } from "react";
import { useSnapshot } from "valtio";
Expand Down
2 changes: 1 addition & 1 deletion src/genshin-map/area-item-layer.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { MarkerLayer } from "@canvaskit-tilemap/react";
import { MarkerLayer } from "@canvaskit-map/react";
import classNames from "classnames";
import { useMemo } from "react";
import { useSnapshot } from "valtio";
Expand Down
2 changes: 1 addition & 1 deletion src/genshin-map/area-names-layer.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TextLayer } from "@canvaskit-tilemap/react";
import { TextLayer } from "@canvaskit-map/react";
import { useSnapshot } from "valtio";
import { zIndex } from ".";
import { store } from "../store";
Expand Down
6 changes: 3 additions & 3 deletions src/genshin-map/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TileLayer, Tilemap } from "@canvaskit-tilemap/react";
import { TileLayer, CanvaskitMap } from "@canvaskit-map/react";
import { CanvasKit } from "canvaskit-wasm";
import { useSnapshot } from "valtio";
import { store } from "../store";
Expand All @@ -19,7 +19,7 @@ export const zIndex = {
export function GenshinMap() {
const { activeAreaItems, mapInfo, canvaskit } = useSnapshot(store);
return (
<Tilemap
<CanvaskitMap
key={mapInfo.getId()}
canvaskit={canvaskit as CanvasKit}
className="absolute w-full h-full bg-gray-900"
Expand All @@ -46,6 +46,6 @@ export function GenshinMap() {
<UndergroundLayer />
<TeleportLayer />
<AreaNamesLayer />
</Tilemap>
</CanvaskitMap>
);
}
4 changes: 2 additions & 2 deletions src/genshin-map/mask-layer.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Layer } from "@canvaskit-tilemap/core";
import { CustomLayer } from "@canvaskit-tilemap/react";
import { Layer } from "@canvaskit-map/core";
import { CustomLayer } from "@canvaskit-map/react";
import { Canvas, Paint } from "canvaskit-wasm";
import { zIndex } from ".";

Expand Down
6 changes: 3 additions & 3 deletions src/genshin-map/state.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { MapClickEvent, MarkerItem, Tilemap } from "@canvaskit-tilemap/core";
import { MapClickEvent, MarkerItem, CanvaskitMap } from "@canvaskit-map/core";
import { proxy, ref } from "valtio";
import { proxySet } from "valtio/utils";
import { AreaItem, Marker, UndergroundMap } from "../data_pb";
Expand All @@ -10,7 +10,7 @@ export interface AreaItemMarker extends MarkerItem {
}

export const state = proxy({
tilemap: null as unknown as Tilemap,
tilemap: null as unknown as CanvaskitMap,
zoomLevel: 0,
undergroundEnabled: false,
activeUndergroundMap: null as UndergroundMap | null,
Expand All @@ -20,7 +20,7 @@ export const state = proxy({
marked: proxySet<number>(),
});

export async function onTilemapReady(tilemap: Tilemap) {
export async function onTilemapReady(tilemap: CanvaskitMap) {
state.tilemap = ref(tilemap);
onTilemapMove();
}
Expand Down
2 changes: 1 addition & 1 deletion src/genshin-map/underground-layer.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DomLayer, ImageLayer } from "@canvaskit-tilemap/react";
import { DomLayer, ImageLayer } from "@canvaskit-map/react";
import classNames from "classnames";
import { useMemo, useRef, useState } from "react";
import { useSnapshot } from "valtio";
Expand Down

0 comments on commit 86ed699

Please sign in to comment.