From 9b19d8518a9b2a27c48e9d934b4c9d6f621e455d Mon Sep 17 00:00:00 2001 From: bakedpotatolord Date: Tue, 8 Jul 2025 10:02:38 -0600 Subject: [PATCH 1/3] fix 3mf import --- src/ext/jszip.esm.js | 7 +++++++ src/load/3mf.js | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 src/ext/jszip.esm.js diff --git a/src/ext/jszip.esm.js b/src/ext/jszip.esm.js new file mode 100644 index 00000000..6327e69c --- /dev/null +++ b/src/ext/jszip.esm.js @@ -0,0 +1,7 @@ +/** Copyright Stewart Allen -- All Rights Reserved */ + +//import original library +import * as JSZip from "./jszip.js"; + +//export object attached to the window object +export default self.JSZip; \ No newline at end of file diff --git a/src/load/3mf.js b/src/load/3mf.js index a617c716..09fd0780 100644 --- a/src/load/3mf.js +++ b/src/load/3mf.js @@ -3,7 +3,7 @@ 'use strict'; import { THREE } from '../ext/three.js'; -import * as JSZip from '../ext/jszip.js'; +import JSZip from '../ext/jszip.esm.js'; let { BufferAttribute, Matrix4 } = THREE; @@ -218,7 +218,8 @@ function extractItems(records) { */ export function parseAsync(data) { return new Promise(async (resolve, reject) => { - let zip = await JSZip.default.loadAsync(data); + console.log(JSZip) + let zip = await JSZip.loadAsync(data); let models = {}; for (let [key, value] of Object.entries(zip.files)) { if (key.endsWith(".model")) { From e6a80bfb67b4117eb246febc548e785ab7dc8867 Mon Sep 17 00:00:00 2001 From: bakedpotatolord Date: Tue, 8 Jul 2025 10:04:02 -0600 Subject: [PATCH 2/3] remove console log --- src/load/3mf.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/load/3mf.js b/src/load/3mf.js index 09fd0780..49d676d0 100644 --- a/src/load/3mf.js +++ b/src/load/3mf.js @@ -218,7 +218,6 @@ function extractItems(records) { */ export function parseAsync(data) { return new Promise(async (resolve, reject) => { - console.log(JSZip) let zip = await JSZip.loadAsync(data); let models = {}; for (let [key, value] of Object.entries(zip.files)) { From 0c74dc03e63836dc3a84bb43db75cf7cad114196 Mon Sep 17 00:00:00 2001 From: bakedpotatolord Date: Tue, 8 Jul 2025 10:04:17 -0600 Subject: [PATCH 3/3] format --- src/ext/jszip.esm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ext/jszip.esm.js b/src/ext/jszip.esm.js index 6327e69c..58a5a1de 100644 --- a/src/ext/jszip.esm.js +++ b/src/ext/jszip.esm.js @@ -4,4 +4,4 @@ import * as JSZip from "./jszip.js"; //export object attached to the window object -export default self.JSZip; \ No newline at end of file +export default self.JSZip;