Skip to content

Commit 8c1564b

Browse files
tritaotritao
committed
Split worker related code into a common worker folder.
1 parent ca8db18 commit 8c1564b

File tree

7 files changed

+41
-41
lines changed

7 files changed

+41
-41
lines changed

‎src/mapviewer/MapViewer.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { MapViewerRenderer } from "./MapViewerRenderer";
2424
import { MapViewerRendererType, createRenderer } from "./MapViewerRenderers";
2525
import { NpcSpawn } from "./data/npc/NpcSpawn";
2626
import { ObjSpawn } from "./data/obj/ObjSpawn";
27-
import { RenderDataWorkerPool } from "./worker/RenderDataWorkerPool";
27+
import { RenderDataWorkerPool } from "../worker/RenderDataWorkerPool";
2828

2929
const DEFAULT_RENDER_DISTANCE = isWallpaperEngine ? 512 : 128;
3030

‎src/mapviewer/MapViewerApp.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import { MapViewerContainer } from "./MapViewerContainer";
1313
import { WEBGL, getAvailableRenderers } from "./MapViewerRenderers";
1414
import { fetchNpcSpawns, getNpcSpawnsUrl } from "./data/npc/NpcSpawn";
1515
import { fetchObjSpawns } from "./data/obj/ObjSpawn";
16-
import { renderDataLoaderSerializer } from "./worker/RenderDataLoader";
17-
import { RenderDataWorkerPool } from "./worker/RenderDataWorkerPool";
16+
import { renderDataLoaderSerializer } from "../worker/RenderDataLoader";
17+
import { RenderDataWorkerPool } from "../worker/RenderDataWorkerPool";
1818

1919
registerSerializer(renderDataLoaderSerializer);
2020

‎src/mapviewer/webgl/loader/SdMapDataLoader.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import { LocEntity } from "../../../rs/scene/entity/LocEntity";
1111
import { TextureLoader } from "../../../rs/texture/TextureLoader";
1212
import { NpcSpawn, getMapNpcSpawns } from "../../data/npc/NpcSpawn";
1313
import { ObjSpawn, getMapObjSpawns } from "../../data/obj/ObjSpawn";
14-
import { loadMinimapBlob } from "../../worker/MinimapData";
15-
import { RenderDataLoader, RenderDataResult } from "../../worker/RenderDataLoader";
16-
import { WorkerState } from "../../worker/RenderDataWorker";
14+
import { loadMinimapBlob } from "../../../worker/MinimapData";
15+
import { RenderDataLoader, RenderDataResult } from "../../../worker/RenderDataLoader";
16+
import { WorkerState } from "../../../worker/RenderDataWorker";
1717
import { AnimationFrames } from "../AnimationFrames";
1818
import { DrawRange, NULL_DRAW_RANGE, newDrawRange } from "../DrawRange";
1919
import { InteractType } from "../InteractType";

‎src/mapviewer/worker/MinimapData.ts‎ renamed to ‎src/worker/MinimapData.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { CacheInfo } from "../../rs/cache/CacheInfo";
2-
import { MapImageRenderer } from "../../rs/map/MapImageRenderer";
3-
import { Scene } from "../../rs/scene/Scene";
1+
import { CacheInfo } from "../rs/cache/CacheInfo";
2+
import { MapImageRenderer } from "../rs/map/MapImageRenderer";
3+
import { Scene } from "../rs/scene/Scene";
44

55
export type MinimapData = {
66
mapX: number;

‎src/mapviewer/worker/RenderDataLoader.ts‎ renamed to ‎src/worker/RenderDataLoader.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { SerializerImplementation } from "threads";
22

3-
import { SdMapDataLoader } from "../webgl/loader/SdMapDataLoader";
3+
import { SdMapDataLoader } from "../mapviewer/webgl/loader/SdMapDataLoader";
44
import { WorkerState } from "./RenderDataWorker";
55

66
export type RenderDataResult<T> = {

‎src/mapviewer/worker/RenderDataWorker.ts‎ renamed to ‎src/worker/RenderDataWorker.ts‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@ import { TransferDescriptor } from "threads";
33
import { registerSerializer } from "threads";
44
import { Transfer, expose } from "threads/worker";
55

6-
import { CacheSystem } from "../../rs/cache/CacheSystem";
7-
import { ConfigType } from "../../rs/cache/ConfigType";
8-
import { IndexType } from "../../rs/cache/IndexType";
6+
import { CacheSystem } from "../rs/cache/CacheSystem";
7+
import { ConfigType } from "../rs/cache/ConfigType";
8+
import { IndexType } from "../rs/cache/IndexType";
99
import {
1010
CacheLoaderFactory,
1111
getCacheLoaderFactory,
12-
} from "../../rs/cache/loader/CacheLoaderFactory";
13-
import { Bzip2 } from "../../rs/compression/Bzip2";
14-
import { Gzip } from "../../rs/compression/Gzip";
15-
import { BasTypeLoader } from "../../rs/config/bastype/BasTypeLoader";
16-
import { LocModelLoader } from "../../rs/config/loctype/LocModelLoader";
17-
import { LocTypeLoader } from "../../rs/config/loctype/LocTypeLoader";
18-
import { NpcModelLoader } from "../../rs/config/npctype/NpcModelLoader";
19-
import { NpcTypeLoader } from "../../rs/config/npctype/NpcTypeLoader";
20-
import { ObjModelLoader } from "../../rs/config/objtype/ObjModelLoader";
21-
import { ObjTypeLoader } from "../../rs/config/objtype/ObjTypeLoader";
22-
import { SeqTypeLoader } from "../../rs/config/seqtype/SeqTypeLoader";
23-
import { VarManager } from "../../rs/config/vartype/VarManager";
24-
import { getMapSquareId } from "../../rs/map/MapFileIndex";
25-
import { MapImageRenderer } from "../../rs/map/MapImageRenderer";
26-
import { SeqFrameLoader } from "../../rs/model/seq/SeqFrameLoader";
27-
import { SkeletalSeqLoader } from "../../rs/model/skeletal/SkeletalSeqLoader";
28-
import { Scene } from "../../rs/scene/Scene";
29-
import { LocLoadType, SceneBuilder } from "../../rs/scene/SceneBuilder";
30-
import { IndexedSprite } from "../../rs/sprite/IndexedSprite";
31-
import { SpriteLoader } from "../../rs/sprite/SpriteLoader";
32-
import { TextureLoader } from "../../rs/texture/TextureLoader";
33-
import { Hasher } from "../../util/Hasher";
34-
import { LoadedCache } from "../Caches";
35-
import { NpcSpawn } from "../data/npc/NpcSpawn";
36-
import { ObjSpawn } from "../data/obj/ObjSpawn";
12+
} from "../rs/cache/loader/CacheLoaderFactory";
13+
import { Bzip2 } from "../rs/compression/Bzip2";
14+
import { Gzip } from "../rs/compression/Gzip";
15+
import { BasTypeLoader } from "../rs/config/bastype/BasTypeLoader";
16+
import { LocModelLoader } from "../rs/config/loctype/LocModelLoader";
17+
import { LocTypeLoader } from "../rs/config/loctype/LocTypeLoader";
18+
import { NpcModelLoader } from "../rs/config/npctype/NpcModelLoader";
19+
import { NpcTypeLoader } from "../rs/config/npctype/NpcTypeLoader";
20+
import { ObjModelLoader } from "../rs/config/objtype/ObjModelLoader";
21+
import { ObjTypeLoader } from "../rs/config/objtype/ObjTypeLoader";
22+
import { SeqTypeLoader } from "../rs/config/seqtype/SeqTypeLoader";
23+
import { VarManager } from "../rs/config/vartype/VarManager";
24+
import { getMapSquareId } from "../rs/map/MapFileIndex";
25+
import { MapImageRenderer } from "../rs/map/MapImageRenderer";
26+
import { SeqFrameLoader } from "../rs/model/seq/SeqFrameLoader";
27+
import { SkeletalSeqLoader } from "../rs/model/skeletal/SkeletalSeqLoader";
28+
import { Scene } from "../rs/scene/Scene";
29+
import { LocLoadType, SceneBuilder } from "../rs/scene/SceneBuilder";
30+
import { IndexedSprite } from "../rs/sprite/IndexedSprite";
31+
import { SpriteLoader } from "../rs/sprite/SpriteLoader";
32+
import { TextureLoader } from "../rs/texture/TextureLoader";
33+
import { Hasher } from "../util/Hasher";
34+
import { LoadedCache } from "../mapviewer/Caches";
35+
import { NpcSpawn } from "../mapviewer/data/npc/NpcSpawn";
36+
import { ObjSpawn } from "../mapviewer/data/obj/ObjSpawn";
3737
import { MinimapData, loadMinimapBlob } from "./MinimapData";
3838
import { RenderDataLoader, renderDataLoaderSerializer } from "./RenderDataLoader";
3939

‎src/mapviewer/worker/RenderDataWorkerPool.ts‎ renamed to ‎src/worker/RenderDataWorkerPool.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { QueuedTask } from "threads/dist/master/pool";
33
import { WorkerDescriptor } from "threads/dist/master/pool-types";
44
import { ObservablePromise } from "threads/dist/observable-promise";
55

6-
import { LoadedCache } from "../Caches";
7-
import { NpcSpawn } from "../data/npc/NpcSpawn";
8-
import { ObjSpawn } from "../data/obj/ObjSpawn";
6+
import { LoadedCache } from "../mapviewer/Caches";
7+
import { NpcSpawn } from "../mapviewer/data/npc/NpcSpawn";
8+
import { ObjSpawn } from "../mapviewer/data/obj/ObjSpawn";
99
import { MinimapData } from "./MinimapData";
1010
import { RenderDataLoader } from "./RenderDataLoader";
1111
import { RenderDataWorker } from "./RenderDataWorker";

0 commit comments

Comments
 (0)