@loaders.gl/draco 4.3.1 → 4.4.0-alpha.1

package/src/draco-writer.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import type {WriterWithEncoder, WriterOptions} from '@loaders.gl/loader-utils';
 import type {DracoMesh} from './lib/draco-types';
 import type {DracoBuildOptions} from './lib/draco-builder';
@@ -26,6 +30,22 @@ const DEFAULT_DRACO_WRITER_OPTIONS = {
   // }
 };
 
+/**
+ * Browser worker doesn't work because of issue during "draco_encoder.js" loading.
+ * Refused to execute script from 'https://raw.githubusercontent.com/google/draco/1.4.1/javascript/draco_encoder.js' because its MIME type ('') is not executable.
+ */
+export const DracoWriterWorker = {
+  id: 'draco-writer',
+  name: 'Draco compressed geometry writer',
+  module: 'draco',
+  version: VERSION,
+  worker: true,
+  options: {
+    draco: {},
+    source: null
+  }
+};
+
 /**
  * Exporter for Draco3D compressed geometries
  */
@@ -35,6 +55,7 @@ export const DracoWriter = {
   module: 'draco',
   version: VERSION,
   extensions: ['drc'],
+  mimeTypes: ['application/octet-stream'],
   options: {
     draco: DEFAULT_DRACO_WRITER_OPTIONS
   },

package/src/index.ts

@@ -1,61 +1,21 @@
 // loaders.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import type {LoaderWithParser} from '@loaders.gl/loader-utils';
-import type {DracoMesh, DracoLoaderData} from './lib/draco-types';
-import type {DracoLoaderOptions} from './draco-loader';
-import {DracoLoader as DracoWorkerLoader} from './draco-loader';
-import DracoParser from './lib/draco-parser';
-import {loadDracoDecoderModule} from './lib/draco-module-loader';
-import {VERSION} from './lib/utils/version';
 
 // Module constants
 export {DRACO_EXTERNAL_LIBRARIES, DRACO_EXTERNAL_LIBRARY_URLS} from './lib/draco-module-loader';
 
 // Draco data types
 
-export type {DracoMesh, DracoLoaderData};
+export type {DracoMesh, DracoLoaderData} from './lib/draco-types';
 
 // Draco Writer
 
 export type {DracoWriterOptions} from './draco-writer';
-export {DracoWriter} from './draco-writer';
-
-/**
- * Browser worker doesn't work because of issue during "draco_encoder.js" loading.
- * Refused to execute script from 'https://raw.githubusercontent.com/google/draco/1.4.1/javascript/draco_encoder.js' because its MIME type ('') is not executable.
- */
-export const DracoWriterWorker = {
-  id: 'draco-writer',
-  name: 'Draco compressed geometry writer',
-  module: 'draco',
-  version: VERSION,
-  worker: true,
-  options: {
-    draco: {},
-    source: null
-  }
-};
+export {DracoWriterWorker, DracoWriter} from './draco-writer';
 
 // Draco Loader
 
-export type {DracoLoaderOptions};
-export {DracoWorkerLoader};
-
-/**
- * Loader for Draco3D compressed geometries
- */
-export const DracoLoader = {
-  ...DracoWorkerLoader,
-  parse
-} as const satisfies LoaderWithParser<DracoMesh, never, DracoLoaderOptions>;
-
-async function parse(arrayBuffer: ArrayBuffer, options?: DracoLoaderOptions): Promise<DracoMesh> {
-  const {draco} = await loadDracoDecoderModule(options);
-  const dracoParser = new DracoParser(draco);
-  try {
-    return dracoParser.parseSync(arrayBuffer, options?.draco);
-  } finally {
-    dracoParser.destroy();
-  }
-}
+export type {DracoLoaderOptions} from './draco-loader';
+export {DracoWorkerLoader, DracoLoader} from './draco-loader';
+export {DracoArrowLoader} from './draco-arrow-loader';

package/src/lib/draco-parser.ts

@@ -25,7 +25,7 @@ import type {
   DracoOctahedronTransform
 } from './draco-types';
 
-import {getMeshBoundingBox} from '@loaders.gl/schema';
+import {getMeshBoundingBox} from '@loaders.gl/schema-utils';
 import {getDracoSchema} from './utils/get-draco-schema';
 
 /** Options to control draco parsing */
@@ -257,6 +257,7 @@ export default class DracoParser {
         case 'triangle-strip':
           return {
             topology: 'triangle-strip',
+            // TODO - mode is wrong?
             mode: 4, // GL.TRIANGLES
             attributes,
             indices: {
@@ -268,6 +269,7 @@ export default class DracoParser {
         default:
           return {
             topology: 'triangle-list',
+            // TODO - mode is wrong?
             mode: 5, // GL.TRIANGLE_STRIP
             attributes,
             indices: {

package/src/lib/utils/get-draco-schema.ts

@@ -1,4 +1,5 @@
-import {deduceMeshField, MeshAttribute, Schema, Field} from '@loaders.gl/schema';
+import {MeshAttribute, Schema, Field} from '@loaders.gl/schema';
+import {deduceMeshField} from '@loaders.gl/schema-utils';
 import type {DracoAttribute, DracoLoaderData, DracoMetadataEntry} from '../draco-types';
 
 /** Extract an arrow-like schema from a Draco mesh */