3d-spinner 0.9.4 → 0.9.6

package/dist/umd/spinner.global.js

@@ -139,7 +139,10 @@ var Spinner3D = (() => {
     const positions = new Float32Array(triangles * 9);
     const normals = new Float32Array(triangles * 9);
     const colors = new Float32Array(triangles * 9);
+    const emissives = new Float32Array(triangles * 9);
+    const speculars = new Float32Array(triangles * 12);
     let o = 0;
+    let so = 0;
     for (const face of mesh.faces) {
       const v0 = mesh.vertices[face.indices[0]];
       const v1 = mesh.vertices[face.indices[1]];
@@ -149,6 +152,15 @@ var Spinner3D = (() => {
       const cr = r / 255;
       const cg = g / 255;
       const cb = b / 255;
+      const emissive = face.material?.emissive;
+      const er = emissive ? emissive[0] : 0;
+      const eg = emissive ? emissive[1] : 0;
+      const eb = emissive ? emissive[2] : 0;
+      const specular = face.material?.specular;
+      const sr = specular ? specular[0] : 0;
+      const sg = specular ? specular[1] : 0;
+      const sb = specular ? specular[2] : 0;
+      const sn = specular ? face.material?.shininess ?? 32 : 1;
       for (let k = 1; k < face.indices.length - 1; k++) {
         const tri = [face.indices[0], face.indices[k], face.indices[k + 1]];
         for (const index of tri) {
@@ -162,11 +174,19 @@ var Spinner3D = (() => {
           colors[o] = cr;
           colors[o + 1] = cg;
           colors[o + 2] = cb;
+          emissives[o] = er;
+          emissives[o + 1] = eg;
+          emissives[o + 2] = eb;
+          speculars[so] = sr;
+          speculars[so + 1] = sg;
+          speculars[so + 2] = sb;
+          speculars[so + 3] = sn;
           o += 3;
+          so += 4;
         }
       }
     }
-    return { positions, normals, colors, count: positions.length / 3 };
+    return { positions, normals, colors, emissives, speculars, count: positions.length / 3 };
   }
   function midpoint(a, b) {
     return { x: (a.x + b.x) / 2, y: (a.y + b.y) / 2, z: (a.z + b.z) / 2 };
@@ -204,13 +224,42 @@ var Spinner3D = (() => {
   function clamp012(value) {
     return Math.min(1, Math.max(0, value));
   }
-  function shadeColor(normal, color, light) {
+  function clamp255(value) {
+    return Math.round(Math.min(255, Math.max(0, value)));
+  }
+  function shade(normal, color, light, surface) {
     const lambert = Math.max(0, dot(normal, light.toLight));
     const brightness = clamp012(light.ambient + light.intensity * lambert);
-    const [r, g, b] = parseColor(color);
-    return `rgb(${Math.round(r * brightness)}, ${Math.round(g * brightness)}, ${Math.round(
-      b * brightness
-    )})`;
+    const [baseR, baseG, baseB] = parseColor(color);
+    let r = baseR * brightness;
+    let g = baseG * brightness;
+    let b = baseB * brightness;
+    const material = surface?.material;
+    const specular = material?.specular;
+    const viewDir = surface?.viewDir;
+    if (specular && viewDir && lambert > 0) {
+      const half = normalize({
+        x: light.toLight.x + viewDir.x,
+        y: light.toLight.y + viewDir.y,
+        z: light.toLight.z + viewDir.z
+      });
+      const shininess = material?.shininess ?? 32;
+      const highlight = Math.pow(Math.max(0, dot(normal, half)), shininess) * light.intensity * 255;
+      r += highlight * specular[0];
+      g += highlight * specular[1];
+      b += highlight * specular[2];
+    }
+    const emissive = material?.emissive;
+    if (emissive) {
+      r += emissive[0] * 255;
+      g += emissive[1] * 255;
+      b += emissive[2] * 255;
+    }
+    return [clamp255(r), clamp255(g), clamp255(b)];
+  }
+  function shadeColor(normal, color, light, surface) {
+    const [r, g, b] = shade(normal, color, light, surface);
+    return `rgb(${r}, ${g}, ${b})`;
   }
   var DEFAULTS2, Light;
   var init_light = __esm({
@@ -233,8 +282,8 @@ var Spinner3D = (() => {
           };
         }
         /** Convenience wrapper around {@link shadeColor} using this light. */
-        shade(normal, color) {
-          return shadeColor(normal, color, this.params);
+        shade(normal, color, surface) {
+          return shadeColor(normal, color, this.params, surface);
         }
       };
     }
@@ -274,28 +323,51 @@ var Spinner3D = (() => {
 in vec3 aPos;
 in vec3 aNormal;
 in vec3 aColor;
+in vec3 aEmissive;
+in vec4 aSpecular;
 uniform mat4 uViewProj;
 uniform mat4 uModel;
 out vec3 vNormal;
 out vec3 vColor;
+out vec3 vEmissive;
+out vec4 vSpecular;
+out vec3 vWorldPos;
 void main() {
   vNormal = mat3(uModel) * aNormal;
   vColor = aColor;
-  gl_Position = uViewProj * uModel * vec4(aPos, 1.0);
+  vEmissive = aEmissive;
+  vSpecular = aSpecular;
+  vec4 world = uModel * vec4(aPos, 1.0);
+  vWorldPos = world.xyz;
+  gl_Position = uViewProj * world;
 }`;
       FRAGMENT_SHADER = `#version 300 es
 precision mediump float;
 in vec3 vNormal;
 in vec3 vColor;
+in vec3 vEmissive;
+in vec4 vSpecular;
+in vec3 vWorldPos;
 uniform vec3 uToLight;
+uniform vec3 uEye;
 uniform float uIntensity;
 uniform float uAmbient;
 uniform float uOpacity;
 out vec4 fragColor;
 void main() {
-  float lambert = max(dot(normalize(vNormal), normalize(uToLight)), 0.0);
+  vec3 normal = normalize(vNormal);
+  vec3 toLight = normalize(uToLight);
+  float lambert = max(dot(normal, toLight), 0.0);
   float brightness = clamp(uAmbient + uIntensity * lambert, 0.0, 1.0);
-  fragColor = vec4(vColor * brightness, uOpacity);
+  vec3 lit = vColor * brightness;
+  if (lambert > 0.0) {
+    vec3 viewDir = normalize(uEye - vWorldPos);
+    vec3 halfVec = normalize(toLight + viewDir);
+    float highlight = pow(max(dot(normal, halfVec), 0.0), vSpecular.w) * uIntensity;
+    lit += highlight * vSpecular.xyz;
+  }
+  lit += vEmissive;
+  fragColor = vec4(lit, uOpacity);
 }`;
       WebGLRenderer = class {
         constructor(options = {}) {
@@ -316,9 +388,12 @@ void main() {
             aPos: gl.getAttribLocation(this.program, "aPos"),
             aNormal: gl.getAttribLocation(this.program, "aNormal"),
             aColor: gl.getAttribLocation(this.program, "aColor"),
+            aEmissive: gl.getAttribLocation(this.program, "aEmissive"),
+            aSpecular: gl.getAttribLocation(this.program, "aSpecular"),
             uViewProj: gl.getUniformLocation(this.program, "uViewProj"),
             uModel: gl.getUniformLocation(this.program, "uModel"),
             uToLight: gl.getUniformLocation(this.program, "uToLight"),
+            uEye: gl.getUniformLocation(this.program, "uEye"),
             uIntensity: gl.getUniformLocation(this.program, "uIntensity"),
             uAmbient: gl.getUniformLocation(this.program, "uAmbient"),
             uOpacity: gl.getUniformLocation(this.program, "uOpacity")
@@ -342,19 +417,23 @@ void main() {
           const data = expandToTriangles(mesh);
           const vao = gl.createVertexArray();
           gl.bindVertexArray(vao);
-          const attribute = (location, array) => {
+          const buffers = [];
+          const attribute = (location, array, size = 3) => {
             if (location < 0) return;
             const buffer = gl.createBuffer();
+            buffers.push(buffer);
             gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
             gl.bufferData(gl.ARRAY_BUFFER, array, gl.STATIC_DRAW);
             gl.enableVertexAttribArray(location);
-            gl.vertexAttribPointer(location, 3, gl.FLOAT, false, 0, 0);
+            gl.vertexAttribPointer(location, size, gl.FLOAT, false, 0, 0);
           };
           attribute(loc.aPos, data.positions);
           attribute(loc.aNormal, data.normals);
           attribute(loc.aColor, data.colors);
+          attribute(loc.aEmissive, data.emissives);
+          attribute(loc.aSpecular, data.speculars, 4);
           gl.bindVertexArray(null);
-          const result = { vao, count: data.count };
+          const result = { vao, buffers, count: data.count };
           this.cache.set(mesh, result);
           return result;
         }
@@ -367,6 +446,7 @@ void main() {
           gl.useProgram(this.program);
           gl.uniformMatrix4fv(loc.uViewProj, false, new Float32Array(frame.viewProjection));
           gl.uniform3f(loc.uToLight, frame.light.toLight.x, frame.light.toLight.y, frame.light.toLight.z);
+          gl.uniform3f(loc.uEye, frame.eye.x, frame.eye.y, frame.eye.z);
           gl.uniform1f(loc.uIntensity, frame.light.intensity);
           gl.uniform1f(loc.uAmbient, frame.light.ambient);
           gl.disable(gl.BLEND);
@@ -411,7 +491,10 @@ void main() {
         destroy() {
           const gl = this.gl;
           if (gl) {
-            for (const mesh of this.cache.values()) gl.deleteVertexArray(mesh.vao);
+            for (const mesh of this.cache.values()) {
+              gl.deleteVertexArray(mesh.vao);
+              for (const buffer of mesh.buffers) gl.deleteBuffer(buffer);
+            }
             if (this.program) gl.deleteProgram(this.program);
           }
           this.cache.clear();
@@ -441,6 +524,7 @@ struct Uniforms {
   model: mat4x4<f32>,
   toLight: vec4<f32>,
   params: vec4<f32>,
+  eye: vec4<f32>,
 };
 @group(0) @binding(0) var<uniform> u: Uniforms;
 
@@ -448,23 +532,40 @@ struct VSOut {
   @builtin(position) position: vec4<f32>,
   @location(0) normal: vec3<f32>,
   @location(1) color: vec3<f32>,
+  @location(2) emissive: vec3<f32>,
+  @location(3) specular: vec4<f32>,
+  @location(4) worldPos: vec3<f32>,
 };
 
 @vertex
-fn vs(@location(0) pos: vec3<f32>, @location(1) normal: vec3<f32>, @location(2) color: vec3<f32>) -> VSOut {
+fn vs(@location(0) pos: vec3<f32>, @location(1) normal: vec3<f32>, @location(2) color: vec3<f32>, @location(3) emissive: vec3<f32>, @location(4) specular: vec4<f32>) -> VSOut {
   var out: VSOut;
   let m = mat3x3<f32>(u.model[0].xyz, u.model[1].xyz, u.model[2].xyz);
   out.normal = m * normal;
   out.color = color;
-  out.position = u.viewProj * u.model * vec4<f32>(pos, 1.0);
+  out.emissive = emissive;
+  out.specular = specular;
+  let world = u.model * vec4<f32>(pos, 1.0);
+  out.worldPos = world.xyz;
+  out.position = u.viewProj * world;
   return out;
 }
 
 @fragment
 fn fs(in: VSOut) -> @location(0) vec4<f32> {
-  let lambert = max(dot(normalize(in.normal), normalize(u.toLight.xyz)), 0.0);
+  let normal = normalize(in.normal);
+  let toLight = normalize(u.toLight.xyz);
+  let lambert = max(dot(normal, toLight), 0.0);
   let brightness = clamp(u.params.y + u.params.x * lambert, 0.0, 1.0);
-  return vec4<f32>(in.color * brightness, u.params.z);
+  var lit = in.color * brightness;
+  if (lambert > 0.0) {
+    let viewDir = normalize(u.eye.xyz - in.worldPos);
+    let halfVec = normalize(toLight + viewDir);
+    let highlight = pow(max(dot(normal, halfVec), 0.0), in.specular.w) * u.params.x;
+    lit = lit + highlight * in.specular.xyz;
+  }
+  lit = lit + in.emissive;
+  return vec4<f32>(lit, u.params.z);
 }
 `;
       CLIP_Z_FIX = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 1];
@@ -505,13 +606,15 @@ fn fs(in: VSOut) -> @location(0) vec4<f32> {
               {
                 binding: 0,
                 visibility: stage.VERTEX | stage.FRAGMENT,
-                buffer: { type: "uniform", hasDynamicOffset: true, minBindingSize: 160 }
+                buffer: { type: "uniform", hasDynamicOffset: true, minBindingSize: 176 }
               }
             ]
           });
-          const vertexBuffer = (location) => ({
-            arrayStride: 12,
-            attributes: [{ shaderLocation: location, offset: 0, format: "float32x3" }]
+          const vertexBuffer = (location, components = 3) => ({
+            arrayStride: components * 4,
+            attributes: [
+              { shaderLocation: location, offset: 0, format: `float32x${components}` }
+            ]
           });
           const pipelineLayout = device.createPipelineLayout({ bindGroupLayouts: [layout] });
           const blend = {
@@ -527,7 +630,13 @@ fn fs(in: VSOut) -> @location(0) vec4<f32> {
             vertex: {
               module,
               entryPoint: "vs",
-              buffers: [vertexBuffer(0), vertexBuffer(1), vertexBuffer(2)]
+              buffers: [
+                vertexBuffer(0),
+                vertexBuffer(1),
+                vertexBuffer(2),
+                vertexBuffer(3),
+                vertexBuffer(4, 4)
+              ]
             },
             fragment: {
               module,
@@ -580,6 +689,8 @@ fn fs(in: VSOut) -> @location(0) vec4<f32> {
             position: upload(data.positions),
             normal: upload(data.normals),
             color: upload(data.colors),
+            emissive: upload(data.emissives),
+            specular: upload(data.speculars),
             count: data.count
           };
           this.cache.set(mesh, result);
@@ -631,7 +742,7 @@ fn fs(in: VSOut) -> @location(0) vec4<f32> {
           const bindGroup = this.device.createBindGroup({
             layout,
             entries: [
-              { binding: 0, resource: { buffer: this.uniformBuffer, offset: 0, size: 160 } }
+              { binding: 0, resource: { buffer: this.uniformBuffer, offset: 0, size: 176 } }
             ]
           });
           draws.forEach((draw, i) => {
@@ -640,6 +751,7 @@ fn fs(in: VSOut) -> @location(0) vec4<f32> {
             data.set(draw.item.model, 16);
             data.set([frame.light.toLight.x, frame.light.toLight.y, frame.light.toLight.z, 0], 32);
             data.set([frame.light.intensity, frame.light.ambient, draw.opacity, 0], 36);
+            data.set([frame.eye.x, frame.eye.y, frame.eye.z, 0], 40);
             this.device.queue.writeBuffer(this.uniformBuffer, i * UNIFORM_STRIDE, data);
           });
           const encoder = this.device.createCommandEncoder();
@@ -666,6 +778,8 @@ fn fs(in: VSOut) -> @location(0) vec4<f32> {
             pass.setVertexBuffer(0, mesh.position);
             pass.setVertexBuffer(1, mesh.normal);
             pass.setVertexBuffer(2, mesh.color);
+            pass.setVertexBuffer(3, mesh.emissive);
+            pass.setVertexBuffer(4, mesh.specular);
             pass.draw(mesh.count);
           });
           pass.end();
@@ -677,6 +791,8 @@ fn fs(in: VSOut) -> @location(0) vec4<f32> {
             mesh.position.destroy?.();
             mesh.normal.destroy?.();
             mesh.color.destroy?.();
+            mesh.emissive.destroy?.();
+            mesh.specular.destroy?.();
           }
           this.cache.clear();
           this.uniformBuffer?.destroy?.();
@@ -759,9 +875,30 @@ fn fs(in: VSOut) -> @location(0) vec4<f32> {
                 depth += dot(d, d);
               }
               depth /= face.indices.length;
+              let surface;
+              const material = face.material;
+              if (material) {
+                if (material.specular) {
+                  let cx = 0;
+                  let cy = 0;
+                  let cz = 0;
+                  for (const i of face.indices) {
+                    cx += world[i].x;
+                    cy += world[i].y;
+                    cz += world[i].z;
+                  }
+                  const inv = 1 / face.indices.length;
+                  const viewDir = normalize(
+                    subtract(frame.eye, { x: cx * inv, y: cy * inv, z: cz * inv })
+                  );
+                  surface = { material, viewDir };
+                } else {
+                  surface = { material };
+                }
+              }
               polygons.push({
                 points,
-                color: shadeColor(normal, face.color, frame.light),
+                color: shadeColor(normal, face.color, frame.light, surface),
                 depth,
                 opacity: faceOpacity
               });
@@ -1299,9 +1436,11 @@ void main() {
           const data = expandToTriangles(mesh);
           const vao = gl.createVertexArray();
           gl.bindVertexArray(vao);
+          const buffers = [];
           const attribute = (location, array, size) => {
             if (location < 0) return;
             const buffer = gl.createBuffer();
+            buffers.push(buffer);
             gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
             gl.bufferData(gl.ARRAY_BUFFER, array, gl.STATIC_DRAW);
             gl.enableVertexAttribArray(location);
@@ -1311,7 +1450,7 @@ void main() {
           attribute(loc.aColor, data.colors, 3);
           attribute(loc.aUV, planarUVs(mesh), 2);
           gl.bindVertexArray(null);
-          const result = { vao, count: data.count };
+          const result = { vao, buffers, count: data.count };
           this.buffers.set(mesh, result);
           return result;
         }
@@ -1349,7 +1488,10 @@ void main() {
           const gl = this.gl;
           if (gl) {
             for (const texture of this.textures.values()) gl.deleteTexture(texture);
-            for (const buffers of this.buffers.values()) gl.deleteVertexArray(buffers.vao);
+            for (const cached of this.buffers.values()) {
+              gl.deleteVertexArray(cached.vao);
+              for (const buffer of cached.buffers) gl.deleteBuffer(buffer);
+            }
             if (this.program) gl.deleteProgram(this.program);
           }
           this.textures.clear();
@@ -1501,6 +1643,7 @@ void main() {
   var stdin_exports = {};
   __export(stdin_exports, {
     Camera: () => Camera,
+    Canvas2DTexturedRenderer: () => Canvas2DTexturedRenderer,
     ChargedOrbAnimation: () => ChargedOrbAnimation,
     CompositeAnimation: () => CompositeAnimation,
     GridAssemblyAnimation: () => GridAssemblyAnimation,
@@ -1512,6 +1655,7 @@ void main() {
     SpinAnimation: () => SpinAnimation,
     WebGLTexturedRenderer: () => WebGLTexturedRenderer,
     WebGPUTexturedRenderer: () => WebGPUTexturedRenderer,
+    attachMaterial: () => attachMaterial,
     centerAndScaleMesh: () => centerAndScaleMesh,
     chargedOrb: () => chargedOrb,
     circleMotion: () => circleMotion,
@@ -1729,6 +1873,12 @@ void main() {
   init_math();
 
   // src/engines/little-3d-engine/core/mesh.ts
+  function attachMaterial(mesh, material) {
+    if (material) {
+      for (const face of mesh.faces) face.material = material;
+    }
+    return mesh;
+  }
   function transform(init) {
     return {
       position: init?.position ?? { x: 0, y: 0, z: 0 },
@@ -1743,7 +1893,7 @@ void main() {
 
   // src/engines/little-3d-engine/shapes/primitives/cube.ts
   var DEFAULT_COLORS = ["#3b82f6", "#8b5cf6", "#ec4899", "#f59e0b", "#10b981", "#ef4444"];
-  function cube(size = 1, colors = DEFAULT_COLORS) {
+  function cube(size = 1, colors = DEFAULT_COLORS, material) {
     const h = size / 2;
     const vertices = [
       { x: -h, y: -h, z: h },
@@ -1763,12 +1913,12 @@ void main() {
       { indices: [1, 5, 6, 2], color: colors[4 % colors.length] },
       { indices: [4, 0, 3, 7], color: colors[5 % colors.length] }
     ];
-    return { vertices, faces };
+    return attachMaterial({ vertices, faces }, material);
   }
 
   // src/engines/little-3d-engine/shapes/primitives/quad.ts
   var DEFAULT_COLORS2 = ["#3b82f6"];
-  function quad(size = 1, colors = DEFAULT_COLORS2) {
+  function quad(size = 1, colors = DEFAULT_COLORS2, material) {
     const s = size / 2;
     const vertices = [
       { x: -s, y: -s, z: 0 },
@@ -1776,12 +1926,15 @@ void main() {
       { x: s, y: s, z: 0 },
       { x: -s, y: s, z: 0 }
     ];
-    return { vertices, faces: [{ indices: [0, 1, 2, 3], color: colors[0] }] };
+    return attachMaterial(
+      { vertices, faces: [{ indices: [0, 1, 2, 3], color: colors[0] }] },
+      material
+    );
   }
 
   // src/engines/little-3d-engine/shapes/primitives/tetrahedron.ts
   var DEFAULT_COLORS3 = ["#3b82f6", "#8b5cf6", "#ec4899", "#f59e0b"];
-  function tetrahedron(size = 1, colors = DEFAULT_COLORS3) {
+  function tetrahedron(size = 1, colors = DEFAULT_COLORS3, material) {
     const s = size / 2;
     const vertices = [
       { x: s, y: s, z: s },
@@ -1795,7 +1948,7 @@ void main() {
       { indices: [0, 2, 3], color: colors[2 % colors.length] },
       { indices: [1, 3, 2], color: colors[3 % colors.length] }
     ];
-    return { vertices, faces };
+    return attachMaterial({ vertices, faces }, material);
   }
 
   // src/engines/little-3d-engine/shapes/primitives/octahedron.ts
@@ -1809,7 +1962,7 @@ void main() {
     "#06b6d4",
     "#eab308"
   ];
-  function octahedron(size = 1, colors = DEFAULT_COLORS4) {
+  function octahedron(size = 1, colors = DEFAULT_COLORS4, material) {
     const r = size / 2;
     const vertices = [
       { x: r, y: 0, z: 0 },
@@ -1829,12 +1982,12 @@ void main() {
       { indices: [5, 3, 1], color: colors[6 % colors.length] },
       { indices: [5, 0, 3], color: colors[7 % colors.length] }
     ];
-    return { vertices, faces };
+    return attachMaterial({ vertices, faces }, material);
   }
 
   // src/engines/little-3d-engine/shapes/primitives/pyramid.ts
   var DEFAULT_COLORS5 = ["#3b82f6", "#8b5cf6", "#ec4899", "#f59e0b", "#10b981"];
-  function pyramid(size = 1, colors = DEFAULT_COLORS5) {
+  function pyramid(size = 1, colors = DEFAULT_COLORS5, material) {
     const h = size / 2;
     const vertices = [
       { x: -h, y: -h, z: h },
@@ -1850,12 +2003,12 @@ void main() {
       { indices: [4, 2, 3], color: colors[3 % colors.length] },
       { indices: [4, 3, 0], color: colors[4 % colors.length] }
     ];
-    return { vertices, faces };
+    return attachMaterial({ vertices, faces }, material);
   }
 
   // src/engines/little-3d-engine/shapes/primitives/spheres/uv-sphere.ts
   var DEFAULT_COLORS6 = ["#3b82f6", "#8b5cf6", "#ec4899", "#f59e0b", "#10b981", "#ef4444"];
-  function uvSphere(size = 1, detail = 1, colors = DEFAULT_COLORS6) {
+  function uvSphere(size = 1, detail = 1, colors = DEFAULT_COLORS6, material) {
     const r = size / 2;
     const d = Math.max(1, Math.floor(detail));
     const slices = Math.max(4, d * 4);
@@ -1894,7 +2047,7 @@ void main() {
         color: color()
       });
     }
-    return { vertices, faces };
+    return attachMaterial({ vertices, faces }, material);
   }
 
   // src/engines/little-3d-engine/shapes/primitives/spheres/icosphere.ts
@@ -1937,8 +2090,11 @@ void main() {
     [8, 6, 7],
     [9, 8, 1]
   ];
-  function icosphere(size = 1, detail = 1, colors = DEFAULT_COLORS7) {
-    return sphereFromTriangles(SEED_VERTICES, SEED_FACES, size, detail, colors);
+  function icosphere(size = 1, detail = 1, colors = DEFAULT_COLORS7, material) {
+    return attachMaterial(
+      sphereFromTriangles(SEED_VERTICES, SEED_FACES, size, detail, colors),
+      material
+    );
   }
 
   // src/engines/little-3d-engine/shapes/primitives/spheres/octa-sphere.ts
@@ -1962,8 +2118,11 @@ void main() {
     [5, 3, 1],
     [5, 0, 3]
   ];
-  function octaSphere(size = 1, detail = 1, colors = DEFAULT_COLORS8) {
-    return sphereFromTriangles(SEED_VERTICES2, SEED_FACES2, size, detail, colors);
+  function octaSphere(size = 1, detail = 1, colors = DEFAULT_COLORS8, material) {
+    return attachMaterial(
+      sphereFromTriangles(SEED_VERTICES2, SEED_FACES2, size, detail, colors),
+      material
+    );
   }
 
   // src/engines/little-3d-engine/shapes/primitives/spheres/cube-sphere.ts
@@ -1976,7 +2135,7 @@ void main() {
     { normal: [0, 1, 0], right: [1, 0, 0], up: [0, 0, -1] },
     { normal: [0, -1, 0], right: [1, 0, 0], up: [0, 0, 1] }
   ];
-  function cubeSphere(size = 1, detail = 1, colors = DEFAULT_COLORS9) {
+  function cubeSphere(size = 1, detail = 1, colors = DEFAULT_COLORS9, material) {
     const r = size / 2;
     const n = Math.max(1, Math.floor(detail));
     const vertices = [];
@@ -2005,13 +2164,13 @@ void main() {
         }
       }
     }
-    return { vertices, faces };
+    return attachMaterial({ vertices, faces }, material);
   }
 
   // src/engines/little-3d-engine/shapes/complex/plane.ts
   var DEFAULT_COLORS10 = ["#e0f2fe", "#7dd3fc", "#38bdf8", "#f8fafc"];
-  function planeMesh(colors = DEFAULT_COLORS10) {
-    return {
+  function planeMesh(colors = DEFAULT_COLORS10, material) {
+    return attachMaterial({
       vertices: [
         { x: 0.9, y: 0, z: 0 },
         { x: -0.2, y: 0, z: 0.82 },
@@ -2039,7 +2198,7 @@ void main() {
         { indices: [3, 6, 8], color: colors[0] ?? DEFAULT_COLORS10[0] },
         { indices: [3, 8, 6], color: colors[1] ?? DEFAULT_COLORS10[1] }
       ]
-    };
+    }, material);
   }
 
   // src/engines/little-3d-engine/textures/dynamic/canvas-texture.ts
@@ -2596,10 +2755,14 @@ void main() {
     const pick = Array.isArray(color) ? (i) => color[i % color.length] : () => color;
     return { vertices: mesh.vertices, faces: mesh.faces.map((f, i) => ({ ...f, color: pick(i) })) };
   }
+  function applyMaterial(mesh, material) {
+    if (!material) return mesh;
+    return { vertices: mesh.vertices, faces: mesh.faces.map((f) => ({ ...f, material })) };
+  }
   var SpinAnimation = class {
     constructor(options = {}) {
       this.exited = false;
-      this.mesh = applyColor(resolveMesh(options.shape), options.color);
+      this.mesh = applyMaterial(applyColor(resolveMesh(options.shape), options.color), options.material);
       this.spinX = options.spinX ?? 7e-4;
       this.spinY = options.spinY ?? 11e-4;
       this.backend = options.backend;
@@ -3292,6 +3455,7 @@ void main() {
   var CENTER_POP_OUT_AT = REENTER_MS + (MINIS - 1) * REENTER_STAGGER_MS + 150;
   var CENTER_POP_OUT_MS = 420;
   var PARKED = { x: 0, y: 0, z: 50 };
+  var ORB_MATERIAL = { specular: [1, 1, 1], shininess: 28 };
   var CENTER_COLORS = ["#67e8f9", "#22d3ee", "#0ea5e9", "#38bdf8", "#7dd3fc"];
   var MINI_COLORS = [
     ["#e0f2fe", "#bae6fd", "#7dd3fc"],
@@ -3320,9 +3484,9 @@ void main() {
         backend: this.backend,
         camera: { position: { x: 0, y: 0, z: CAMERA_Z } }
       });
-      this.center = engine.add(icosphere(1, 2, CENTER_COLORS), { scale: 0 });
+      this.center = engine.add(icosphere(1, 2, CENTER_COLORS, ORB_MATERIAL), { scale: 0 });
       for (let i = 0; i < MINIS; i++) {
-        const mesh = icosphere(1, 1, MINI_COLORS[i % MINI_COLORS.length]);
+        const mesh = icosphere(1, 1, MINI_COLORS[i % MINI_COLORS.length], ORB_MATERIAL);
         this.minis.push(engine.add(mesh, { scale: 0, transparency: { ...MINI_TRANSPARENCY } }));
       }
       this.engine = engine;
@@ -3907,6 +4071,7 @@ void main() {
   var TRAIL_OUTRO_MS = 1200;
   var TRANSPARENCY = { mode: "two-sided", opacity: 0.275 };
   var CAR_COLORS = ["#bae6fd", "#7dd3fc", "#38bdf8", "#0ea5e9", "#a5f3fc", "#e0f2fe"];
+  var CAR_MATERIAL = { emissive: [0.1, 0.2, 0.3] };
   var WORLD_UP2 = { x: 0, y: 1, z: 0 };
   function clamp016(value) {
     return Math.max(0, Math.min(1, value));
@@ -3967,7 +4132,7 @@ void main() {
         backend: this.backend,
         camera: { position: { x: 0, y: 0, z: CAMERA_Z3 }, fov: FOV2 }
       });
-      const mesh = cube(1, CAR_COLORS);
+      const mesh = cube(1, CAR_COLORS, CAR_MATERIAL);
       for (let i = 0; i < MAX_CARS; i++) {
         this.cars.push(engine.add(mesh, { scale: 0, transparency: { ...TRANSPARENCY } }));
       }
@@ -4649,32 +4814,69 @@ void main() {
 
   // <stdin>
   init_webgl_textured();
+  init_canvas2d_textured();
   init_webgpu_textured();
 
   // src/engines/little-3d-engine/loaders/obj.ts
   var DEFAULT_COLORS12 = ["#3b82f6", "#8b5cf6", "#ec4899", "#f59e0b", "#10b981", "#ef4444"];
+  function clamp018(value) {
+    return Math.min(1, Math.max(0, value));
+  }
   function channelToHex(value) {
     const channel = Number.parseFloat(value);
     if (!Number.isFinite(channel)) return void 0;
-    return Math.round(Math.min(1, Math.max(0, channel)) * 255).toString(16).padStart(2, "0");
-  }
-  function parseMtlColors(text) {
-    const colors = /* @__PURE__ */ new Map();
-    let material;
+    return Math.round(clamp018(channel) * 255).toString(16).padStart(2, "0");
+  }
+  function parseRgb(parts) {
+    const channels = parts.slice(1, 4).map(Number.parseFloat);
+    if (channels.length !== 3 || !channels.every(Number.isFinite)) return void 0;
+    return [clamp018(channels[0]), clamp018(channels[1]), clamp018(channels[2])];
+  }
+  function toMaterial(surface) {
+    const material = {};
+    if (surface.specular) material.specular = surface.specular;
+    if (surface.shininess !== void 0) material.shininess = surface.shininess;
+    if (surface.emissive) material.emissive = surface.emissive;
+    return Object.keys(material).length > 0 ? material : void 0;
+  }
+  function parseMtl(text) {
+    const materials = /* @__PURE__ */ new Map();
+    const surfaces = /* @__PURE__ */ new Map();
+    let name;
     for (const line of text.split("\n")) {
       const trimmed = line.trim();
       if (trimmed === "" || trimmed.startsWith("#")) continue;
       const parts = trimmed.split(/\s+/);
-      if (parts[0] === "newmtl") {
-        material = parts.slice(1).join(" ");
-      } else if (parts[0] === "Kd" && material) {
+      const keyword = parts[0];
+      if (keyword === "newmtl") {
+        name = parts.slice(1).join(" ");
+        if (name && !materials.has(name)) {
+          materials.set(name, {});
+          surfaces.set(name, {});
+        }
+        continue;
+      }
+      if (!name) continue;
+      const entry = materials.get(name);
+      const surface = surfaces.get(name);
+      if (keyword === "Kd") {
         const channels = parts.slice(1, 4).map(channelToHex);
         if (channels.length === 3 && channels.every((channel) => channel !== void 0)) {
-          colors.set(material, `#${channels.join("")}`);
+          entry.color = `#${channels.join("")}`;
         }
+      } else if (keyword === "Ks") {
+        surface.specular = parseRgb(parts);
+      } else if (keyword === "Ns") {
+        const ns = Number.parseFloat(parts[1]);
+        if (Number.isFinite(ns)) surface.shininess = Math.max(0, ns);
+      } else if (keyword === "Ke") {
+        surface.emissive = parseRgb(parts);
       }
     }
-    return colors;
+    for (const [key, surface] of surfaces) {
+      materials.get(key).material = toMaterial(surface);
+    }
+    return materials;
   }
   function resolveIndex(token, vertexCount) {
     const n = parseInt(token, 10);
@@ -4682,7 +4884,7 @@ void main() {
   }
   function parseObj(text, options = {}) {
     const colors = options.colors ?? DEFAULT_COLORS12;
-    const materialColors = options.useMtlColors && options.mtl ? parseMtlColors(options.mtl) : void 0;
+    const materials = options.useMtlColors && options.mtl ? parseMtl(options.mtl) : void 0;
     const vertices = [];
     const faces = [];
     let material;
@@ -4706,9 +4908,11 @@ void main() {
           indices.push(resolveIndex(vertexToken, vertices.length));
         }
         if (indices.length >= 3) {
-          const mtlColor = material ? materialColors?.get(material) : void 0;
-          const color = mtlColor ?? (materialColors ? colors[0] ?? "#888888" : colors[faces.length % colors.length]);
-          faces.push({ indices, color });
+          const entry = material ? materials?.get(material) : void 0;
+          const color = entry?.color ?? (materials ? colors[0] ?? "#888888" : colors[faces.length % colors.length]);
+          const face = { indices, color };
+          if (entry?.material) face.material = entry.material;
+          faces.push(face);
         }
       }
     }