fix(single_mesh): fix single_mesh data sources

Fixes #702.
google · Jan 23, 2025 · 18da7fc · 18da7fc
1 parent f343058
commit 18da7fc
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 135 deletions.
diff --git a/src/datasource/index.ts b/src/datasource/index.ts
@@ -402,6 +402,7 @@ export class DataSourceRegistry extends RefCounted {
   ): Promise<DataSourceWithRedirectInfo> {
     const redirectLog = new Set<string>();
     let url: string = options.url;
+    url = url.trim();
     // Trim any trailing "|" characters.
     url = url.replace(/\|+$/, "");
     let originalCanonicalUrl: string | undefined;

diff --git a/src/datasource/obj/frontend.ts b/src/datasource/obj/frontend.ts
diff --git a/src/datasource/obj/register_default.ts b/src/datasource/obj/register_default.ts
@@ -19,8 +19,8 @@ import {
   registerProvider,
 } from "#src/datasource/default_provider.js";
 import { KvStoreBasedDataSourceLegacyUrlAdapter } from "#src/datasource/index.js";
-import { ObjDataSource } from "#src/datasource/obj/frontend.js";
+import { SingleMeshDataSource } from "#src/single_mesh/frontend.js";
 
-const provider = new ObjDataSource();
+const provider = new SingleMeshDataSource("obj", "Wavefront OBJ mesh");
 registerKvStoreBasedDataProvider(provider);
 registerProvider(new KvStoreBasedDataSourceLegacyUrlAdapter(provider));
diff --git a/src/datasource/vtk/frontend.ts b/src/datasource/vtk/frontend.ts
diff --git a/src/datasource/vtk/register_default.ts b/src/datasource/vtk/register_default.ts
@@ -19,8 +19,8 @@ import {
   registerProvider,
 } from "#src/datasource/default_provider.js";
 import { KvStoreBasedDataSourceLegacyUrlAdapter } from "#src/datasource/index.js";
-import { VtkDataSource } from "#src/datasource/vtk/frontend.js";
+import { SingleMeshDataSource } from "#src/single_mesh/frontend.js";
 
-const provider = new VtkDataSource();
+const provider = new SingleMeshDataSource("vtk", "VTK mesh");
 registerKvStoreBasedDataProvider(provider);
 registerProvider(new KvStoreBasedDataSourceLegacyUrlAdapter(provider));
diff --git a/src/single_mesh/frontend.ts b/src/single_mesh/frontend.ts
@@ -85,6 +85,16 @@ import {
   TextureFormat,
 } from "#src/webgl/texture_access.js";
 import { SharedObject } from "#src/worker_rpc.js";
+import type {
+  DataSource,
+  GetKvStoreBasedDataSourceOptions,
+  KvStoreBasedDataSourceProvider,
+} from "#src/datasource/index.js";
+import { ensureEmptyUrlSuffix } from "#src/kvstore/url.js";
+import {
+  makeCoordinateSpace,
+  makeIdentityTransform,
+} from "#src/coordinate_transform.js";
 
 const DEFAULT_FRAGMENT_MAIN = `void main() {
   emitGray();
@@ -681,3 +691,41 @@ export async function getSingleMeshSource(
     parameters: { meshSourceUrl: url, info },
   });
 }
+
+export class SingleMeshDataSource implements KvStoreBasedDataSourceProvider {
+  constructor(
+    public scheme: string,
+    public description: string,
+  ) {}
+
+  get singleFile() {
+    return true;
+  }
+
+  async get(options: GetKvStoreBasedDataSourceOptions): Promise<DataSource> {
+    ensureEmptyUrlSuffix(options.url);
+    const meshSource = await getSingleMeshSource(
+      options.registry.sharedKvStoreContext,
+      `${options.url.scheme}://${options.kvStoreUrl}`,
+      options,
+    );
+    const modelSpace = makeCoordinateSpace({
+      rank: 3,
+      names: ["x", "y", "z"],
+      units: ["m", "m", "m"],
+      scales: Float64Array.of(1e-9, 1e-9, 1e-9),
+    });
+    const dataSource: DataSource = {
+      canonicalUrl: `${options.kvStoreUrl}|${options.url.scheme}:`,
+      modelTransform: makeIdentityTransform(modelSpace),
+      subsources: [
+        {
+          id: "default",
+          default: true,
+          subsource: { singleMesh: meshSource },
+        },
+      ],
+    };
+    return dataSource;
+  }
+}