Skip to content

Commit 030bccf

Browse files
authored
refactor: relocating modules to fit the directory structure (#672)
Summary: Relocating modules to fit the directory structure
1 parent 67a087b commit 030bccf

24 files changed

Lines changed: 38 additions & 48 deletions

examples/volume_rendering/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import GUI from "lil-gui";
33
import { Idetik, OmeZarrImageSource, PerspectiveCamera, VolumeLayer } from "@";
44
import { createExplorationPolicy } from "@/core/image_source_policy";
55
import { OrbitControls } from "@/objects/cameras/orbit_controls";
6-
import type { ChannelProps } from "@/objects/textures/channel";
6+
import type { ChannelProps } from "@/core/channel";
77

88
const url =
99
"https://public.czbiohub.org/organelle_box/datasets/A549/organelle_box_crop_v1.zarr/CLTA/PFA/002000/";
Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
// TODO: move this file out of `textures`
2-
import { Color, ColorLike } from "../../core/color";
3-
import {
4-
Texture,
5-
textureDefaultValueRange,
6-
} from "../../objects/textures/texture";
7-
import { MAX_CHANNELS } from "../../core/constants";
8-
import { Logger } from "../../utilities/logger";
9-
import { clamp } from "../../utilities/clamp";
1+
import { Color, ColorLike } from "../math/color";
2+
import { Texture, textureDefaultValueRange } from "../objects/textures/texture";
3+
import { Logger } from "../utilities/logger";
4+
import { clamp } from "../utilities/clamp";
5+
6+
const MAX_CHANNELS = 32;
107

118
export type Channel = {
129
visible: boolean;

src/core/constants.ts

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/core/renderable_object.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { Node } from "../core/node";
22
import { Geometry } from "../core/geometry";
33
import { WireframeGeometry } from "../core/wireframe_geometry";
44
import { Texture } from "../objects/textures/texture";
5-
import { TrsTransform } from "../core/transforms";
5+
import { TrsTransform } from "../math/transforms";
66
import { Shader } from "../renderers/shaders";
7-
import { Color } from "../core/color";
7+
import { Color } from "../math/color";
88
import { CullingMode } from "../renderers/webgl_state";
99

1010
export abstract class RenderableObject extends Node {

src/core/renderer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Camera } from "../objects/cameras/camera";
2-
import { Color, ColorLike } from "./color";
2+
import { Color, ColorLike } from "../math/color";
33
import { Layer } from "./layer";
44
import { Viewport } from "./viewport";
55

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { ChunkSource } from "../data/chunk";
2-
import { ChunkQueue } from "../data/chunk_queue";
1+
import { ChunkSource } from "./chunk";
2+
import { ChunkQueue } from "./chunk_queue";
33

44
export type QueueStats = {
55
pending: number;
66
running: number;
77
};
88
import { ChunkStore } from "./chunk_store";
99
import { ChunkStoreView } from "./chunk_store_view";
10-
import { ImageSourcePolicy } from "./image_source_policy";
10+
import { ImageSourcePolicy } from "../core/image_source_policy";
1111

1212
export class ChunkManager {
1313
private readonly stores_ = new Map<ChunkSource, ChunkStore>();
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { Chunk, SourceDimensionMap, ChunkLoader } from "../data/chunk";
1+
import { Chunk, SourceDimensionMap, ChunkLoader } from "./chunk";
22
import { almostEqual } from "../utilities/almost_equal";
33
import { Logger } from "../utilities/logger";
44
import { ChunkStoreView } from "./chunk_store_view";
5-
import { ImageSourcePolicy } from "./image_source_policy";
5+
import { ImageSourcePolicy } from "../core/image_source_policy";
66

77
export class ChunkStore {
88
// Chunks indexed as chunks_[lod][t][c][z][y][x].
Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
import {
2-
Chunk,
3-
SliceCoordinates,
4-
ChunkViewState,
5-
coordToIndex,
6-
} from "../data/chunk";
1+
import { Chunk, SliceCoordinates, ChunkViewState, coordToIndex } from "./chunk";
72
import type { ChunkStore } from "./chunk_store";
8-
import { Viewport } from "./viewport";
3+
import { Viewport } from "../core/viewport";
94
import { OrthographicCamera } from "../objects/cameras/orthographic_camera";
10-
import { ImageSourcePolicy } from "./image_source_policy";
5+
import { ImageSourcePolicy } from "../core/image_source_policy";
116
import { ReadonlyVec2, vec2, vec3, mat4 } from "gl-matrix";
127
import { Box2 } from "../math/box2";
138
import { Box3 } from "../math/box3";

src/idetik.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { WebGLRenderer } from "./renderers/webgl_renderer";
22
import { createWebGPURenderer } from "./renderers/webgpu/webgpu_renderer";
33
import { Logger } from "./utilities/logger";
4-
import { ChunkManager } from "./core/chunk_manager";
4+
import { ChunkManager } from "./data/chunk_manager";
55
import { Renderer } from "./core/renderer";
66
import { createStats, type Stats } from "./utilities/stats";
77
import {

src/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export { ImageLayer } from "./layers/image_layer";
2525
export type { ImageLayerProps } from "./layers/image_layer";
2626
export { VolumeLayer } from "./layers/volume_layer";
2727
export type { Chunk, ChunkLoader, SliceCoordinates } from "./data/chunk";
28-
export type { QueueStats } from "./core/chunk_manager";
28+
export type { QueueStats } from "./data/chunk_manager";
2929
export { LabelLayer } from "./layers/label_layer";
3030
export type { LabelLayerProps } from "./layers/label_layer";
3131
export type { LabelColorMapProps } from "./objects/renderable/label_color_map";
@@ -63,9 +63,9 @@ export type {
6363
OmeroChannel,
6464
} from "./data/ome_zarr/metadata_loaders";
6565

66-
export { Color } from "./core/color";
67-
export type { ColorLike } from "./core/color";
68-
export type { ChannelProps, ChannelsEnabled } from "./objects/textures/channel";
66+
export { Color } from "./math/color";
67+
export type { ColorLike } from "./math/color";
68+
export type { ChannelProps, ChannelsEnabled } from "./core/channel";
6969

7070
export { Points } from "./objects/renderable/points";
7171
export { Texture2DArray } from "./objects/textures/texture_2d_array";

0 commit comments

Comments
 (0)