fix: GLTF DRACO decode bug (#141) (#164)

galacean · Apr 6, 2021 · 19a1f32 · 19a1f32
1 parent 58b9e27
commit 19a1f32
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/draco/src/worker/worker.js b/packages/draco/src/worker/worker.js
@@ -1,4 +1,4 @@
-let decoderPending;
+export default `let decoderPending;
 let decoderConfig;
 
 onmessage = function(e) {
@@ -72,7 +72,7 @@ function decodeGeometry(draco, decoder, decoderBuffer, taskConfig) {
     // A Draco file may be created with default vertex attributes, whose attribute IDs
     // are mapped 1:1 from their semantic name (POSITION, NORMAL, ...). Alternatively,
     // a Draco file may contain a custom set of attributes, identified by known unique
-    // IDs. glTF files always do the latter, and `.drc` files typically do the former.
+    // IDs. glTF files always do the latter, and .drc files typically do the former.
     if (taskConfig.useUniqueIDs) {
       attributeID = attributeIDs[attributeName];
       attribute = decoder.GetAttributeByUniqueId(dracoGeometry, attributeID);
@@ -107,6 +107,7 @@ function decodeGeometry(draco, decoder, decoderBuffer, taskConfig) {
         decoder.GetTrianglesUInt32Array(dracoGeometry, dataSize, ptr);
         index = new Uint32Array(draco.HEAPU32.buffer, ptr, numIndices).slice();
         draco._free(ptr);
+        break;
       default:
         throw new Error("DRACODecoder: Unexpected index type.");
     }
@@ -188,3 +189,4 @@ function decodeAttribute(draco, decoder, dracoGeometry, attributeName, attribute
     itemSize: numComponents
   };
 }
+`;
diff --git a/rollup.config.js b/rollup.config.js
@@ -35,7 +35,7 @@ const extensions = [".js", ".jsx", ".ts", ".tsx"];
 const commonPlugins = [
   resolve({ extensions, preferBuiltins: true }),
   glslify({
-    include: [/\.glsl$/, "packages/**/worker/**/*.js"]
+    include: [/\.glsl$/]
   }),
   babel({
     extensions,