Merge branch 'node16' into main

Brakebein · Oct 4, 2022 · 875de15 · 875de15
2 parents 93463e5 + 7533bc3
commit 875de15
Show file tree

Hide file tree

Showing 12 changed files with 160 additions and 21 deletions.
diff --git a/build/index.cjs b/build/index.cjs
@@ -9,11 +9,13 @@ var node_url = require('node:url');
 var node_path = require('node:path');
 var three = require('three');
 var promises = require('node:fs/promises');
+var fetch = require('node-fetch');
 var sharp = require('sharp');
 var node_worker_threads = require('node:worker_threads');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
 var sharp__default = /*#__PURE__*/_interopDefaultLegacy(sharp);
 
 const dom = new jsdom.JSDOM().window;
@@ -86,11 +88,11 @@ class FileLoader extends three.Loader {
             promise = Promise.resolve(buffer.buffer);
         }
         else {
-            const req = new Request(url, {
-                headers: new Headers(this.requestHeader),
+            const req = new fetch.Request(url, {
+                headers: new fetch.Headers(this.requestHeader),
                 credentials: this.withCredentials ? 'include' : 'same-origin',
             });
-            promise = fetch(req)
+            promise = fetch__default["default"](req)
                 .then(response => {
                 if (response.status === 200 || response.status === 0) {
                     if (response.status === 0) {
@@ -201,11 +203,11 @@ class ImageLoader extends three.Loader {
                 return sharp__default["default"](imageBuffer);
             }
             else if (/^https?:\/\//.test(url)) {
-                const req = new Request(url, {
-                    headers: new Headers(this.requestHeader),
+                const req = new fetch.Request(url, {
+                    headers: new fetch.Headers(this.requestHeader),
                     credentials: this.withCredentials ? 'include' : 'same-origin',
                 });
-                const response = await fetch(req);
+                const response = await fetch__default["default"](req);
                 const buffer = Buffer.from(await response.arrayBuffer());
                 return sharp__default["default"](buffer);
             }
@@ -947,6 +949,7 @@ class GLTFDracoMeshCompressionExtension {
         const gltfAttributeMap = primitive.extensions[this.name].attributes;
         const threeAttributeMap = {};
         const attributeNormalizedMap = {};
+        const attributeTypeMap = {};
         for (const attributeName in gltfAttributeMap) {
             const threeAttributeName = ATTRIBUTES[attributeName] || attributeName.toLowerCase();
             threeAttributeMap[threeAttributeName] = gltfAttributeMap[attributeName];
@@ -955,7 +958,8 @@ class GLTFDracoMeshCompressionExtension {
             const threeAttributeName = ATTRIBUTES[attributeName] || attributeName.toLowerCase();
             if (gltfAttributeMap[attributeName] !== undefined) {
                 const accessorDef = json.accessors[primitive.attributes[attributeName]];
-                WEBGL_COMPONENT_TYPES[accessorDef.componentType];
+                const componentType = WEBGL_COMPONENT_TYPES[accessorDef.componentType];
+                attributeTypeMap[threeAttributeName] = componentType.name;
                 attributeNormalizedMap[threeAttributeName] = accessorDef.normalized === true;
             }
         }
@@ -969,7 +973,7 @@ class GLTFDracoMeshCompressionExtension {
                             attribute.normalized = normalized;
                     }
                     resolve(geometry);
-                }, threeAttributeMap);
+                }, threeAttributeMap, attributeTypeMap);
             });
         });
     }
@@ -2172,7 +2176,7 @@ class GLTFParser {
             const channel = animationDef.channels[i];
             const sampler = animationDef.samplers[channel.sampler];
             const target = channel.target;
-            const name = target.node !== undefined ? target.node : target.id;
+            const name = target.node;
             const input = animationDef.parameters !== undefined ? animationDef.parameters[sampler.input] : sampler.input;
             const output = animationDef.parameters !== undefined ? animationDef.parameters[sampler.output] : sampler.output;
             pendingNodes.push(this.getDependency('node', name));

diff --git a/build/index.cjs.map b/build/index.cjs.map
diff --git a/build/index.js b/build/index.js
diff --git a/build/index.js.map b/build/index.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-three-gltf",
-  "version": "1.2.0",
+  "version": "1.2.0-node16",
   "description": "Use three.js GLTFLoader in a Node.js environment",
   "exports": {
     "import": "./build/index.js",
@@ -9,7 +9,7 @@
   "types": "types/index.d.ts",
   "type": "module",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=16.0.0"
   },
   "scripts": {
     "cleanup:build": "rimraf build",
@@ -41,13 +41,15 @@
   "homepage": "https://github.com/Brakebein/node-three-gltf#readme",
   "dependencies": {
     "jsdom": "^20.0.0",
+    "node-fetch": "^2.6.7",
     "sharp": "^0.31.0"
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@rollup/plugin-typescript": "^8.3.4",
     "@types/draco3dgltf": "^1.4.0",
     "@types/jsdom": "^20.0.0",
+    "@types/node-fetch": "^2.6.2",
     "@types/sharp": "^0.31.0",
     "@types/three": "^0.137.0",
     "ava": "^4.3.1",

diff --git a/rollup.config.js b/rollup.config.js
@@ -3,7 +3,7 @@ import nodeResolve from '@rollup/plugin-node-resolve';
 import copy from 'rollup-plugin-copy';
 
 export default {
-  external: ['jsdom', 'sharp', 'three'],
+  external: ['jsdom', 'node-fetch', 'sharp', 'three'],
   input: 'src/index.ts',
   plugins: [
     nodeResolve(),

diff --git a/src/FileLoader.ts b/src/FileLoader.ts
@@ -1,5 +1,6 @@
 import { readFile } from 'node:fs/promises';
 import { Loader, LoadingManager } from 'three';
+import fetch, { Headers, Request } from 'node-fetch';
 
 const loading: {
   [key: string]: {

diff --git a/src/GLTFLoader.ts b/src/GLTFLoader.ts
@@ -1427,7 +1427,7 @@ class GLTFDracoMeshCompressionExtension {
 				const accessorDef = json.accessors[ primitive.attributes[ attributeName ] ];
 				const componentType = WEBGL_COMPONENT_TYPES[ accessorDef.componentType ];
 
-				attributeTypeMap[ threeAttributeName ] = componentType;
+				attributeTypeMap[ threeAttributeName ] = componentType.name;
 				attributeNormalizedMap[ threeAttributeName ] = accessorDef.normalized === true;
 
 			}
@@ -1451,7 +1451,7 @@ class GLTFDracoMeshCompressionExtension {
 
 					resolve( geometry );
 
-				}, threeAttributeMap );
+				}, threeAttributeMap, attributeTypeMap );
 
 			} );
 
@@ -3583,7 +3583,7 @@ class GLTFParser {
 			const channel = animationDef.channels[ i ];
 			const sampler = animationDef.samplers[ channel.sampler ];
 			const target = channel.target;
-			const name = target.node !== undefined ? target.node : target.id; // NOTE: target.id is deprecated.
+			const name = target.node;
 			const input = animationDef.parameters !== undefined ? animationDef.parameters[ sampler.input ] : sampler.input;
 			const output = animationDef.parameters !== undefined ? animationDef.parameters[ sampler.output ] : sampler.output;
 

diff --git a/src/ImageLoader.ts b/src/ImageLoader.ts
@@ -1,6 +1,7 @@
 import { resolveObjectURL } from 'node:buffer';
 import { Cache, Loader, LoadingManager } from 'three';
 import sharp from 'sharp';
+import fetch, { Headers, Request } from 'node-fetch';
 
 export class ImageLoader extends Loader {
 
@@ -45,7 +46,7 @@ export class ImageLoader extends Loader {
 					const imageBuffer = Buffer.from(await blob.arrayBuffer());
 					return sharp(imageBuffer);
 
-				} else if (/^data:/.test(url)) {;
+				} else if (/^data:/.test(url)) {
 
 					const base64 = url.split(';base64,').pop();
 					const imageBuffer = Buffer.from(base64, 'base64');

diff --git a/test/LittlestTokyo.glb b/test/LittlestTokyo.glb
diff --git a/test/index.js b/test/index.js
@@ -87,3 +87,15 @@ test('load draco-compressed dgm.gltf', async (t) => {
   });
 
 });
+
+test('load gltf with animations', async (t) => {
+
+  const gltf = await loadGltf('test/LittlestTokyo.glb');
+
+  gltf.scene.traverse((child) => {
+    if (child instanceof Mesh) {
+      t.truthy(child.geometry instanceof BufferGeometry, 'check BufferGeometry');
+    }
+  });
+
+});