@flighthq/scene3d-wgpu 0.5.1-next.704.19c91ec → 0.5.1-next.730.f29a5aa

package/README.md

@@ -13,5 +13,5 @@ Import the supported application-facing API from `@flighthq/scene3d-wgpu`. The `
 This package is part of the locked-version Flight SDK graph. Applications may instead install and import `@flighthq/sdk` when package-level tree shaking is sufficient.
 
 - [Flight project](https://github.com/flighthq/flight)
-- [Source for @flighthq/scene3d-wgpu@0.5.1-next.704.19c91ec](https://github.com/flighthq/flight/tree/19c91ec3e569d6b3b471682726465a79fba9f8cb/packages/scene3d-wgpu)
-- [License](https://github.com/flighthq/flight/blob/19c91ec3e569d6b3b471682726465a79fba9f8cb/LICENSE.md)
+- [Source for @flighthq/scene3d-wgpu@0.5.1-next.730.f29a5aa](https://github.com/flighthq/flight/tree/f29a5aab5db192284ce5cadf08ffae2649a598ea/packages/scene3d-wgpu)
+- [License](https://github.com/flighthq/flight/blob/f29a5aab5db192284ce5cadf08ffae2649a598ea/LICENSE.md)

package/dist/wgpuEnvironmentCube.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wgpuEnvironmentCube.d.ts","sourceRoot":"","sources":["../src/wgpuEnvironmentCube.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAU,WAAW,EAAE,aAAa,EAAkB,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAgBpH,wBAAgB,+BAA+B,CAC7C,KAAK,EAAE,eAAe,EACtB,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,GACjC,cAAc,GAAG,IAAI,CA2BvB;AAQD,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,eAAe,EACtB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,QAAQ,CAAC,aAAa,CAAC,GAC7B,OAAO,CAKT"}
+{"version":3,"file":"wgpuEnvironmentCube.d.ts","sourceRoot":"","sources":["../src/wgpuEnvironmentCube.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,WAAW,EACX,aAAa,EAGb,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAgBlC,wBAAgB,+BAA+B,CAC7C,KAAK,EAAE,eAAe,EACtB,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,GACjC,cAAc,GAAG,IAAI,CA2BvB;AAQD,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,eAAe,EACtB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,QAAQ,CAAC,aAAa,CAAC,GAC7B,OAAO,CAKT"}

package/dist/wgpuEnvironmentCube.js

@@ -1,7 +1,7 @@
 import { uploadWgpuTextureData, uploadWgpuTextureImageResource } from '@flighthq/render-wgpu/contract';
 import { BitmapTextureSourceKind, ImageTextureSourceKind } from '@flighthq/types/contract';
 import { getWgpuScene3DRuntime } from './wgpuScene3DRuntime';
-// Uploads an Environment's source radiance cubemap (six Image faces) to a wgpu cube texture,
+// Uploads an Environment's source radiance cubemap (six ImageResource faces) to a wgpu cube texture,
 // caching it on the scene runtime. Returns null when the environment has no complete cube — all six faces
 // bound with pixels, either a decoded `source` element or raw `data` — which callers treat as "no
 // environment this frame". Each face uploads through whichever representation it carries:

package/dist/wgpuEnvironmentCube.js.map

@@ -1 +1 @@
-{"version":3,"file":"wgpuEnvironmentCube.js","sourceRoot":"","sources":["../src/wgpuEnvironmentCube.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wgpuEnvironmentCube.js","sourceRoot":"","sources":["../src/wgpuEnvironmentCube.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flighthq/scene3d-wgpu",
-  "version": "0.5.1-next.704.19c91ec",
+  "version": "0.5.1-next.730.f29a5aa",
   "author": "Joshua Granick and other contributors",
   "license": "MIT",
   "repository": {
@@ -38,21 +38,21 @@
     "clean:dist": "tsx ../../scripts/clean-package-dist.ts"
   },
   "dependencies": {
-    "@flighthq/camera": "0.5.1-next.704.19c91ec",
-    "@flighthq/color": "0.5.1-next.704.19c91ec",
-    "@flighthq/geometry": "0.5.1-next.704.19c91ec",
-    "@flighthq/image": "0.5.1-next.704.19c91ec",
-    "@flighthq/lighting": "0.5.1-next.704.19c91ec",
-    "@flighthq/log": "0.5.1-next.704.19c91ec",
-    "@flighthq/materials": "0.5.1-next.704.19c91ec",
-    "@flighthq/node": "0.5.1-next.704.19c91ec",
-    "@flighthq/registry": "0.5.1-next.704.19c91ec",
-    "@flighthq/render": "0.5.1-next.704.19c91ec",
-    "@flighthq/render-wgpu": "0.5.1-next.704.19c91ec",
-    "@flighthq/scene3d": "0.5.1-next.704.19c91ec",
-    "@flighthq/shading": "0.5.1-next.704.19c91ec",
-    "@flighthq/texture": "0.5.1-next.704.19c91ec",
-    "@flighthq/types": "0.5.1-next.704.19c91ec"
+    "@flighthq/camera": "0.5.1-next.730.f29a5aa",
+    "@flighthq/color": "0.5.1-next.730.f29a5aa",
+    "@flighthq/geometry": "0.5.1-next.730.f29a5aa",
+    "@flighthq/image": "0.5.1-next.730.f29a5aa",
+    "@flighthq/lighting": "0.5.1-next.730.f29a5aa",
+    "@flighthq/log": "0.5.1-next.730.f29a5aa",
+    "@flighthq/materials": "0.5.1-next.730.f29a5aa",
+    "@flighthq/node": "0.5.1-next.730.f29a5aa",
+    "@flighthq/registry": "0.5.1-next.730.f29a5aa",
+    "@flighthq/render": "0.5.1-next.730.f29a5aa",
+    "@flighthq/render-wgpu": "0.5.1-next.730.f29a5aa",
+    "@flighthq/scene3d": "0.5.1-next.730.f29a5aa",
+    "@flighthq/shading": "0.5.1-next.730.f29a5aa",
+    "@flighthq/texture": "0.5.1-next.730.f29a5aa",
+    "@flighthq/types": "0.5.1-next.730.f29a5aa"
   },
   "peerDependencies": {
     "@webgpu/types": "^0.1.70"
@@ -60,6 +60,7 @@
   "devDependencies": {
     "@flighthq/mesh": "*",
     "@flighthq/particleemitter": "*",
+    "@flighthq/video": "*",
     "@webgpu/types": "*",
     "typescript": "^5.3.0"
   },

package/src/customShaderWgpuMeshMaterialRenderer.test.ts

@@ -9,7 +9,7 @@ import {
   registerWgpuImageTextureResolver,
 } from '@flighthq/render-wgpu/contract';
 import { createTexture } from '@flighthq/texture/contract';
-import type { Camera3D, Image, Scene3DLightBlock, Scene3DRenderProxy } from '@flighthq/types/contract';
+import type { Camera3D, ImageResource, Scene3DLightBlock, Scene3DRenderProxy } from '@flighthq/types/contract';
 import { CustomShaderMaterialKind, ImageTextureSourceKind } from '@flighthq/types/contract';
 
 import {
@@ -177,7 +177,7 @@ describe('customShaderWgpuMeshMaterialRenderer', () => {
   });
 });
 
-function makeImageResource(version: number): Image {
+function makeImageResource(version: number): ImageResource {
   const source = document.createElement('canvas');
   source.width = 1;
   source.height = 1;
@@ -187,7 +187,7 @@ function makeImageResource(version: number): Image {
     source,
     version,
     width: 1,
-  } as unknown as Image;
+  } as unknown as ImageResource;
 }
 
 describe('getWgpuCustomMaterialShaderSource', () => {

package/src/unlitWgpuMeshMaterialRenderer.test.ts

@@ -6,6 +6,7 @@ import { registerWgpuImageTextureResolver } from '@flighthq/render-wgpu/contract
 import { advanceVideoTexture, createVideoTexture } from '@flighthq/texture/contract';
 import type { Camera3D, Scene3DLightBlock, Scene3DRenderProxy } from '@flighthq/types/contract';
 import { UnlitMaterialKind } from '@flighthq/types/contract';
+import { createVideoResource } from '@flighthq/video/contract';
 
 import { registerWgpuUnlitMaterial, unlitWgpuMeshMaterialRenderer } from './unlitWgpuMeshMaterialRenderer';
 import { getWgpuMeshMaterialRenderer } from './wgpuMeshMaterialRegistry';
@@ -61,11 +62,7 @@ describe('unlitWgpuMeshMaterialRenderer', () => {
       videoHeight: { value: 120 },
       videoWidth: { value: 160 },
     });
-    material.baseColorMap = createVideoTexture({
-      element,
-      objectUrl: null,
-      ownsElement: false,
-    });
+    material.baseColorMap = createVideoTexture(createVideoResource(element));
     advanceVideoTexture(material.baseColorMap);
     registerWgpuImageTextureResolver(state);
     unlitWgpuMeshMaterialRenderer.bind(state, material, NO_LIGHTS, makeCamera());

package/src/wgpuClassicPrelude.test.ts

@@ -1,6 +1,6 @@
 import { createTexture } from '@flighthq/texture/contract';
 import type {
-  Image,
+  ImageResource,
   WgpuClassicDefineKey,
   WgpuClassicLightingModel,
   WgpuColorAdjustmentMaterialFeature,
@@ -61,7 +61,7 @@ describe('bindWgpuClassicSurface', () => {
     // path an already-resolved-sampler helper test bypasses). Same shared binder that PBR uses.
     const diffuseMap = createTexture({
       dimension: '2d',
-      source: { source: {} } as unknown as Image,
+      source: { source: {} } as unknown as ImageResource,
     });
     bindWgpuClassicSurface(state, pipeline, key, [1, 0, 0, 1], [1, 1, 1, 1], 32, 0.5, diffuseMap, null, null, null);
     const count = (name: string) => fake.calls.filter((c) => c.name === name).length;

package/src/wgpuEnvironmentCube.test.ts

@@ -1,4 +1,4 @@
-import type { Bitmap, Environment, Image, Texture } from '@flighthq/types/contract';
+import type { Bitmap, Environment, ImageResource, Texture } from '@flighthq/types/contract';
 import { BitmapTextureSourceKind, ImageTextureSourceKind } from '@flighthq/types/contract';
 
 import { ensureWgpuEnvironmentSourceCube, updateWgpuEnvironmentCubeFace } from './wgpuEnvironmentCube';
@@ -18,7 +18,7 @@ function completeEnvironment(): Environment {
     kind: ImageTextureSourceKind,
     source,
     width: 4,
-  } as unknown as Image;
+  } as unknown as ImageResource;
   const cube = {
     colorSpace: 'srgb',
     sampler: {},

package/src/wgpuEnvironmentIblBake.test.ts

@@ -1,4 +1,4 @@
-import type { Environment, Image, Texture } from '@flighthq/types/contract';
+import type { Environment, ImageResource, Texture } from '@flighthq/types/contract';
 import { ImageTextureSourceKind } from '@flighthq/types/contract';
 
 import { bakeWgpuEnvironmentIbl, destroyWgpuScene3DIbl } from './wgpuEnvironmentIblBake';
@@ -19,7 +19,7 @@ function completeEnvironment(): Environment {
     kind: ImageTextureSourceKind,
     source,
     width: 4,
-  } as unknown as Image;
+  } as unknown as ImageResource;
   const cube = {
     colorSpace: 'srgb',
     sampler: {},

package/src/wgpuEnvironmentSkybox.test.ts

@@ -1,5 +1,5 @@
 import { createCamera3D } from '@flighthq/camera/contract';
-import type { Camera3D, Environment, Image, Texture } from '@flighthq/types/contract';
+import type { Camera3D, Environment, ImageResource, Texture } from '@flighthq/types/contract';
 import { ImageTextureSourceKind } from '@flighthq/types/contract';
 
 import { drawWgpuEnvironmentSkybox } from './wgpuEnvironmentSkybox';
@@ -22,7 +22,7 @@ function completeEnvironment(): Environment {
     kind: ImageTextureSourceKind,
     source,
     width: 4,
-  } as unknown as Image;
+  } as unknown as ImageResource;
   const cube = {
     colorSpace: 'srgb',
     sampler: {},

package/src/wgpuMeshPipeline.test.ts

@@ -7,7 +7,7 @@ import { createTexture, setTextureUvOffset, setTextureUvScale } from '@flighthq/
 import type {
   Camera3D,
   Bitmap,
-  Image,
+  ImageResource,
   Scene3DLightBlock,
   Scene3DRenderProxy,
   Texture,
@@ -735,7 +735,7 @@ describe('getWgpuMaterialSampler', () => {
     const { state } = makeWgpuScene3DState();
     const texture = createTexture({
       dimension: '2d',
-      source: { kind: ImageTextureSourceKind } as Image,
+      source: { kind: ImageTextureSourceKind } as ImageResource,
     });
     texture.sampler.wrapU = 'repeat';
     texture.sampler.wrapV = 'repeat';
@@ -750,7 +750,7 @@ describe('getWgpuMaterialSampler', () => {
 
   it('preserves independent minification and magnification filters', () => {
     const { fake, state } = makeWgpuScene3DState();
-    const texture = createTexture({ dimension: '2d', source: {} as Image });
+    const texture = createTexture({ dimension: '2d', source: {} as ImageResource });
     texture.sampler.minFilter = 'nearest';
     texture.sampler.magFilter = 'linear';
 
@@ -763,9 +763,9 @@ describe('getWgpuMaterialSampler', () => {
 
   it('drops the mip filter when the map disables mipmaps (distinct packed key from the mipmapped default)', () => {
     const { state } = makeWgpuScene3DState();
-    const noMip = createTexture({ dimension: '2d', source: {} as Image });
+    const noMip = createTexture({ dimension: '2d', source: {} as ImageResource });
     noMip.sampler.mipmaps = false;
-    const withMip = createTexture({ dimension: '2d', source: {} as Image }); // default: trilinear (mipmaps on)
+    const withMip = createTexture({ dimension: '2d', source: {} as ImageResource }); // default: trilinear (mipmaps on)
 
     getWgpuMaterialSampler(state, noMip);
     getWgpuMaterialSampler(state, withMip);
@@ -775,9 +775,9 @@ describe('getWgpuMaterialSampler', () => {
 
   it('carries the map anisotropy into the derived sampler (distinct packed key from the non-anisotropic one)', () => {
     const { state } = makeWgpuScene3DState();
-    const aniso = createTexture({ dimension: '2d', source: {} as Image });
+    const aniso = createTexture({ dimension: '2d', source: {} as ImageResource });
     aniso.sampler.anisotropy = 8;
-    const noAniso = createTexture({ dimension: '2d', source: {} as Image });
+    const noAniso = createTexture({ dimension: '2d', source: {} as ImageResource });
 
     getWgpuMaterialSampler(state, aniso);
     getWgpuMaterialSampler(state, noAniso);
@@ -823,7 +823,7 @@ describe('isWgpuMaterialBindGroupRebuildNeeded', () => {
 
   it('rebuilds when any resolved view identity changes (swap / unready->ready / ready->ready / version++)', () => {
     // resolveWgpuMaterialTextureView is the invalidation seam: a texture swap, an unready->ready
-    // transition, a ready->ready image replacement, or an Image version bump each yield a new
+    // transition, a ready->ready image replacement, or an ImageResource version bump each yield a new
     // view identity, so this single identity check covers all four.
     expect(isWgpuMaterialBindGroupRebuildNeeded(cached, sampler, [{} as GPUTextureView, view1])).toBe(true);
   });
@@ -842,7 +842,7 @@ describe('isWgpuTextureReady', () => {
     expect(
       isWgpuTextureReady({
         dimension: '2d',
-        source: { height: 1, kind: ImageTextureSourceKind, source: {}, version: 0, width: 1 } as Image,
+        source: { height: 1, kind: ImageTextureSourceKind, source: {}, version: 0, width: 1 } as ImageResource,
       } as unknown as Texture),
     ).toBe(true);
     expect(
@@ -905,7 +905,7 @@ describe('stashWgpuUvTransform', () => {
     const { state } = makeWgpuScene3DState();
     const texture = createTexture({
       dimension: '2d',
-      source: { kind: ImageTextureSourceKind } as Image,
+      source: { kind: ImageTextureSourceKind } as ImageResource,
     });
     setTextureUvScale(texture, 2, 3);
     setTextureUvOffset(texture, 0.5, 0.25);
@@ -921,7 +921,7 @@ describe('stashWgpuUvTransform', () => {
     const { state } = makeWgpuScene3DState();
     const texture = createTexture({
       dimension: '2d',
-      source: { kind: ImageTextureSourceKind } as Image,
+      source: { kind: ImageTextureSourceKind } as ImageResource,
     });
     setTextureUvScale(texture, 4, 4);
     stashWgpuUvTransform(state, texture);
@@ -938,7 +938,7 @@ describe('stashWgpuUvTransform', () => {
       state,
       createTexture({
         dimension: '2d',
-        source: { kind: ImageTextureSourceKind } as Image,
+        source: { kind: ImageTextureSourceKind } as ImageResource,
       }),
     );
 
@@ -1000,7 +1000,7 @@ describe('writeWgpuDrawUniform', () => {
     const { state } = makeWgpuScene3DState();
     const texture = createTexture({
       dimension: '2d',
-      source: { kind: ImageTextureSourceKind } as Image,
+      source: { kind: ImageTextureSourceKind } as ImageResource,
     });
     setTextureUvScale(texture, 2, 3);
     stashWgpuUvTransform(state, texture);
@@ -1019,7 +1019,7 @@ describe('writeWgpuDrawUniform', () => {
     const { state } = makeWgpuScene3DState();
     const texture = createTexture({
       dimension: '2d',
-      source: { kind: ImageTextureSourceKind } as Image,
+      source: { kind: ImageTextureSourceKind } as ImageResource,
     });
     setTextureUvScale(texture, 2, 3);
     stashWgpuUvTransform(state, texture);

package/src/wgpuShadedPrelude.test.ts

@@ -12,7 +12,7 @@ import {
 } from '@flighthq/shading/contract';
 import { createTexture, getTextureSource } from '@flighthq/texture/contract';
 import type {
-  Image,
+  ImageResource,
   Modifier,
   Texture,
   WgpuColorAdjustmentMaterialFeature,
@@ -427,7 +427,7 @@ describe('shaded binding cache', () => {
   });
 });
 
-function makeImageResource(): Image {
+function makeImageResource(): ImageResource {
   const source = document.createElement('canvas');
   source.width = 1;
   source.height = 1;
@@ -437,5 +437,5 @@ function makeImageResource(): Image {
     source,
     version: 0,
     width: 1,
-  } as unknown as Image;
+  } as unknown as ImageResource;
 }

package/src/wgpuUnlitPrelude.test.ts

@@ -1,6 +1,7 @@
 import { registerWgpuImageTextureResolver } from '@flighthq/render-wgpu/contract';
 import { advanceVideoTexture, createVideoTexture } from '@flighthq/texture/contract';
 import type { LinearColor, WgpuUnlitDefineKey } from '@flighthq/types/contract';
+import { createVideoResource } from '@flighthq/video/contract';
 
 import { getWgpuScene3DRuntime } from './wgpuScene3DRuntime';
 import { makeWgpuScene3DState, makeWgpuSkinningAdapter } from './wgpuScene3DTestHelper';
@@ -39,11 +40,7 @@ describe('bindWgpuUnlitVideoSurface', () => {
       videoHeight: { value: 120 },
       videoWidth: { value: 160 },
     });
-    const video = createVideoTexture({
-      element,
-      objectUrl: null,
-      ownsElement: false,
-    });
+    const video = createVideoTexture(createVideoResource(element));
     advanceVideoTexture(video);
     registerWgpuImageTextureResolver(state);
     bindWgpuUnlitVideoSurface(state, pipeline, {}, COLOR, 1, 0.5, video);