poppygl 0.0.10 → 0.0.12

package/dist/index.d.ts

@@ -124,6 +124,8 @@ declare function renderGLTFToPNGBufferFromURL(url: string, options?: RenderGLTFT
 type RenderGLTFToPNGBufferFromGLBBufferOptions = RenderOptionsInput;
 declare function renderGLTFToPNGBufferFromGLBBuffer(glb: ArrayBuffer | Uint8Array, options?: RenderGLTFToPNGBufferFromGLBBufferOptions): Promise<Buffer>;
 
+declare function renderGLTFToPNGBuffer(gltfPathOrString: string, options?: RenderOptionsInput): Promise<Buffer>;
+
 declare function renderSceneFromGLTF(scene: GLTFScene, options?: RenderOptionsInput, imageFactory?: ImageFactory): RenderResult;
 
-export { type BitmapLike, type Camera, DEFAULT_LIGHT_DIR, DEFAULT_RENDER_OPTIONS, type DrawCall, type FetchLike, type GLTFResources, type GLTFScene, type ImageFactory, type LightSettings, type LoadGLTFWithResourcesFromURLOptions, type Material, type MutableRGBA, type RGBA, type RenderGLTFToPNGBufferFromGLBBufferOptions, type RenderGLTFToPNGBufferFromURLOptions, type RenderOptions, type RenderOptionsInput, type RenderResult, SoftwareRenderer, bufferFromDataURI, buildCamera, computeSmoothNormals, computeWorldAABB, createSceneFromGLTF, createUint8Bitmap, decodeImageFromBuffer, encodePNGToBuffer, getDefaultRenderOptions, isJPG, isPNG, loadGLTFWithResourcesFromURL, pureImageFactory, renderDrawCalls, renderGLTFToPNGBufferFromGLBBuffer, renderGLTFToPNGBufferFromURL, renderSceneFromGLTF, resolveRenderOptions };
+export { type BitmapLike, type Camera, DEFAULT_LIGHT_DIR, DEFAULT_RENDER_OPTIONS, type DrawCall, type FetchLike, type GLTFResources, type GLTFScene, type ImageFactory, type LightSettings, type LoadGLTFWithResourcesFromURLOptions, type Material, type MutableRGBA, type RGBA, type RenderGLTFToPNGBufferFromGLBBufferOptions, type RenderGLTFToPNGBufferFromURLOptions, type RenderOptions, type RenderOptionsInput, type RenderResult, SoftwareRenderer, bufferFromDataURI, buildCamera, computeSmoothNormals, computeWorldAABB, createSceneFromGLTF, createUint8Bitmap, decodeImageFromBuffer, encodePNGToBuffer, getDefaultRenderOptions, isJPG, isPNG, loadGLTFWithResourcesFromURL, pureImageFactory, renderDrawCalls, renderGLTFToPNGBuffer, renderGLTFToPNGBufferFromGLBBuffer, renderGLTFToPNGBufferFromURL, renderSceneFromGLTF, resolveRenderOptions };

package/dist/index.js

@@ -969,8 +969,8 @@ async function encodePNGToBuffer(image) {
   passThrough.on("data", (chunk) => {
     chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
   });
-  const resultPromise = new Promise((resolve, reject) => {
-    passThrough.on("end", () => resolve(Buffer.concat(chunks)));
+  const resultPromise = new Promise((resolve2, reject) => {
+    passThrough.on("end", () => resolve2(Buffer.concat(chunks)));
     passThrough.on("error", reject);
   });
   await PImage3.encodePNGToStream(image, passThrough);
@@ -1066,6 +1066,91 @@ async function renderGLTFToPNGBufferFromGLBBuffer(glb, options = {}) {
   return encodePNGToBuffer(bitmap);
 }
 
+// cli/loadGLTFWithResources.ts
+import * as fs from "fs";
+import * as path from "path";
+async function loadGLTFWithResources(gltfPath) {
+  const baseDir = path.dirname(gltfPath);
+  const gltf = JSON.parse(await fs.promises.readFile(gltfPath, "utf8"));
+  const buffers = await Promise.all(
+    (gltf.buffers || []).map(async (b) => {
+      if (b.uri && b.uri.startsWith("data:")) {
+        return bufferFromDataURI(b.uri);
+      }
+      if (b.uri) {
+        const resolved = path.resolve(baseDir, decodeURIComponent(b.uri));
+        return fs.promises.readFile(resolved);
+      }
+      throw new Error("Buffer without uri not supported in this loader.");
+    })
+  );
+  const images = await Promise.all(
+    (gltf.images || []).map(async (img) => {
+      if (img.uri) {
+        if (img.uri.startsWith("data:")) {
+          const buf = bufferFromDataURI(img.uri);
+          return decodeImageFromBuffer(buf, img.mimeType);
+        }
+        const filePath = path.resolve(baseDir, decodeURIComponent(img.uri));
+        const fileBuf = await fs.promises.readFile(filePath);
+        const hintedMime = isPNG(img.uri) ? "image/png" : isJPG(img.uri) ? "image/jpeg" : img.mimeType;
+        return decodeImageFromBuffer(fileBuf, hintedMime);
+      }
+      if (typeof img.bufferView === "number") {
+        const bufferView = gltf.bufferViews?.[img.bufferView];
+        if (!bufferView) {
+          throw new Error(`Invalid image bufferView index ${img.bufferView}`);
+        }
+        const buffer = buffers[bufferView.buffer];
+        if (!buffer)
+          throw new Error(
+            `Missing buffer for image bufferView ${img.bufferView}`
+          );
+        const byteOffset = bufferView.byteOffset ?? 0;
+        const byteLength = bufferView.byteLength;
+        if (typeof byteLength !== "number") {
+          throw new Error(
+            `bufferView ${img.bufferView} missing byteLength for image.`
+          );
+        }
+        const slice = Buffer.from(
+          buffer.buffer,
+          buffer.byteOffset + byteOffset,
+          byteLength
+        );
+        return decodeImageFromBuffer(slice, img.mimeType);
+      }
+      throw new Error(
+        "images[*] entry missing uri or bufferView; unsupported in this lightweight loader."
+      );
+    })
+  );
+  return {
+    gltf,
+    resources: {
+      buffers,
+      images
+    }
+  };
+}
+
+// cli/renderGLTFToPNGBuffer.ts
+async function renderGLTFToPNGBuffer(gltfPathOrString, options = {}) {
+  let gltf;
+  let resources;
+  try {
+    gltf = JSON.parse(gltfPathOrString);
+    resources = { buffers: [], images: [] };
+  } catch {
+    const result = await loadGLTFWithResources(gltfPathOrString);
+    gltf = result.gltf;
+    resources = result.resources;
+  }
+  const scene = createSceneFromGLTF(gltf, resources);
+  const { bitmap } = renderSceneFromGLTF(scene, options, pureImageFactory);
+  return encodePNGToBuffer(bitmap);
+}
+
 // lib/index.ts
 function renderSceneFromGLTF(scene, options, imageFactory) {
   return renderDrawCalls(scene.drawCalls, options, imageFactory);
@@ -1088,6 +1173,7 @@ export {
   loadGLTFWithResourcesFromURL,
   pureImageFactory,
   renderDrawCalls,
+  renderGLTFToPNGBuffer,
   renderGLTFToPNGBufferFromGLBBuffer,
   renderGLTFToPNGBufferFromURL,
   renderSceneFromGLTF,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "poppygl",
   "main": "dist/index.js",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/tscircuit/poppygl.git"