poppygl 0.0.5 → 0.0.7

package/dist/index.d.ts

@@ -37,6 +37,7 @@ interface DrawCall {
     indices: Uint32Array | null;
     model: mat4;
     material: Material;
+    colors?: Float32Array | null;
 }
 interface GLTFResources {
     buffers: Uint8Array[];

package/dist/index.js

@@ -10,13 +10,7 @@ function computeWorldAABB(drawCalls) {
   for (const dc of drawCalls) {
     const { positions, model } = dc;
     for (let i = 0; i < positions.length; i += 3) {
-      vec4.set(
-        tmp,
-        positions[i],
-        positions[i + 1],
-        positions[i + 2],
-        1
-      );
+      vec4.set(tmp, positions[i], positions[i + 1], positions[i + 2], 1);
       vec4.transformMat4(tmp, tmp, model);
       const x = tmp[0];
       const y = tmp[1];
@@ -250,7 +244,7 @@ var SoftwareRenderer = class {
     return out;
   }
   drawMesh(mesh, camera, light, material, cullBackFaces = true, gammaOut = true) {
-    const { positions, normals, uvs, indices, model } = mesh;
+    const { positions, normals, uvs, indices, model, colors } = mesh;
     const view = camera.view;
     const proj = camera.proj;
     const mvp = mat42.create();
@@ -271,6 +265,7 @@ var SoftwareRenderer = class {
     const vInvW = new Float32Array(vertexCount);
     const vNDCz = new Float32Array(vertexCount);
     const vWorldN = new Array(vertexCount);
+    const vColor = new Array(vertexCount);
     for (let i = 0; i < vertexCount; i++) {
       const p = vec42.fromValues(
         positions[i * 3 + 0],
@@ -297,6 +292,11 @@ var SoftwareRenderer = class {
       const nw = vec32.create();
       vec32.transformMat3(nw, n, normalMat);
       vWorldN[i] = [nw[0], nw[1], nw[2]];
+      if (colors && colors.length >= (i + 1) * 3) {
+        vColor[i] = [colors[i * 3 + 0], colors[i * 3 + 1], colors[i * 3 + 2]];
+      } else {
+        vColor[i] = [1, 1, 1];
+      }
     }
     for (let i = 0; i < idx.length; i += 3) {
       const i0 = idx[i + 0];
@@ -334,6 +334,11 @@ var SoftwareRenderer = class {
         [uvs[i1 * 2 + 0], uvs[i1 * 2 + 1]],
         [uvs[i2 * 2 + 0], uvs[i2 * 2 + 1]]
       ] : null;
+      const cs = [
+        vColor[i0],
+        vColor[i1],
+        vColor[i2]
+      ];
       for (let y = minY; y <= maxY; y++) {
         for (let x = minX; x <= maxX; x++) {
           const p = [x + 0.5, y + 0.5];
@@ -366,6 +371,13 @@ var SoftwareRenderer = class {
             );
             baseColor = mulColor(baseColor, texel);
           }
+          const [cr, cg, cb] = this.perspInterp(cs, invW, [l0, l1, l2]);
+          baseColor = [
+            baseColor[0] * cr,
+            baseColor[1] * cg,
+            baseColor[2] * cb,
+            baseColor[3]
+          ];
           const [np0, np1, np2] = this.perspInterp(nws, invW, [l0, l1, l2]);
           const nlen = Math.hypot(np0, np1, np2) || 1;
           const nrm = [
@@ -713,6 +725,8 @@ function createSceneFromGLTF(gltf, resources) {
           const normals = normalsAcc != null ? readAccessorAsFloat32(ctx, normalsAcc) : null;
           const uvs = uvAcc != null ? readAccessorAsFloat32(ctx, uvAcc) : null;
           const indices = primitive.indices != null ? readIndices(ctx, primitive.indices) : null;
+          const colorAcc = primitive.attributes?.COLOR_0;
+          const colors = colorAcc != null ? readAccessorAsFloat32(ctx, colorAcc) : null;
           const material = getMaterial(
             gltf,
             textures,
@@ -725,7 +739,8 @@ function createSceneFromGLTF(gltf, resources) {
             uvs,
             indices,
             model: world,
-            material
+            material,
+            colors
           });
         }
       }
@@ -799,7 +814,8 @@ function parseGLB(arrayBuffer) {
     const chunkLength = view.getUint32(offset, true);
     const chunkType = view.getUint32(offset + 4, true);
     offset += 8;
-    if (offset + chunkLength > length) throw new Error("Truncated GLB chunk data.");
+    if (offset + chunkLength > length)
+      throw new Error("Truncated GLB chunk data.");
     const chunkData = new Uint8Array(arrayBuffer, offset, chunkLength);
     offset += chunkLength;
     if (chunkType === JSON_CHUNK_TYPE) {
@@ -817,7 +833,8 @@ function parseGLB(arrayBuffer) {
 // lib/gltf/loadGLTFWithResourcesFromURL.ts
 function ensureFetch(fetchImpl) {
   const impl = fetchImpl ?? globalThis.fetch;
-  if (!impl) throw new Error("Global fetch API is not available; provide fetchImpl.");
+  if (!impl)
+    throw new Error("Global fetch API is not available; provide fetchImpl.");
   return impl;
 }
 async function fetchBinary(fetchImpl, url) {
@@ -832,7 +849,9 @@ async function loadGLTFWithResourcesFromURL(url, options = {}) {
   const fetchImpl = ensureFetch(options.fetchImpl);
   const response = await fetchImpl(url);
   if (!response.ok)
-    throw new Error(`Failed to fetch ${url}: ${response.status} ${response.statusText}`);
+    throw new Error(
+      `Failed to fetch ${url}: ${response.status} ${response.statusText}`
+    );
   const resolvedURL = new URL(response.url || url);
   const baseURL = resolvedURL;
   const sourceBuffer = await response.arrayBuffer();
@@ -867,7 +886,9 @@ async function loadGLTFWithResourcesFromURL(url, options = {}) {
       buffers[index] = buf;
       return buf;
     }
-    throw new Error(`Buffer ${index} is missing a uri and no GLB chunk was provided.`);
+    throw new Error(
+      `Buffer ${index} is missing a uri and no GLB chunk was provided.`
+    );
   }
   await Promise.all(
     (gltf.buffers || []).map(async (entry, idx) => {
@@ -892,7 +913,10 @@ async function loadGLTFWithResourcesFromURL(url, options = {}) {
       const bufferView = gltf.bufferViews?.[img.bufferView];
       if (!bufferView)
         throw new Error(`Invalid image bufferView index ${img.bufferView}`);
-      const buffer = await resolveBuffer(bufferView.buffer, gltf.buffers?.[bufferView.buffer]);
+      const buffer = await resolveBuffer(
+        bufferView.buffer,
+        gltf.buffers?.[bufferView.buffer]
+      );
       if (!buffer)
         throw new Error(`Missing buffer for image bufferView ${img.bufferView}`);
       const byteOffset = bufferView.byteOffset ?? 0;
@@ -981,7 +1005,9 @@ async function renderGLTFToPNGBufferFromGLBBuffer(glb, options = {}) {
       continue;
     }
     if (!binaryChunk) {
-      throw new Error(`GLB is missing the binary chunk required for buffer ${index}.`);
+      throw new Error(
+        `GLB is missing the binary chunk required for buffer ${index}.`
+      );
     }
     buffers[index] = binaryChunk;
   }

package/package.json

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